Allow to use theora with glut wrt #399237 by <boxcars@gmx.net>

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 32 insertions, 17 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/Manifest b/sci-astronomy/celestia/Manifest
index ae4bc7d314a5..c9d4a049cc0c 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -5,25 +5,25 @@ AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
 AUX celestia-1.6.1-gcc46.patch 278 RMD160 0de86a5a96c9c392fa5b7b352a9f7e77d75b8b1d SHA1 7c08ca391603806d788cb8f3342acedafc924eef SHA256 5fb9becc79e12e57c296d3861591cd22b2b11a591cca755c2bfff202fd6dc757
 AUX celestia-1.6.1-libpng15.patch 387 RMD160 9f51b8d11789d81c43366f32a0fedc1db0bdbc41 SHA1 46ecc4e10b24191384bc848c206652498843adf0 SHA256 ba3269842103ab68a1abd0fceb388878932d042620902796986625bd2b5f35cb
-AUX celestia-1.6.1-linking.patch 1216 RMD160 cb274de785b10b521d30157df711f8317dc00687 SHA1 534c8eee18d13a868c91f0b870ebecc05f3e7ae1 SHA256 443841e39994de8bbf5bdd7197b45fa91a87d66022dc85041265546b04f61dd5
+AUX celestia-1.6.1-linking.patch 1526 RMD160 6f51d004f3d3ce2261939399b52e6fec7a9e6c0a SHA1 24204e211c24aafe88f39a71f971508177af4040 SHA256 8365533dd3401dc43d4d1f3543acde326f12ef0b862cadb7cf40428e92b715cc
 DIST celestia-1.6.1.tar.gz 52600436 RMD160 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a SHA1 1f0fdf4525a8b9d6c708e1f6383babed670d18e7 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4
 EBUILD celestia-1.6.1.ebuild 3031 RMD160 b2621eaf911e472cc88503a60eb06eed6141c09c SHA1 de577c10841ea0d9656b30db7990b2b9555d5ad2 SHA256 7aa9266f4e4d40e41fb681ffd963428a62c2d1c910a9df55d3c2ed46d3ccb774
-MISC ChangeLog 18855 RMD160 9ffd4a1dda0d4b8c6145c651d2eec5c83f64f777 SHA1 da4a4692c4860974ecc5f751615a5b876b9f124f SHA256 757db4c1f6906f09b6896f1f04e646800405a9d0a222e40b8af70575844d55a7
+MISC ChangeLog 19013 RMD160 99d5a6e9d3d653e12d06832de0e368b1d0ae37b1 SHA1 ea706414dffaf09e11508bbaef698735dc2f22cd SHA256 3309cbf9376296022cf6dd7fb8d05bf5f88e1822e7de04ded4bf2d97715ad827
 MISC metadata.xml 705 RMD160 cee4824e632be1d7e4e3eac24b556e841317b018 SHA1 479d9d525d2198e03ea2a6f7da39686ff7f1a1e6 SHA256 95695c52447533d5265d496b677a78e35f0118f9e34b539dd8b8f3a90d158421
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOr6oWAAoJEF0huFKJUZL5Or4P/1SgyIUmkHUpvKnnXzCuNGnz
-Lbpctg73AlodTnYiZEv7ar4qa6SXdxl4MbCQb4sxPHxiGItO0fzy7xMGI2RsM+Rg
-tVVNS8eo9ajkqkmBdAPSoa9GSvKACP7A7lrBVMGXrSQX3Urw2XAfATBROAfXm6kp
-OiGyzEBYqnxA/LJoZeVNyl5CTMymypjHn4Bw8lW+zHEi0sy4g0pJB8dKQl4yWnd1
-FCYfBTiTG+gvvGdy9exyzhABJbts3FYLe9dXZpHYi9Hjy+ntp6WaRF+1orY6AF2U
-GshXqp/rjL410yOU4Ty4NsVwrFhzsXZKjkanOJ+ZptQaEF5NMSby6VAK4BFbLv9l
-7zXjQPRzxglWolbdrU8COTdVj0vdoMBm/hTDz1M5mcXUMHtQQztaWJTHaSC5+JNy
-taTZihcCf9jMe8KfKEGWN+zwUGucoJkISVsQhsYtMkWsj7z/5/jO0IcRDJMqoqgU
-N8j+rtrom14TQyaEVcCzZYqYUFNYPAIMkCki2ug9XRpa127y//nme3Hac/M8m4Mw
-hmuFUQumWxp6RsoRhGytgNK+zeBS+gSk/ZJ57s9jsmPtG4tCz8wo2s1ucrKi1S1j
-HO6iBoLWjxiLgYyiKBgDpgj15E9cBzsOceUjMkM8tZlZFGBDX5O09yjDykOLS7dn
-TdmM3ZIHn1s254J4Nnus
-=eSaG
+iQIcBAEBCAAGBQJPLYIyAAoJEF0huFKJUZL5+N0QAKV2TLuy6U72ibK1uvUtQxtQ
+/YD0fzHmiMmYaeesSlDodfYRsvX2Mgn1CrRTfGi8McM59hKTFy2Psmhlw9CVqX04
+JuMi64NaILpmrna6tGX1dS9CJAEPgq3i0Ge04HuWmdRe/Ye2vHha/rEQroLIudcb
+JKBgu8dzXotek6JWm1Pn8c11fPZqNdneEmGlHI01LISFeAsOvsW4s1odvu3vLtiJ
+WzoFvL9i/mEO3FjjAXxGL/7oULSu94Sr7mrmEwHGotlUg4Y33B19QQzmVxGy+NZa
+W6fOMwtfq+l1qufsiQK3Gms9fF8Y5VvJ05sq9yZTTQ2om/kXz8bRt7iZmtoa73i7
+J+XQ/d7/aCmXbTDeHn3bAYqNjyHxog0znI8GW3koUZtRxl2YSRwM8uEzdXtwknrU
+CloGNFtF5DB6wxCu5W3gGbHBnjRRg2ORd5Q2YQnZXHGKZko9gEx7ks2jyea0v81c
+LOs2xiy80vPDyLfTn6my/xBCbWN5VIYuoP/khAk/JfUesMxkEfna0DcWTIOaj9Mo
+DShToXJTSxy8iQxUkttgxDpyI3eqnYedmM8X9KrJ/ervFAWXBcMVHSMnr1wvfI9K
+m4B1LPtWO5h1W3gUYbmzA+WYHLUC/oiFLDRWnZtHFqf+y41FdaZ+T+b3niF4PVBV
+3DX9kwEBeza2ClxikDaT
+=um+C
 -----END PGP SIGNATURE-----
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")
+