diff options
-rw-r--r-- | media-libs/libcaca/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libcaca/Manifest | 15 | ||||
-rw-r--r-- | media-libs/libcaca/files/libcaca-0.99_beta16-freeglut-2.6.patch | 11 | ||||
-rw-r--r-- | media-libs/libcaca/libcaca-0.99_beta16.ebuild | 3 |
4 files changed, 21 insertions, 14 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index 5b463b3b1d20..4154edf51c44 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libcaca # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.80 2009/08/10 09:55:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.81 2009/08/24 19:54:11 arfrever Exp $ + + 24 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + libcaca-0.99_beta16.ebuild, +files/libcaca-0.99_beta16-freeglut-2.6.patch: + Fix building with media-libs/freeglut-2.6* (bug #282573). 10 Aug 2009; Alexis Ballier <aballier@gentoo.org> -libcaca-0.99_beta14.ebuild, -files/libcaca-0.99_beta14-nogl.patch: diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest index 8e1afaaec971..fa757e76773b 100644 --- a/media-libs/libcaca/Manifest +++ b/media-libs/libcaca/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libcaca-0.99_beta14-deoptimise.patch 1100 RMD160 efd20e164f76b72c3d64aee9c7a8861bdbab948f SHA1 cfa3042e083417c70bea9f3569b5f911e8603c27 SHA256 a1d840015ca2f35513b7fea2c3744b8840de166294ef4691e2a7a262eccb0372 +AUX libcaca-0.99_beta16-freeglut-2.6.patch 423 RMD160 9e0ebeaf22253861bc05b330bafc0dc5d3fa1df5 SHA1 510c5aa49e423ab14c521be593d86ace4eed85fc SHA256 46676871dcef12ab5d3595d317a0781850f02eaccdd9e47e5d167dbef6d7a10d DIST libcaca-0.99.beta16.tar.gz 966593 RMD160 fdfc9ab7edb2144f1b78620486d897d72c1cfa66 SHA1 894c8aa86bacb40154efaa8e4be9794ce0c3d7b9 SHA256 ca4c931cbed4bc4d8cbc942db91a7ff0ff5e0a4daec66eb2f274779918b64acc -EBUILD libcaca-0.99_beta16.ebuild 1730 RMD160 8e228ff124eed21c6534f20576e1ca5380ecd367 SHA1 8941dabd63053aee0defea05e02086979e08fc33 SHA256 d1ff6dcfc1af00690b82ad8ccdd274fd33158a6e3b6ff492d5301f689d6b3585 -MISC ChangeLog 11625 RMD160 4e7a0419e58119ba4e8252b0cf45f52c1895a2a8 SHA1 78573baba8ed0aafd78bf49af358e2463cdbd078 SHA256 e9e1ffe1cda07f815a3ed1782dcf1afcdce897586985fb1c638456741b0d14cc +EBUILD libcaca-0.99_beta16.ebuild 1779 RMD160 60efc546d5704d8033cd1052faed7a28fbd6204e SHA1 f47d84be5dce6a42a83eca003f5402eb1b9a72b2 SHA256 9999eec659da9c06fdecba2e6bf332dc1a55c71965b2619e06542a431ba16606 +MISC ChangeLog 11836 RMD160 c620af011f30549e81faa079836c37c43988edf2 SHA1 6c2b46cae571a946c75f63b46a9bc8c3e8b09ce6 SHA256 c20be923b5599d8ef16d701c62175253b8dbdd94e28a0dffe073c293d270913b MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkp/7oQACgkQvFcC4BYPU0oUOwCgvAELOOvcmzKRX7cq92Dfs0HC -4AcAoLH6Dpf2eQjTjgaOEgRqwFw8uX5q -=LmuT ------END PGP SIGNATURE----- diff --git a/media-libs/libcaca/files/libcaca-0.99_beta16-freeglut-2.6.patch b/media-libs/libcaca/files/libcaca-0.99_beta16-freeglut-2.6.patch new file mode 100644 index 000000000000..c0c980a4bfce --- /dev/null +++ b/media-libs/libcaca/files/libcaca-0.99_beta16-freeglut-2.6.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -223,7 +223,7 @@ + break]) + if test "${ac_cv_my_have_gl}" = "yes"; then + AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver) +- GL_LIBS="${GL_LIBS} -lGL -lglut" ++ GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut" + CACA_DRIVERS="${CACA_DRIVERS} gl" + elif test "${enable_gl}" = "yes"; then + AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files]) diff --git a/media-libs/libcaca/libcaca-0.99_beta16.ebuild b/media-libs/libcaca/libcaca-0.99_beta16.ebuild index 07c29bb61617..f0b2df13d21e 100644 --- a/media-libs/libcaca/libcaca-0.99_beta16.ebuild +++ b/media-libs/libcaca/libcaca-0.99_beta16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta16.ebuild,v 1.9 2009/08/09 12:40:39 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta16.ebuild,v 1.10 2009/08/24 19:54:11 arfrever Exp $ inherit eutils autotools libtool mono @@ -35,6 +35,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${PN}-0.99_beta14-deoptimise.patch" + epatch "${FILESDIR}/${P}-freeglut-2.6.patch" eautoreconf elibtoolize |