From: Alexandre Rostovtsev Date: Sun, 15 Mar 2015 18:54:54 +0000 (+0000) Subject: Fix broken multilib gl and glu detection (bug #543050, thanks to Bertrand Jacquin... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e067535e3dcfc5e23a846b06e18e365f4d6d4b91;p=gentoo.git Fix broken multilib gl and glu detection (bug #543050, thanks to Bertrand Jacquin). Update license. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D --- diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog index baea577d1467..5b4ce1bc470e 100644 --- a/x11-libs/gtkglext/ChangeLog +++ b/x11-libs/gtkglext/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/gtkglext -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.96 2014/11/21 09:31:00 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.97 2015/03/15 18:54:40 tetromino Exp $ + +*gtkglext-1.2.0-r3 (15 Mar 2015) + + 15 Mar 2015; Alexandre Rostovtsev + gtkglext-1.2.0-r2.ebuild, +gtkglext-1.2.0-r3.ebuild, + +files/gtkglext-1.2.0-gl-configure.patch: + Fix broken multilib gl and glu detection (bug #543050, thanks to Bertrand + Jacquin). Update license. 21 Nov 2014; Pacho Ramos -gtkglext-1.2.0-r1.ebuild: Drop old diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest index 7e5186e4f5c1..694b55d7fc5f 100644 --- a/x11-libs/gtkglext/Manifest +++ b/x11-libs/gtkglext/Manifest @@ -1,14 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX gtkglext-1.2.0-gl-configure.patch 11643 SHA256 d38d17fb2c85431b2dfeb7d2ce62cb8ddcad627d0baefe0cf9d3b9177390dcb4 SHA512 bbb8ab5bcc66525b9d7e7ee90ccae50ab8337a0c3a6cdf36a48ca8b9e188dbefa003c8d7da14f9ff6054d8b10ad24158cbf4e948f755373a2cb695e3102baadc WHIRLPOOL 1ab7bff68d8c72dbb7948411793907a42757d15a32f7b07ad589ac51dbd48d5997458238bed245f2156939e67057b609d18551700ffeb3154d3c8e3cc77680ee DIST gtkglext-1.2.0.tar.bz2 703821 SHA256 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d WHIRLPOOL 2be1308abd4a73a838942ab9fac4d733239b4fe5ba0b50f542510be24088d6697868d2d900b77f8c8e973efd46a5fbb4d2ffd53c7aea8a07d9326bf276908c4f -EBUILD gtkglext-1.2.0-r2.ebuild 1670 SHA256 e744bf9b6793a77fadbbffce18c7f543bde29fe78a44dee52392530b20a741de SHA512 1a7559863fbe20f770a9e7c55271944b2a1bfbd846bf58bffb4bee5f024019ff64919227a16d78d027e3b83979db5d6879654c7d43565848e2768cede474db31 WHIRLPOOL 69cab59863659d17a9dfc6b4fc91241d15b3340397d41d5ca544523ddaf3c1d25c563a88715e0924906ed85edfd684b6525617d8919ec4ba18dff3e5015384ab -MISC ChangeLog 11823 SHA256 eda0aae5cf373932ddeb8ad788fbe05d01a0d33ddb9a973564b5b4199af03e60 SHA512 429744ad46fd9a3f825d9aafecf5f81433cc30a26d53e047283ca9598e44baeac0d15edd00b4b26b505d69e57f5446e4bf6b80c8674f43a643acaaeed05b2473 WHIRLPOOL c8946e8001d33ff523994dbf4631ca68e9f4a97b9acdb9f8ab276f69e08a111a5ea6a814e483fc2fe2fe4a7f05e80cd9f089859ceac010157bce122b20a94297 +EBUILD gtkglext-1.2.0-r2.ebuild 1675 SHA256 5f262dc17679b3d6beff24af4493fdaaa71627c738be05ef161b4cefce383a15 SHA512 b44966ff941c2511031616be32719e5a17e095771fe584a8a0a654d7caf9e0b1040c81b5c002e85fa7db8fc11f2fa44f33f81bf2b5e1a07bee81e273729cb3c6 WHIRLPOOL cc3a7a13178adf6a7e8ec2e16714ed218c0f1342a76abea5faea87b6dc4765933ae672270d9ce475c7eaa54674d8e35b9c8e038969280dd672851271684d7732 +EBUILD gtkglext-1.2.0-r3.ebuild 1974 SHA256 1d797cadf895a3591df27f1534d7a60b89fb9ff0f3a11584924b9c056f2079a1 SHA512 ca48d1be6f1a8c95d1b274387b8d5ab1c9463f515ad79f34f546183b876650b0a3bf24a5f82443067200fc83b121796f18fc5083021758edcdeefc5a19b75b5e WHIRLPOOL af28e32ac84d1bf62be7bb1140a71e23ef0bc392cde37654c732a340351e313ddbfa65829514730e04f5010a6b21e07d1795e6dec054587aad7c34ea969f7f78 +MISC ChangeLog 12124 SHA256 86a10ea579eb062dd78e08487bfe708eda81c2815bbb4dee9165385b0da5217d SHA512 8c10ffec000dc5f17948298459d2e00cdd69b21f0ed67596d537e8ea77bafef607f0fc8da2e359881728c57d67a8dcbb4bd580a5b8e504e8d7919acd6c31a2d6 WHIRLPOOL 85478e17b2e0b6c971ccacde53ca47cc25f213bcde0678cf4d40ab0d77557cebab384beb2ca7d26c7be8ecd597d484dfbfe265d292aa641812bba0de652c184a MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlRvBlUACgkQCaWpQKGI+9QLfgCcDk1kKu77/SlvwtRxVVWIsFqx -KH8An1kcMUcaaxtogIX4A76iDc63bHBW -=NAlA +iQJ8BAEBCABmBQJVBdV3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNItgP/im3PsLwiR2mp/muLlav8hNA +5K89qBLSeeUmUYivy/lVsvZ+47bMnaoS8IfrVx7UKIOplBQJIvzvzIR9uCNrEnZl +jo+P52KAd/wZ3RANNCnPz0tF8StO47r8ZdZWyYIBaxHv12vcpjo6DTIT33FZocJO +SpOtfedY06PyY8wznfcCLj3gwxRsWMpWZqXnWzoCwxL3AO5bJIGH8QsDw0XADgZm +kJqDza35UJLb2H1JQ7z22F2LtwWpF7WfTmnTBTAikZau+AE7vVAO87/xW2QkNGRF +2cSIl68sLJaiVCd8vvH1VUKWrm8UxPDfmF4nDPNOgY02FZ8zuE4lT6df6hoDjLG6 +Sb+hRRybQ/kfl7VGdmSthlwqutHuID1BJBrTugQ1LfZRznmiUL8Gy56cx6TjmiJr +ZPhoTLUpoQ+qsY6pMWbnvbz8/6572a3hig9888A38W3/sC5jOB9E8CFnctCtcPhr +8VXHkcCpkI6Jq9gQ0u4pT3EgPNA6B3Q+gGb1hpbwI8NWyZMVGHZhXMG9syhqHqOV +/WZbRc3mETepZaYGld4rOXrcOHyRj1hehXuPlj7ICWgqCiCIo5fbUXqrrxU9FMml +lurzyWioPE9gLz9VYsWd7n5P79CTrq9u8pPmAwKpKfzN3jNeZ/MNZn42TChGoLSG +BTPRQYB+XenXG9QEB6Kb +=+46N -----END PGP SIGNATURE----- diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch new file mode 100644 index 000000000000..78c2c05f95ca --- /dev/null +++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch @@ -0,0 +1,358 @@ +From 6eaa9b0dc18e6ddff093c2e99a3c7d5eeb9c8f5d Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sun, 15 Mar 2015 14:42:25 -0400 +Subject: [PATCH] Backport some git master fixes for GL/GLU detection to 1.2.0 + +--- + configure.in | 313 +++++++++-------------------------------------------------- + 1 file changed, 44 insertions(+), 269 deletions(-) + +diff --git a/configure.in b/configure.in +index e5b678c..5aa1b7d 100644 +--- a/configure.in ++++ b/configure.in +@@ -502,274 +502,58 @@ AC_SUBST([GDKGLEXT_WIN_EXTRA_DEFS]) + # Checks for OpenGL + ################################################## + +-GL_CFLAGS="" +-GL_LDFLAGS="" +-GL_LIBS="" +- +-AC_ARG_WITH([gl-prefix], +- [AC_HELP_STRING([--with-gl-prefix=DIR], +- [OpenGL (Mesa) is installed in DIR [default=auto]])], , +- [with_gl_prefix=auto]) +- +-AC_ARG_WITH([gl-includedir], +- [AC_HELP_STRING([--with-gl-includedir=DIR], +- [OpenGL (Mesa) headers are in DIR [default=auto]])], , +- [with_gl_includedir=auto]) +- +-AC_ARG_WITH([gl-libdir], +- [AC_HELP_STRING([--with-gl-libdir=DIR], +- [OpenGL (Mesa) libraries are in DIR [default=auto]])], , +- [with_gl_libdir=auto]) +- +-if test "x$with_gl_includedir" != "xauto"; then +- GL_CFLAGS="-I$with_gl_includedir" +-elif test "x$with_gl_prefix" != "xauto"; then +- GL_CFLAGS="-I$with_gl_prefix/include" ++if test "x$gdktarget" = "xx11"; then ++ with_gl=x + fi + +-if test "x$with_gl_libdir" != "xauto"; then +- GL_LDFLAGS="-L$with_gl_libdir" +-elif test "x$with_gl_prefix" != "xauto"; then +- GL_LDFLAGS="-L$with_gl_prefix/lib" ++AX_CHECK_GL ++AS_IF([test X$no_gl = Xyes], ++ [AC_MSG_FAILURE([OpenGL is required.])]) ++AX_CHECK_GLU ++# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions ++AM_CONDITIONAL([GLU],[test "$no_glu" != yes]) ++ ++# Checks for some types in gdk/GL/glxext.h ++ ++# GLXFBConfigSGIX ++GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no ++AC_CHECK_TYPES([GLXFBConfigSGIX], , , ++ [#include ]) ++if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then ++ GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes + fi + +-save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS" +-save_LIBS="$LIBS" +-LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB" +- +-if test "x$gdktarget" = "xx11"; then +- AC_CHECK_HEADERS([GL/glx.h], , +- [AC_MSG_ERROR([Cannot find GLX header])]) ++# GLXFBConfigIDSGIX ++GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no ++AC_CHECK_TYPES([GLXFBConfigIDSGIX], , , ++ [#include ]) ++if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then ++ GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes + fi + +-AC_CHECK_HEADERS([GL/gl.h GL/glu.h], , +- [AC_MSG_ERROR([Cannot find OpenGL headers])]) +- +-if test "x$gdktarget" = "xx11"; then +- +- # for X11 +- +- THREAD_LIB="-lpthread" +- STDCXX_LIB="-lstdc++" +- +- have_GL=no +- GL_LIB_NAME=GL +- +- # GLcore and GL (SGI) +- AC_CHECK_LIB([GLcore], [glVertex3d], +- [GL_LIBS="-lGLcore"]) +- if test "x$ac_cv_lib_GLcore_glVertex3d" = "xyes" ; then +- # if GLcore found, then also check for GL +- AC_CHECK_LIB([GL], [glXCreateContext], +- [GL_LIBS="-lGL $GL_LIBS" +- have_GL=yes]) +- fi +- +- # GL +- if test "x$have_GL" = "xno" ; then +- # if no GLcore and GL, check for GL +- AC_CHECK_LIB([GL], [glVertex3d], +- [GL_LIBS="-lGL" +- have_GL=yes]) +- if test "x$ac_cv_lib_GL_glVertex3d" = "xno" ; then +- # GL may need to be linked with the thread library explicitly +- AC_CHECK_LIB([GL], [glVertex3f], +- [GL_LIBS="-lGL $THREAD_LIB" +- have_GL=yes], , +- [$THREAD_LIB]) +- if test "x$ac_cv_lib_GL_glVertex3f" = "xno" ; then +- # GL may need to be linked with std C++ library explicitly +- AC_CHECK_LIB([GL], [glVertex3i], +- [GL_LIBS="-lGL $STDCXX_LIB" +- have_GL=yes], , +- [$STDCXX_LIB]) +- if test "x$ac_cv_lib_GL_glVertex3i" = "xno" ; then +- # GL may need to be linked with std C++ and thread libraries explicitly +- AC_CHECK_LIB([GL], [glVertex3s], +- [GL_LIBS="-lGL $STDCXX_LIB $THREAD_LIB" +- have_GL=yes], , +- [$STDCXX_LIB $THREAD_LIB]) +- fi +- fi +- fi +- fi +- +- # MesaGL +- if test "x$have_GL" = "xno" ; then +- # if no GL, check for MesaGL +- AC_CHECK_LIB([MesaGL], [glVertex3d], +- [GL_LIBS="-lMesaGL" +- have_GL=yes +- GL_LIB_NAME=MesaGL]) +- fi +- +- if test "x$have_GL" = "xno" ; then +- # no GL found +- AC_MSG_ERROR([Cannot find GL library]) +- fi +- +- # GLU +- +- have_GLU=no +- have_SGI_GLU=no +- +- AC_CHECK_LIB([GLU], [gluSphere], +- [GL_LIBS="-lGLU $GL_LIBS" +- have_GLU=yes], , +- [$GL_LIBS]) +- if test "x$ac_cv_lib_GLU_gluSphere" = "xno" ; then +- # GLU may need to be linked with the thread library explicitly +- AC_CHECK_LIB([GLU], [gluCylinder], +- [GL_LIBS="-lGLU $GL_LIBS $THREAD_LIB" +- have_GLU=yes], , +- [$GL_LIBS $THREAD_LIB]) +- if test "x$ac_cv_lib_GLU_gluCylinder" = "xno" ; then +- # GLU may need to be linked with std C++ library explicitly +- AC_CHECK_LIB([GLU], [gluDisk], +- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB" +- have_GLU=yes +- have_SGI_GLU=yes], , +- [$GL_LIBS $STDCXX_LIB]) +- if test "x$ac_cv_lib_GLU_gluDisk" = "xno" ; then +- # GLU may need to be linked with std C++ and thread libraries explicitly +- AC_CHECK_LIB([GLU], [gluPartialDisk], +- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB $THREAD_LIB" +- have_GLU=yes +- have_SGI_GLU=yes], , +- [$GL_LIBS $STDCXX_LIB $THREAD_LIB]) +- fi +- fi +- fi +- +- if test "x$have_GLU" = "xno" ; then +- # if no GLU, check for MesaGLU +- AC_CHECK_LIB([MesaGLU], [gluSphere], +- [GL_LIBS="-lMesaGLU $GL_LIBS" +- have_GLU=yes], , +- [$GL_LIBS]) +- fi +- +- if test "x$have_GLU" = "xno" ; then +- # no GLU found +- AC_MSG_ERROR([Cannot find GLU library]) +- fi +- +- # Checks for SGI's GLU library +- if test "x$have_SGI_GLU" = "xno" ; then +- # Try static linking +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" +- +- AC_CHECK_LIB([GLU], [gluBeginCurve], +- [have_SGI_GLU=no], , +- [$GL_LIBS]) +- if test "x$ac_cv_lib_GLU_gluBeginCurve" = "xno" ; then +- AC_CHECK_LIB([GLU], [gluBeginPolygon], +- [GL_LIBS="$GL_LIBS $STDCXX_LIB" +- have_SGI_GLU=yes], , +- [$GL_LIBS $STDCXX_LIB]) +- fi +- +- LDFLAGS="$save_LDFLAGS" +- fi +- +- AC_MSG_CHECKING([whether libGLU needs to be linked with the std C++ library]) +- AC_MSG_RESULT([$have_SGI_GLU]) +- +- # Checks for some types in gdk/GL/glxext.h +- +- # GLXFBConfigSGIX +- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no +- AC_CHECK_TYPES([GLXFBConfigSGIX], , , +- [#include ]) +- if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then +- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes +- fi +- +- # GLXFBConfigIDSGIX +- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no +- AC_CHECK_TYPES([GLXFBConfigIDSGIX], , , +- [#include ]) +- if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then +- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes +- fi +- +- # GLXPbufferSGIX +- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no +- AC_CHECK_TYPES([GLXPbufferSGIX], , , +- [#include ]) +- if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then +- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes +- fi +- +- # GLXVideoSourceSGIX +- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no +- AC_CHECK_TYPES([GLXVideoSourceSGIX], , , +- [#include ]) +- if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then +- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes +- fi +- +- # __GLXextFuncPtr +- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no +- AC_CHECK_TYPES([__GLXextFuncPtr], , , +- [#include ]) +- if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then +- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes +- fi +- +-else +- +- # for Win32 +- +- AC_MSG_CHECKING([for glNewList in -lopengl32]) +- have_opengl32=no +- LIBS="-lopengl32 $LIBS" +- AC_TRY_LINK([#include +- #include ], +- [glVertex3d(0.0, 0.0, 0.0);], +- [GL_LIBS="-lopengl32" +- have_opengl32=yes]) +- AC_MSG_RESULT([$have_opengl32]) +- if test "x$have_opengl32" = "xno" ; then +- AC_MSG_ERROR([Cannot find GL library]) +- fi +- +- AC_MSG_CHECKING([for gluNewQuadric in -lglu32]) +- have_glu32=no +- LIBS="-lglu32 $LIBS" +- AC_TRY_LINK([#include +- #include +- #include ], +- [gluNewQuadric();], +- [GL_LIBS="-lglu32 $GL_LIBS" +- have_glu32=yes]) +- AC_MSG_RESULT([$have_glu32]) +- if test "x$have_glu32" = "xno" ; then +- AC_MSG_ERROR([Cannot find GLU library]) +- fi +- +-dnl AC_CHECK_LIB(opengl32, glNewList, +-dnl GL_LIBS="-lopengl32", +-dnl AC_MSG_ERROR(Cannot find GL library)) +- +-dnl AC_CHECK_LIB(glu32, gluNewQuadric, +-dnl GL_LIBS="-lglu32 $GL_LIBS", +-dnl AC_MSG_ERROR(Cannot find GLU library), +-dnl $GL_LIBS) ++# GLXPbufferSGIX ++GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no ++AC_CHECK_TYPES([GLXPbufferSGIX], , , ++ [#include ]) ++if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then ++ GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes ++fi + ++# GLXVideoSourceSGIX ++GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no ++AC_CHECK_TYPES([GLXVideoSourceSGIX], , , ++ [#include ]) ++if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then ++ GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes + fi + +-dnl # if using mesa, check for xmesa.h +-dnl if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then +-dnl AC_CHECK_HEADERS([GL/xmesa.h]) +-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, \ +-dnl test "x$ac_cv_header_GL_xmesa_h" = "xyes") +-dnl else +-dnl # force a failed check +-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes") +-dnl fi ++# __GLXextFuncPtr ++GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no ++AC_CHECK_TYPES([__GLXextFuncPtr], , , ++ [#include ]) ++if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then ++ GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes ++fi + + # Checks for typedefs in gdk/GL/glext.h + +@@ -781,22 +565,13 @@ if test "x$ac_cv_type_GLhalfNV" = "xno" ; then + GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes + fi + +-GL_LIBS="$GL_LDFLAGS $GL_LIBS" +- +-AC_SUBST([GL_CFLAGS]) +-AC_SUBST([GL_LIBS]) +- +-CPPFLAGS="$save_CPPFLAGS" +-LIBS="$save_LIBS" +- +- + ################################################## + # CFLAGS and LIBS + ################################################## + + GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg" + GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS" +-GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS" ++GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS" + GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" + GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB" + AC_SUBST([GDKGLEXT_PACKAGES]) +-- +2.3.2 + diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild index a576fab6f507..06ffd078cf0b 100644 --- a/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild,v 1.12 2014/10/11 12:33:00 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild,v 1.13 2015/03/15 18:54:40 tetromino Exp $ EAPI="5" @@ -11,7 +11,7 @@ DESCRIPTION="GL extensions for Gtk+ 2.0" HOMEPAGE="http://gtkglext.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="GPL-2 LGPL-2.1" +LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild new file mode 100644 index 000000000000..e84ba2f5ad32 --- /dev/null +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild,v 1.1 2015/03/15 18:54:40 tetromino Exp $ + +EAPI="5" + +GNOME2_LA_PUNT="yes" +inherit autotools gnome2 multilib-minimal + +DESCRIPTION="GL extensions for Gtk+ 2.0" +HOMEPAGE="http://gtkglext.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}] + || ( + >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}] + =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-archive-2014.02.28 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +src_prepare() { + # Ancient configure.in with broken multilib gl detection (bug #543050) + # Backport some configure updates from upstream git master to fix + epatch "${FILESDIR}/${P}-gl-configure.patch" + mv configure.{in,ac} || die "mv failed" + eautoreconf + + gnome2_src_prepare + + # Remove development knobs, bug #308973 + sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \ + examples/Makefile.am examples/Makefile.in \ + gdk/Makefile.am gdk/Makefile.in \ + gdk/win32/Makefile.am gdk/win32/Makefile.in \ + gdk/x11/Makefile.am gdk/x11/Makefile.in \ + gtk/Makefile.am gtk/Makefile.in \ + || die "sed failed" +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + local DOCS="AUTHORS ChangeLog* NEWS README TODO" + einstalldocs +}