Enable compiling with X but without opengl, thanks to aballier.

Package-Manager: portage-2.1.2_rc3-r5

5 files changed, 62 insertions, 18 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index d9a51dabea91..08eea092dc31 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.72 2006/12/16 09:25:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.73 2006/12/16 10:30:07 zzam Exp $
+
+  16 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libquicktime-0.9.10-opengl-link.patch, libquicktime-0.9.10.ebuild:
+  Enable compiling with X but without opengl, thanks to aballier.
 
   16 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   files/libquicktime-0.9.10-automagic-deps.patch,
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 33c4ee8e2078..7dd35182ebfb 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,6 +5,10 @@ AUX libquicktime-0.9.10-automagic-deps.patch 5207 RMD160 d6566e2c4f7d09269c9b5bb
 MD5 26ec6a0a898ea90948f439295668d98f files/libquicktime-0.9.10-automagic-deps.patch 5207
 RMD160 d6566e2c4f7d09269c9b5bb0c3ff67e4b288b75b files/libquicktime-0.9.10-automagic-deps.patch 5207
 SHA256 eefc3e687819acb10d93b96e50cdef686da867bc051efcb8db58ba20d3f3f83f files/libquicktime-0.9.10-automagic-deps.patch 5207
+AUX libquicktime-0.9.10-opengl-link.patch 1018 RMD160 00e63519846b63d6a7bed6a7258701fc1cc7ec2b SHA1 c1936666304655f756d43fdb7dda3af89268881a SHA256 70875361d36d30f7aa2dcd763f4dc9941af84d04a639dfb9af33be14df029a3f
+MD5 b42b7d49673786fcf5cb26c75ad15328 files/libquicktime-0.9.10-opengl-link.patch 1018
+RMD160 00e63519846b63d6a7bed6a7258701fc1cc7ec2b files/libquicktime-0.9.10-opengl-link.patch 1018
+SHA256 70875361d36d30f7aa2dcd763f4dc9941af84d04a639dfb9af33be14df029a3f files/libquicktime-0.9.10-opengl-link.patch 1018
 AUX libquicktime-0.9.10-x264.patch 3129 RMD160 8327bf88fecddc902dd45ec029150852696d3d04 SHA1 39a9d9f66431f7c2ae1b8a33631f4c0c49d1d6ce SHA256 7a3cea6e1409836b9b932de7ef7f4418f8f4a517b38d74e6b0d509b0cab8b2cb
 MD5 1e837d815e6d6222aab3dc809387dc70 files/libquicktime-0.9.10-x264.patch 3129
 RMD160 8327bf88fecddc902dd45ec029150852696d3d04 files/libquicktime-0.9.10-x264.patch 3129
@@ -35,10 +39,10 @@ DIST libquicktime-0.9.4.tar.gz 782651 RMD160 93a8098770a860cba31d71f876b782c2a7b
 DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
 DIST libquicktime-0.9.9.tar.gz 926280 RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 SHA1 6221879c61bda6a695ffbc46c85e39db1b3ded65 SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da
 DIST libquicktime-m4-1.tar.bz2 3622 RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd SHA1 1ca6cf448f497fc23c82cb5ece7b1acc839d35c7 SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137
