From a80ce6c59b7087cc2fd6b1ff5fc73141d723204f Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Sat, 16 Dec 2006 09:25:07 +0000 Subject: [PATCH] Changed patch to also use --without-vorbis. Package-Manager: portage-2.1.2_rc3-r5 --- media-libs/libquicktime/ChangeLog | 7 ++- media-libs/libquicktime/Manifest | 30 +++++------ .../libquicktime-0.9.10-automagic-deps.patch | 50 +++++++------------ .../libquicktime/libquicktime-0.9.10.ebuild | 7 +-- 4 files changed, 44 insertions(+), 50 deletions(-) diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 99d1f55dc059..d9a51dabea91 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,11 @@ # 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.71 2006/12/13 19:31:17 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.72 2006/12/16 09:25:07 zzam Exp $ + + 16 Dec 2006; Matthias Schwarzott + files/libquicktime-0.9.10-automagic-deps.patch, + libquicktime-0.9.10.ebuild: + Changed patch to also use --without-vorbis. 13 Dec 2006; Matthias Schwarzott files/libquicktime-0.9.10-automagic-deps.patch, diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index 880d94105702..33c4ee8e2078 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libquicktime-0.9.10-automagic-deps.patch 5600 RMD160 4d053d087a2ff1c848e16a2194cfead8e311a663 SHA1 961e3b296bbf6ec8cea28f5369f60a71e53f4a3a SHA256 56378365bc55f1c340b3fe7cd6b15ada2676350da7652323eb024b7a5ad78c13 -MD5 0c2c476d2734a9d88441525666571c50 files/libquicktime-0.9.10-automagic-deps.patch 5600 -RMD160 4d053d087a2ff1c848e16a2194cfead8e311a663 files/libquicktime-0.9.10-automagic-deps.patch 5600 -SHA256 56378365bc55f1c340b3fe7cd6b15ada2676350da7652323eb024b7a5ad78c13 files/libquicktime-0.9.10-automagic-deps.patch 5600 +AUX libquicktime-0.9.10-automagic-deps.patch 5207 RMD160 d6566e2c4f7d09269c9b5bb0c3ff67e4b288b75b SHA1 5d1422fb8021ca5471f33268ce2a63367d6655aa SHA256 eefc3e687819acb10d93b96e50cdef686da867bc051efcb8db58ba20d3f3f83f +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-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 +35,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 2993 RMD160 6634de8b0424edebdd1a25910e5a87cc9d898116 SHA1 d890a5c89565e50d9d8a8470e509cf88588b1cbe SHA256 31f75680d3338c871a6c40ab56003b52fd629480a13c4b2c615f2393605fd6b0 -MD5 3f1b92a374f0ed08ed9606cae1ca3cd1 libquicktime-0.9.10.ebuild 2993 -RMD160 6634de8b0424edebdd1a25910e5a87cc9d898116 libquicktime-0.9.10.ebuild 2993 -SHA256 31f75680d3338c871a6c40ab56003b52fd629480a13c4b2c615f2393605fd6b0 libquicktime-0.9.10.ebuild 2993 +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.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,10 +59,10 @@ 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 11446 RMD160 e359be4bed2b403b6d3c91079df1a85dc9825623 SHA1 fbffe4a384629832317cf98c550c9b06d4e55eb3 SHA256 8dd72bc35fb615d5db09180d2a4616af6b30064fe5d3ca16406113e36cec900b -MD5 4385399527ff4ca0002d408a6605427c ChangeLog 11446 -RMD160 e359be4bed2b403b6d3c91079df1a85dc9825623 ChangeLog 11446 -SHA256 8dd72bc35fb615d5db09180d2a4616af6b30064fe5d3ca16406113e36cec900b ChangeLog 11446 +MISC ChangeLog 11626 RMD160 3a51e091ddd6ac508b7ee729f3bd6e9c5e7489b1 SHA1 02f3bf19163acd21cf8e862cf333d491b349b4ce SHA256 404d6ef186168e3d5c9be6a17fad04e5785444fd14968070320c1a76d8c3d295 +MD5 a7719038f40c5825a1c902ecfd30e0cf ChangeLog 11626 +RMD160 3a51e091ddd6ac508b7ee729f3bd6e9c5e7489b1 ChangeLog 11626 +SHA256 404d6ef186168e3d5c9be6a17fad04e5785444fd14968070320c1a76d8c3d295 ChangeLog 11626 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251 @@ -88,7 +88,7 @@ SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFgFUMt2vP6XvVdOcRAvEHAJ9Bq/YOjarePw89PXbChkaMcbxIHACgsoZd -FlfrgPt8z1P3LC+h4v7NApg= -=/b6+ +iD8DBQFFg7t+t2vP6XvVdOcRAgKnAJ9/fmnXcSfSSOptzuUy/psBdi5wnACcDGH9 +dJxZ1rlAo9epNtmyFy27F2E= +=winx -----END PGP SIGNATURE----- diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch index 55f7e6e076ca..882cbc6e2ace 100644 --- a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch +++ b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch @@ -1,19 +1,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac --- libquicktime-0.9.10-orig/configure.ac 2006-12-13 17:27:44.000000000 +0100 -+++ libquicktime-0.9.10/configure.ac 2006-12-13 20:25:22.000000000 +0100 -@@ -154,7 +154,11 @@ - have_vorbis=false - AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there]) - -+AC_ARG_ENABLE([vorbis], AS_HELP_STRING([--disable-vorbis], [Build without vorbis library (default: test)])) -+ -+if test "x$enable_vorbis" != "xno"; then - XIPH_PATH_VORBIS(have_vorbis=true) -+fi - AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue) - - if test x$have_vorbis = xtrue; then -@@ -170,6 +174,10 @@ ++++ libquicktime-0.9.10/configure.ac 2006-12-16 09:49:28.000000000 +0100 +@@ -170,6 +170,10 @@ LAME_REQUIRED="3.93" have_lame="false" @@ -24,7 +12,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS -@@ -221,6 +229,8 @@ +@@ -221,6 +225,8 @@ AC_SUBST(LAME_LIBS) AC_SUBST(LAME_REQUIRED) @@ -33,7 +21,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_LAME, test x$have_lame = xtrue) dnl -@@ -249,6 +259,10 @@ +@@ -249,6 +255,10 @@ AH_TEMPLATE([HAVE_GL], [Do we have OpenGL?]) @@ -44,7 +32,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac have_gl="yes" AC_CHECK_HEADER([GL/gl.h],[],have_gl="no") -@@ -265,6 +279,8 @@ +@@ -265,6 +275,8 @@ AC_DEFINE(HAVE_GL,1) fi @@ -53,7 +41,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac dnl dnl Check for Alsa dnl -@@ -273,8 +289,15 @@ +@@ -273,8 +285,15 @@ AH_TEMPLATE([HAVE_ALSA], [Do we have Alsa?]) @@ -71,7 +59,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_ALSA, test x$have_alsa = xtrue) if test x$have_alsa = xtrue; then -@@ -298,7 +321,12 @@ +@@ -298,7 +317,12 @@ dnl This is neccesary for the utils/gtk subdirectory dnl GTK_REQUIRED="2.4.0" @@ -85,7 +73,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue) AC_SUBST(GTK_REQUIRED) -@@ -309,14 +337,20 @@ +@@ -309,14 +333,20 @@ dnl Check for libdv dnl @@ -110,7 +98,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_LIBDV, test x$have_libdv = xtrue) -@@ -324,6 +358,10 @@ +@@ -324,6 +354,10 @@ dnl Check for libjpeg dnl @@ -121,7 +109,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac JPEG_REQUIRED="6b" AC_CHECK_LIB(jpeg, jpeg_start_compress, [ JPEG_LIBS="-ljpeg" -@@ -333,6 +371,7 @@ +@@ -333,6 +367,7 @@ AC_SUBST(JPEG_LIBS) AC_SUBST(JPEG_CFLAGS) AC_SUBST(JPEG_REQUIRED) @@ -129,7 +117,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_LIBJPEG, test x$have_libjpeg = xtrue) dnl -@@ -344,6 +383,10 @@ +@@ -344,6 +379,10 @@ have_libavcodec=false @@ -140,7 +128,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AVCODEC_BUILD="3277056" dnl PKG_CHECK_MODULES(AVCODEC, avcodec_acl = $AVCODEC_REQUIRED, have_libavcodec="true", have_libavcodec="false") -@@ -351,6 +394,8 @@ +@@ -351,6 +390,8 @@ AVCODEC_REQUIRED=$AVCODEC_VERSION @@ -149,7 +137,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue) AC_SUBST(AVCODEC_REQUIRED) -@@ -366,6 +411,10 @@ +@@ -366,6 +407,10 @@ have_libpng=false PNG_REQUIRED="1.0.8" @@ -160,7 +148,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS -@@ -395,6 +444,8 @@ +@@ -395,6 +440,8 @@ AC_SUBST(PNG_LIBS) AC_SUBST(PNG_REQUIRED) @@ -169,7 +157,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_LIBPNG, test x$have_libpng = xtrue) dnl -@@ -407,6 +458,12 @@ +@@ -407,6 +454,12 @@ if test $have_gpl = "true"; then @@ -182,7 +170,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac LIBS="$LIBS -lfaac -lm" CFLAGS="$CFLAGS" -@@ -448,6 +505,8 @@ +@@ -448,6 +501,8 @@ AC_SUBST(FAAC_LIBS) AC_SUBST(FAAC_REQUIRED) @@ -191,7 +179,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AM_CONDITIONAL(HAVE_FAAC, test x$have_faac = xtrue) if test x$have_faac = xtrue; then -@@ -464,6 +523,11 @@ +@@ -464,6 +519,11 @@ if test $have_gpl = "true"; then @@ -203,7 +191,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AC_MSG_CHECKING(for faad2) OLD_CFLAGS=$CFLAGS -@@ -505,6 +569,8 @@ +@@ -505,6 +565,8 @@ fi @@ -212,7 +200,7 @@ diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac AC_SUBST(FAAD2_CFLAGS) AC_SUBST(FAAD2_LIBS) AC_SUBST(FAAD2_REQUIRED) -@@ -524,12 +590,17 @@ +@@ -524,12 +586,17 @@ if test $have_gpl = "true"; then X264_REQUIRED="0.48" diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild index 354cc49b7965..ea0b40996924 100644 --- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild +++ b/media-libs/libquicktime/libquicktime-0.9.10.ebuild @@ -1,6 +1,6 @@ # 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.4 2006/12/13 19:31:17 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.5 2006/12/16 09:25:07 zzam Exp $ WANT_AUTOCONF="latest" inherit libtool eutils autotools @@ -51,10 +51,11 @@ pkg_setup() { src_unpack() { unpack ${A} + + cd "${S}" epatch "${FILESDIR}/${P}-x264.patch" epatch "${FILESDIR}/${P}-automagic-deps.patch" - cd "${S}" eautoconf } @@ -75,7 +76,7 @@ src_compile() { $(use_with aac faad2) \ $(use_with png) \ $(use_with jpeg) \ - $(use_enable vorbis) \ + $(use vorbis || echo "--without-vorbis") \ $(use_with lame) \ $(use_with x264) \ $(use_with ffmpeg) \ -- 2.26.2