Control all automagic dependencies by use-flags now, solving Bugs #140873, #148216.

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 87761ef034b85c6777dec840eda83fef9507058f..f6d7e7f91b9e71b65433d4a92fe84dfe4b8569d1 100644 (file)
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2006/11/09 09:38:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.70 2006/12/13 19:01:29 zzam Exp $
+
+  13 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libquicktime-0.9.10-automagic-deps.patch,
+  libquicktime-0.9.10.ebuild:
+  Control all automagic dependencies by use-flags now, solving Bugs #140873,
+  #148216.
 
   09 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   libquicktime-0.9.7-r1.ebuild:

diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index dd262dc3103a0fc7ac527b31ccbee82ffe5f5487..d2671e65782bf0f05f8bada9a18a0eefcf9f65d1 100644 (file)
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libquicktime-0.9.10-automagic-deps.patch 5601 RMD160 3c7bfdf73d93b6ff34b36eb6ffe58a883c0f213e SHA1 88d4e0d78fc335c6be120cfd360750d1cd1d1646 SHA256 a64735885ef344f034d33729507e5371451544ff3efd71dc213811d79dff1bff
+MD5 aba947dfc2bb2d98ffc8a5a32f4ce530 files/libquicktime-0.9.10-automagic-deps.patch 5601
+RMD160 3c7bfdf73d93b6ff34b36eb6ffe58a883c0f213e files/libquicktime-0.9.10-automagic-deps.patch 5601
+SHA256 a64735885ef344f034d33729507e5371451544ff3efd71dc213811d79dff1bff files/libquicktime-0.9.10-automagic-deps.patch 5601
 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
@@ -31,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 2199 RMD160 15be1b143be7e1285546a6d79ecf9d63e9f305ce SHA1 b63d098d7ec1e7f935547f1cfe0ebbe737e06aa0 SHA256 882e6de6a6e640a2b6548cebad09e2bd02b706e7b2aab0d0b712b78e298ca62d
-MD5 f9232c1fa6bdf15968017ef953a63545 libquicktime-0.9.10.ebuild 2199
-RMD160 15be1b143be7e1285546a6d79ecf9d63e9f305ce libquicktime-0.9.10.ebuild 2199
-SHA256 882e6de6a6e640a2b6548cebad09e2bd02b706e7b2aab0d0b712b78e298ca62d libquicktime-0.9.10.ebuild 2199
+EBUILD libquicktime-0.9.10.ebuild 2991 RMD160 b86c7ae459c714da92a3f33773ab27ef5d833acb SHA1 df522b80566f0dbb2fcd3aaa46f193c46a6416eb SHA256 49e0fb339c3caf16c09e52295f194ca8cd88867f720ebaa35e1f53633a06abad
+MD5 7793a59764aeec3e336bb1e3232df02e libquicktime-0.9.10.ebuild 2991
+RMD160 b86c7ae459c714da92a3f33773ab27ef5d833acb libquicktime-0.9.10.ebuild 2991
+SHA256 49e0fb339c3caf16c09e52295f194ca8cd88867f720ebaa35e1f53633a06abad libquicktime-0.9.10.ebuild 2991
 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
@@ -55,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 11019 RMD160 372b57a9cbcee614a9fec35929cfec202e1d9da4 SHA1 194ea6f27f912723b8c10efc53364e85da0c9e9e SHA256 afae573d5b5819a645e9d5c113c78eef15e721f1df235db8268a198fd6b616c6
-MD5 e773487ef9189b1082ae43402c77017e ChangeLog 11019
-RMD160 372b57a9cbcee614a9fec35929cfec202e1d9da4 ChangeLog 11019
-SHA256 afae573d5b5819a645e9d5c113c78eef15e721f1df235db8268a198fd6b616c6 ChangeLog 11019
+MISC ChangeLog 11242 RMD160 8266509fa405b882a3343374fac52ef7e02d9c67 SHA1 dbd5b8886cb0c8592960fa255f01d8c0600bcd09 SHA256 b832c8ebc4abb58e6501342f04292781ca450ca538a0ce5f73038d050d776236
+MD5 6d16d94eea0f270914dd67e7c7732476 ChangeLog 11242
+RMD160 8266509fa405b882a3343374fac52ef7e02d9c67 ChangeLog 11242
+SHA256 b832c8ebc4abb58e6501342f04292781ca450ca538a0ce5f73038d050d776236 ChangeLog 11242
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -82,9 +86,9 @@ MD5 724a301e45d8d08f65e454647ead84ae files/digest-libquicktime-0.9.9-r1 256
 RMD160 a564e03f1dcb0cb4bb3352579c12b96a3eee61d5 files/digest-libquicktime-0.9.9-r1 256
 SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/digest-libquicktime-0.9.9-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFUvcOt2vP6XvVdOcRAmvSAJsE9Y1Roj/j8KQ5dRHxenCpna5O9gCfW6pG