-EBUILD libquicktime-0.9.10.ebuild 3014 RMD160 4f54123510c346f14d5f287a8a07fbb3d0b3b0a3 SHA1 101a44679e7a2094d235abf13f95d905197555cd SHA256 5d3d49d21a1bccd9b30e6dd6ab76e4fd0c2699cf27c9cdee0f06dcd5ca5bc520
-MD5 e0fab2d98266adb5594f8bd4496c0ccc libquicktime-0.9.10.ebuild 3014
-RMD160 4f54123510c346f14d5f287a8a07fbb3d0b3b0a3 libquicktime-0.9.10.ebuild 3014
-SHA256 5d3d49d21a1bccd9b30e6dd6ab76e4fd0c2699cf27c9cdee0f06dcd5ca5bc520 libquicktime-0.9.10.ebuild 3014
+EBUILD libquicktime-0.9.10.ebuild 3158 RMD160 def377dc9145f408499518c4191421c1138bf6f4 SHA1 bf54aefe57d525e26ae1a6d374102ef7d148feed SHA256 c9376d22a5b7e9a8d52209b4f9117118ea889b3561a986902580f5c072c699fe
+MD5 51948f10d5e27db1d6ec5053146c4bae libquicktime-0.9.10.ebuild 3158
+RMD160 def377dc9145f408499518c4191421c1138bf6f4 libquicktime-0.9.10.ebuild 3158
+SHA256 c9376d22a5b7e9a8d52209b4f9117118ea889b3561a986902580f5c072c699fe libquicktime-0.9.10.ebuild 3158
 EBUILD libquicktime-0.9.2.ebuild 1566 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 SHA1 46fd5023f254793e029f4dd8f1bbe844849407ac SHA256 89d34c1ccfe6f9aeed1ff7206b3fca953dc50e877adacac056f59ac0148e54ee
 MD5 9a1d33daffe2ec7e701e22c08d8f0820 libquicktime-0.9.2.ebuild 1566
 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 libquicktime-0.9.2.ebuild 1566
@@ -59,17 +63,17 @@ EBUILD libquicktime-0.9.9.ebuild 2110 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2a
 MD5 3b460eb1e8ae72fb1e5f516fffe4d478 libquicktime-0.9.9.ebuild 2110
 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2ad32da libquicktime-0.9.9.ebuild 2110
 SHA256 293e07ef09deacee6aa9f6d7fc237ab879bf11ec0c65ad5fbf7d83f1831778fc libquicktime-0.9.9.ebuild 2110
-MISC ChangeLog 11626 RMD160 3a51e091ddd6ac508b7ee729f3bd6e9c5e7489b1 SHA1 02f3bf19163acd21cf8e862cf333d491b349b4ce SHA256 404d6ef186168e3d5c9be6a17fad04e5785444fd14968070320c1a76d8c3d295
-MD5 a7719038f40c5825a1c902ecfd30e0cf ChangeLog 11626
-RMD160 3a51e091ddd6ac508b7ee729f3bd6e9c5e7489b1 ChangeLog 11626
-SHA256 404d6ef186168e3d5c9be6a17fad04e5785444fd14968070320c1a76d8c3d295 ChangeLog 11626
+MISC ChangeLog 11822 RMD160 3ccc5d80d4d72e772024953e0e075f4c7841f382 SHA1 dda3a59c6001798a6778da7a23839c54fd8e8ffa SHA256 a1b5d39acad8f85e0052b9ca44d5a1e2d73d02786a28713fd343e1fbff0d9f9c
+MD5 0ee6e4f16a136d58d63d2d46e14aff58 ChangeLog 11822
+RMD160 3ccc5d80d4d72e772024953e0e075f4c7841f382 ChangeLog 11822
+SHA256 a1b5d39acad8f85e0052b9ca44d5a1e2d73d02786a28713fd343e1fbff0d9f9c ChangeLog 11822
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata.xml 251
-MD5 2fb7f4e7f0748f8306d62baafdcc928b files/digest-libquicktime-0.9.10 259
-RMD160 2fa0d44482370c5c91da409294fbb5ea0b375738 files/digest-libquicktime-0.9.10 259
-SHA256 22023fc653a050bada6ba72b7cf32278fc8b0fb9167be84a341157e1ca9c539a files/digest-libquicktime-0.9.10 259
+MD5 5812325d3a12d56c4a5d631c0b0f0515 files/digest-libquicktime-0.9.10 509
+RMD160 c59111ee3edaa6265ef2dfd2d35449192d397a92 files/digest-libquicktime-0.9.10 509
+SHA256 5d1779b682f46970b45c14892f919fa017ab8ca988bd067063c9e987dcb3a612 files/digest-libquicktime-0.9.10 509
 MD5 1f3b17fd4e51ee778a92b02b8fd94ec0 files/digest-libquicktime-0.9.2 256
 RMD160 3c3e35564e62d65623ceaa0c44b191a44edffd27 files/digest-libquicktime-0.9.2 256
 SHA256 c1a193d6878543ed2c9eda67dd305b9879833db0397a5533ed9dd89f9b1e4336 files/digest-libquicktime-0.9.2 256
