diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-02-04 19:08:25 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-02-04 19:08:25 +0000 |
| commit | c33ce90cb59ed6a7c33d19a4570ed99b11b9acbc (patch) | |
| tree | ced02f43d8ab7ba2f6f26c7a13943e1d3ef1ac4e /sci-astronomy | |
| parent | Fix accidental keyword dropping (diff) | |
| download | gentoo-2-c33ce90cb59ed6a7c33d19a4570ed99b11b9acbc.tar.gz gentoo-2-c33ce90cb59ed6a7c33d19a4570ed99b11b9acbc.tar.bz2 gentoo-2-c33ce90cb59ed6a7c33d19a4570ed99b11b9acbc.zip | |
Allow to use theora with glut wrt #399237 by <boxcars@gmx.net>
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/celestia/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-astronomy/celestia/files/celestia-1.6.1-linking.patch | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog index dba5254c92a6..ab3e6a0ace29 100644 --- a/sci-astronomy/celestia/ChangeLog +++ b/sci-astronomy/celestia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-astronomy/celestia -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.81 2011/11/01 08:13:01 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.82 2012/02/04 19:08:25 xarthisius Exp $ + + 04 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> + files/celestia-1.6.1-linking.patch: + Allow to use theora with glut wrt #399237 by <boxcars@gmx.net> 01 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> celestia-1.6.1.ebuild, -files/celestia-1.6.1-as-needed.patch, -files/celestia-1.6.1-gold.patch, diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch index d610d5243f2a..dd5f93e609a6 100644 --- a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch +++ b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch @@ -1,6 +1,7 @@ Fix linking issues: * underlinking GLUT (bug #372123, #387609) * as-needed (bug #281258) + * theora with glut (bug #399237) --- a/src/celestia/Makefile.am +++ b/src/celestia/Makefile.am @@ -52,3 +53,13 @@ Fix linking issues: noinst_HEADERS = $(wildcard *.h) noinst_DATA = ../../celestia +--- a/configure.in ++++ b/configure.in +@@ -252,6 +252,7 @@ + dnl Check for GLUT. + AC_CHECK_LIB(glut, glutKeyboardUpFunc, , + [AC_MSG_ERROR([GLUT library version >= 3.7 not found])]) ++ check_theora="yes" + fi + AM_CONDITIONAL(ENABLE_GLUT, test "$ui_glut" = "yes") + |