-1xzqF5fLOwbUdBHiIpPSE5Q=
-=mG1t
+iD8DBQFFgE4Vt2vP6XvVdOcRAjSMAJ9FCFyallTZo01nQVrjmF+wWjJJ8wCggZ+Y
+wRzwWiLRhy+DwhesDvOoWJE=
+=hbn8
 -----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
new file mode 100644 (file)
index 0000000..0d748d7
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
@@ -0,0 +1,234 @@
+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 19:53:21.000000000 +0100
+@@ -153,8 +153,12 @@
+  
+ have_vorbis=false
+ AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there])
+-  
++
++AC_ARG_WITH([vorbis], AS_HELP_STRING([--without-vorbis], [Build without vorbis library (default: test)]))
++
++if test "x$with_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 @@
+ LAME_REQUIRED="3.93"
+ have_lame="false"
+ 
++AC_ARG_WITH([lame], AS_HELP_STRING([--without-lame], [Build without lame library (default: test)]))
++
++if test "x$with_lame" != "xno"; then
++
+ OLD_CFLAGS=$CFLAGS
+ OLD_LIBS=$LIBS
+ 
+@@ -221,6 +229,8 @@
+ AC_SUBST(LAME_LIBS)
+ AC_SUBST(LAME_REQUIRED)
+ 
++fi
++
+ AM_CONDITIONAL(HAVE_LAME, test x$have_lame = xtrue)
+ 
+ dnl
+@@ -249,6 +259,10 @@
+ 
+ AH_TEMPLATE([HAVE_GL], [Do we have OpenGL?])
+ 
++AC_ARG_WITH([opengl], AS_HELP_STRING([--without-opengl], [Build without opengl library (default: test)]))
++
++if test "x$with_opengl" != "xno"; then
++
+ have_gl="yes"
+ 
+ AC_CHECK_HEADER([GL/gl.h],[],have_gl="no")
+@@ -265,6 +279,8 @@
+ AC_DEFINE(HAVE_GL,1)
+ fi
+ 
++fi
++
+ dnl
+ dnl Check for Alsa
+ dnl
+@@ -273,8 +289,15 @@
+ 
+ AH_TEMPLATE([HAVE_ALSA], [Do we have Alsa?])
+ 
+-ALSA_REQUIRED="0.9"
+-PKG_CHECK_MODULES(ALSA, alsa >= $ALSA_REQUIRED, have_alsa="true", have_alsa="false")
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
++if test "x$with_alsa" != "xno"; then
++
++  ALSA_REQUIRED="0.9"
++  PKG_CHECK_MODULES(ALSA, alsa >= $ALSA_REQUIRED, have_alsa="true", have_alsa="false")
++
++fi
++
+ AM_CONDITIONAL(HAVE_ALSA, test x$have_alsa = xtrue)
+ 
+ if test x$have_alsa = xtrue; then
+@@ -298,7 +321,12 @@
+ dnl This is neccesary for the utils/gtk subdirectory
+ dnl
+ GTK_REQUIRED="2.4.0"
+-AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
++AC_ARG_WITH([gtk], AS_HELP_STRING([--without-gtk], [Build without gtk library (default: test)]))
++
++if test "x$with_gtk" != "xno"; then
++  AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
++fi
++
+ AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue)
+ AC_SUBST(GTK_REQUIRED)
+ 
+@@ -309,14 +337,20 @@
+ dnl Check for libdv
+ dnl
+ 
++AC_ARG_WITH([libdv], AS_HELP_STRING([--without-libdv], [Build without libdv support (default: test)]))
++
+ have_libdv="false"
+ 
+ LIBDV_REQUIRED="0.102"
+ 
+-PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
+-AC_SUBST(LIBDV_REQUIRED)
+-AC_SUBST(LIBDV_LIBS)
+-AC_SUBST(LIBDV_CFLAGS)
++if test "x$with_libdv" != "xno"; then
++
++  PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
++  AC_SUBST(LIBDV_REQUIRED)
++  AC_SUBST(LIBDV_LIBS)
++  AC_SUBST(LIBDV_CFLAGS)
++
++fi
+ 
+ AM_CONDITIONAL(HAVE_LIBDV, test x$have_libdv = xtrue)
+ 
+@@ -324,6 +358,10 @@
+ dnl Check for libjpeg
+ dnl
+ 
++AC_ARG_WITH([jpeg], AS_HELP_STRING([--without-jpeg], [Build without jpeg library (default: test)]))
++
++if test "x$with_jpeg" != "xno"; then
++
+ JPEG_REQUIRED="6b"
+ AC_CHECK_LIB(jpeg, jpeg_start_compress,
+           [ JPEG_LIBS="-ljpeg"
+@@ -333,6 +371,7 @@
+ AC_SUBST(JPEG_LIBS)
+ AC_SUBST(JPEG_CFLAGS)
+ AC_SUBST(JPEG_REQUIRED)
++fi
+ AM_CONDITIONAL(HAVE_LIBJPEG, test x$have_libjpeg = xtrue)
+ 
+ dnl
+@@ -344,6 +383,10 @@
+ 
+ have_libavcodec=false
+ 
++AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)]))
++
++if test "x$with_ffmpeg" != "xno"; then
++
+ AVCODEC_BUILD="3277056"
+ 
+ dnl PKG_CHECK_MODULES(AVCODEC, avcodec_acl = $AVCODEC_REQUIRED, have_libavcodec="true", have_libavcodec="false")
+@@ -351,6 +394,8 @@
+ 
+ AVCODEC_REQUIRED=$AVCODEC_VERSION
+ 
++fi
++
+ AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue)
+ 
+ AC_SUBST(AVCODEC_REQUIRED)
+@@ -366,6 +411,10 @@
+ have_libpng=false
+ PNG_REQUIRED="1.0.8"
+ 
++AC_ARG_WITH([png], AS_HELP_STRING([--without-png], [Build without png library (default: test)]))
++
++if test "x$with_png" != "xno"; then
++
+ OLD_CFLAGS=$CFLAGS
+ OLD_LIBS=$LIBS
+ 
+@@ -395,6 +444,8 @@
+ AC_SUBST(PNG_LIBS)
+ AC_SUBST(PNG_REQUIRED)
+ 
++fi
++
+ AM_CONDITIONAL(HAVE_LIBPNG, test x$have_libpng = xtrue)
+ 
+ dnl
+@@ -407,6 +458,12 @@
+ 
+ if test $have_gpl = "true"; then
+ 
++AC_ARG_WITH([faac], AS_HELP_STRING([--without-faac], [Build without faac library (default: test)]))
++
++if test "x$with_faac" != "xno"; then
++OLD_CFLAGS=$CFLAGS
++OLD_LIBS=$LIBS
++
+ LIBS="$LIBS -lfaac -lm"
+ CFLAGS="$CFLAGS"
+ 
+@@ -448,6 +505,8 @@
+ AC_SUBST(FAAC_LIBS)
+ AC_SUBST(FAAC_REQUIRED)
+ 
++fi
++
+ AM_CONDITIONAL(HAVE_FAAC, test x$have_faac = xtrue)
+ 
+ if test x$have_faac = xtrue; then
+@@ -464,6 +523,11 @@
+ 
+ if test $have_gpl = "true"; then
+ 
++
++AC_ARG_WITH([faad2], AS_HELP_STRING([--without-faad2], [Build without faad2 library (default: test)]))
++
++if test "x$with_faad2" != "xno"; then
++
+ AC_MSG_CHECKING(for faad2)
+ 
+ OLD_CFLAGS=$CFLAGS
+@@ -505,6 +569,8 @@
+ 
+ fi
+ 
++fi
++
+ AC_SUBST(FAAD2_CFLAGS)
+ AC_SUBST(FAAD2_LIBS)
+ AC_SUBST(FAAD2_REQUIRED)
+@@ -524,12 +590,17 @@
+ if test $have_gpl = "true"; then
+ X264_REQUIRED="0.48"
+ 
++AC_ARG_WITH([x264], AS_HELP_STRING([--without-x264], [Build without x264 library (default: test)]))
++
++if test "x$with_x264" != "xno"; then
++
+ PKG_CHECK_MODULES(X264, x264 >= $X264_REQUIRED, have_x264="true", have_x264="false")
+ AC_SUBST(X264_REQUIRED)
+ AC_SUBST(X264_LIBS)
+ AC_SUBST(X264_CFLAGS)
+ 
+ fi
++fi
+ AM_CONDITIONAL(HAVE_X264, test x$have_x264 = xtrue)
+ 
+ if test "x$prefix" = xNONE; then

diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
index cb619967858f5865646af8fbfccb70abb852e706..4f052686f2875ec48323548b671a48b8c20f5209 100644 (file)
--- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
@@ -1,7 +1,8 @@
 # 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.2 2006/10/20 21:48:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.3 2006/12/13 19:01:29 zzam Exp $
 
+WANT_AUTOCONF="latest"
 inherit libtool eutils autotools
 
 DESCRIPTION="A library based on quicktime4linux with extensions"
@@ -12,23 +13,34 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="mmx X"
-
-DEPEND="media-libs/libdv
-       >=x11-libs/gtk+-2.4.0
-       media-libs/libpng
-       media-libs/jpeg
-       media-libs/libvorbis
-       media-libs/libogg
-       >=media-libs/x264-svn-20060810
-       X? ( || ( ( x11-libs/libXaw
-                               x11-libs/libXv
-                               x11-proto/xextproto
-                       )
-                       virtual/x11
-               )
+IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg"
+
+RDEPEND="dv? ( media-libs/libdv )
+       gtk? ( >=x11-libs/gtk+-2.4.0 )
+       aac? (
+               media-libs/faad2
+               encode? ( media-libs/faac )
+       )
+       alsa? ( media-libs/alsa-lib )
+       png? ( media-libs/libpng )
+       jpeg? ( media-libs/jpeg )
+       vorbis? ( media-libs/libvorbis media-libs/libogg )
+       lame? ( media-sound/lame )
+       ffmpeg? ( media-video/ffmpeg )
+       x264? ( >=media-libs/x264-svn-20060810 )
+       X? ( x11-libs/libXaw
+               x11-libs/libXv
+               x11-libs/libXext
+               x11-libs/libX11
+               opengl? ( media-libs/mesa )
        )
        !virtual/quicktime"
+DEPEND="${RDEPEND}
+       X? (
+               x11-proto/videoproto
+               x11-proto/xextproto
+       )"
+
 PROVIDE="virtual/quicktime"
 
 pkg_setup() {
@@ -40,16 +52,38 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        epatch "${FILESDIR}/${P}-x264.patch"
+       epatch "${FILESDIR}/${P}-automagic-deps.patch"
+
+       cd "${S}"
+       eautoconf
 }
 
 src_compile() {
+       local MY_OPTS=""
+       if use !encode || use !aac; then
+               MY_OPTS="--without-faac"
+       fi
+
        econf --enable-shared \
                --enable-static \
                --enable-gpl \
                $(use_enable mmx) \
                $(use_with X x) \
+               $(use_with gtk) \
+               $(use_with dv libdv) \
+               $(use_with alsa) \
+               $(use_with aac faad2) \
+               $(use_with png) \
+               $(use_with jpeg) \
+               $(use_with vorbis) \
+               $(use_with lame) \
+               $(use_with x264) \
+               $(use_with ffmpeg) \
+               $(use_with opengl) \
+               ${MY_OPTS} \
                --without-cpuflags || die "econf failed"
-               emake || die "emake failed"
+
+       emake || die "emake failed"
 }
 
 src_install() {