@@ -88,7 +92,7 @@ SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFg7t+t2vP6XvVdOcRAgKnAJ9/fmnXcSfSSOptzuUy/psBdi5wnACcDGH9
-dJxZ1rlAo9epNtmyFy27F2E=
-=winx
+iD8DBQFFg8q6t2vP6XvVdOcRAvXKAKChZ2BDzjnHWHAjqLkonixxue8cOwCeIFha
+ICbdtv1bTM0N6hZhRJsiXIo=
+=clQp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.10 b/media-libs/libquicktime/files/digest-libquicktime-0.9.10
index 598e9494e086..4e1a513e9117 100644
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.10
+++ b/media-libs/libquicktime/files/digest-libquicktime-0.9.10
@@ -1,3 +1,6 @@
 MD5 5ff99f1a7b22f9e1ed85240f736fd14c libquicktime-0.9.10.tar.gz 851578
 RMD160 b29e4fc28ef17406e14e042faa36f673e6a89ca7 libquicktime-0.9.10.tar.gz 851578
 SHA256 7b7335721957a2e37dbc427daa2753f1c16b7e7f8877e6e9b629b1dd011d1ecd libquicktime-0.9.10.tar.gz 851578
+MD5 80fb928062ba23e4833c0319ab60e678 libquicktime-m4-1.tar.bz2 3622
+RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd libquicktime-m4-1.tar.bz2 3622
+SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137 libquicktime-m4-1.tar.bz2 3622
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch
new file mode 100644
index 000000000000..3ba49179e91f
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch
@@ -0,0 +1,29 @@
+diff -ru libquicktime-0.9.10/configure.ac libquicktime-0.9.10-opengl-link/configure.ac
+--- libquicktime-0.9.10/configure.ac	2006-12-16 09:49:28.000000000 +0100
++++ libquicktime-0.9.10-opengl-link/configure.ac	2006-12-16 11:19:02.000000000 +0100
+@@ -273,10 +273,13 @@
+ 
+ if test "x$have_gl" = "xyes"; then
+ AC_DEFINE(HAVE_GL,1)
++GL_LIBS=-lGLU -lGL
+ fi
+ 
+ fi
+ 
++AC_SUBST(GL_LIBS)
++
+ dnl
+ dnl Check for Alsa
+ dnl
+diff -ru libquicktime-0.9.10/utils/Makefile.am libquicktime-0.9.10-opengl-link/utils/Makefile.am
+--- libquicktime-0.9.10/utils/Makefile.am	2005-10-10 19:05:25.000000000 +0200
++++ libquicktime-0.9.10-opengl-link/utils/Makefile.am	2006-12-16 11:10:17.000000000 +0100
+@@ -55,7 +55,7 @@
+ 
+ lqtplay_SOURCES=lqtplay.c
+ lqtplay_LDADD=@UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
+-	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm @ALSA_LIBS@ @OSSAUDIO_LIBS@
++	-lXv @GL_LIBS@ -lX11 @X_EXTRA_LIBS@ -lm @ALSA_LIBS@ @OSSAUDIO_LIBS@
+ 
+ INCLUDES = -I$(top_srcdir)/include \
+ 	    -I$(top_builddir)/include/quicktime \
diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
index ea0b40996924..30b49db0ecaa 100644
--- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.5 2006/12/16 09:25:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.6 2006/12/16 10:30:07 zzam Exp $
 
+WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 inherit libtool eutils autotools
 
 DESCRIPTION="A library based on quicktime4linux with extensions"
 HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-m4-1.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -55,8 +57,10 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-x264.patch"
 	epatch "${FILESDIR}/${P}-automagic-deps.patch"
+	epatch "${FILESDIR}/${P}-opengl-link.patch"
 
-	eautoconf
+	cp ${WORKDIR}/m4/* m4/
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {