diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-08-07 15:18:03 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-08-07 15:18:03 +0000 |
| commit | e16f9584e0156af20ba5ab988af3f257adf0682b (patch) | |
| tree | dfeef1a99df5ff6e05156c3930d22b3f80bb6a51 /media-libs/libcaca | |
| parent | * bump (diff) | |
| download | gentoo-2-e16f9584e0156af20ba5ab988af3f257adf0682b.tar.gz gentoo-2-e16f9584e0156af20ba5ab988af3f257adf0682b.tar.bz2 gentoo-2-e16f9584e0156af20ba5ab988af3f257adf0682b.zip | |
backport a fix from upstream to fix build with use=-opengl, bug #234057
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'media-libs/libcaca')
| -rw-r--r-- | media-libs/libcaca/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch | 14 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.99_beta14.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index 740226eea230..e78c62cb9146 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libcaca # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.62 2008/08/06 15:21:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.63 2008/08/07 15:18:02 aballier Exp $ + + 07 Aug 2008; Alexis Ballier <aballier@gentoo.org> + +files/libcaca-0.99_beta14-nogl.patch, libcaca-0.99_beta14.ebuild: + backport a fix from upstream to fix build with use=-opengl, bug #234057 06 Aug 2008; Alexis Ballier <aballier@gentoo.org> libcaca-0.99_beta14.ebuild: diff --git a/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch b/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch new file mode 100644 index 000000000000..26d8899fafd2 --- /dev/null +++ b/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch @@ -0,0 +1,14 @@ +Index: configure.ac +=================================================================== +--- configure.ac (revision 2538) ++++ configure.ac (revision 2539) +@@ -218,8 +218,8 @@ + AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files]) + fi + PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"]) +- AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes") + fi ++AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes") + + if test "${enable_cocoa}" != "no"; then + ac_cv_my_have_cocoa="no" diff --git a/media-libs/libcaca/libcaca-0.99_beta14.ebuild b/media-libs/libcaca/libcaca-0.99_beta14.ebuild index e959d9b2a7df..7b00871975f3 100644 --- a/media-libs/libcaca/libcaca-0.99_beta14.ebuild +++ b/media-libs/libcaca/libcaca-0.99_beta14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta14.ebuild,v 1.2 2008/08/06 15:21:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta14.ebuild,v 1.3 2008/08/07 15:18:02 aballier 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}-nogl.patch" eautoreconf elibtoolize |