summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-24 19:54:11 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-24 19:54:11 +0000
commitdb5eba892cd0b357d7f60b1dba58101ab891a315 (patch)
treebf5df2616438c5267cd164d4506e36fc086f36b9 /media-libs/libcaca
parentVersion bump. (diff)
downloadgentoo-2-db5eba892cd0b357d7f60b1dba58101ab891a315.tar.gz
gentoo-2-db5eba892cd0b357d7f60b1dba58101ab891a315.tar.bz2
gentoo-2-db5eba892cd0b357d7f60b1dba58101ab891a315.zip
Fix building with media-libs/freeglut-2.6* (bug #282573).
(Portage version: 14153-svn/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libcaca')
-rw-r--r--media-libs/libcaca/ChangeLog6
-rw-r--r--media-libs/libcaca/files/libcaca-0.99_beta16-freeglut-2.6.patch11
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta16.ebuild3
3 files changed, 18 insertions, 2 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/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