Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-astronomy/celestia/files: celestia-1.6.1-linking.patch
Date: Sat, 04 Feb 2012 19:08:35
Message-Id: 20120204190825.6D0BF2004B@flycatcher.gentoo.org
1 xarthisius 12/02/04 19:08:25
2
3 Modified: celestia-1.6.1-linking.patch
4 Log:
5 Allow to use theora with glut wrt #399237 by <boxcars@×××.net>
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sci-astronomy/celestia/files/celestia-1.6.1-linking.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch?r1=1.1&r2=1.2
15
16 Index: celestia-1.6.1-linking.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- celestia-1.6.1-linking.patch 1 Nov 2011 08:13:01 -0000 1.1
23 +++ celestia-1.6.1-linking.patch 4 Feb 2012 19:08:25 -0000 1.2
24 @@ -1,6 +1,7 @@
25 Fix linking issues:
26 * underlinking GLUT (bug #372123, #387609)
27 * as-needed (bug #281258)
28 + * theora with glut (bug #399237)
29
30 --- a/src/celestia/Makefile.am
31 +++ b/src/celestia/Makefile.am
32 @@ -52,3 +53,13 @@
33
34 noinst_HEADERS = $(wildcard *.h)
35 noinst_DATA = ../../celestia
36 +--- a/configure.in
37 ++++ b/configure.in
38 +@@ -252,6 +252,7 @@
39 + dnl Check for GLUT.
40 + AC_CHECK_LIB(glut, glutKeyboardUpFunc, ,
41 + [AC_MSG_ERROR([GLUT library version >= 3.7 not found])])
42 ++ check_theora="yes"
43 + fi
44 + AM_CONDITIONAL(ENABLE_GLUT, test "$ui_glut" = "yes")
45 +