diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-12-13 19:31:17 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-12-13 19:31:17 +0000 |
| commit | cf645aad415c2d2e43d1949e1cdf6b4940d6af1e (patch) | |
| tree | 2f9615f187df9f65b62dba59682fbf7b86161921 | |
| parent | Control all automagic dependencies by use-flags now, solving Bugs #140873, #1... (diff) | |
| download | gentoo-2-cf645aad415c2d2e43d1949e1cdf6b4940d6af1e.tar.gz gentoo-2-cf645aad415c2d2e43d1949e1cdf6b4940d6af1e.tar.bz2 gentoo-2-cf645aad415c2d2e43d1949e1cdf6b4940d6af1e.zip | |
Changed vorbis-switch to enable, to prevent clash with vorbis-path.
(Portage version: 2.1.2_rc3-r4)
| -rw-r--r-- | media-libs/libquicktime/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch | 12 | ||||
| -rw-r--r-- | media-libs/libquicktime/libquicktime-0.9.10.ebuild | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index f6d7e7f91b9e..99d1f55dc059 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.70 2006/12/13 19:01:29 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.71 2006/12/13 19:31:17 zzam Exp $ + + 13 Dec 2006; Matthias Schwarzott <zzam@gentoo.org> + files/libquicktime-0.9.10-automagic-deps.patch, + libquicktime-0.9.10.ebuild: + Changed vorbis-switch to enable, to prevent clash with vorbis-path. 13 Dec 2006; Matthias Schwarzott <zzam@gentoo.org> +files/libquicktime-0.9.10-automagic-deps.patch, 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 0d748d7e03c9..55f7e6e076ca 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,15 +1,13 @@ 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 @@ - ++++ 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_WITH([vorbis], AS_HELP_STRING([--without-vorbis], [Build without vorbis library (default: test)])) + ++AC_ARG_ENABLE([vorbis], AS_HELP_STRING([--disable-vorbis], [Build without vorbis library (default: test)])) + -+if test "x$with_vorbis" != "xno"; then ++if test "x$enable_vorbis" != "xno"; then XIPH_PATH_VORBIS(have_vorbis=true) +fi AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue) diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild index 4f052686f287..354cc49b7965 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.3 2006/12/13 19:01:29 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.4 2006/12/13 19:31:17 zzam Exp $ WANT_AUTOCONF="latest" inherit libtool eutils autotools @@ -75,7 +75,7 @@ src_compile() { $(use_with aac faad2) \ $(use_with png) \ $(use_with jpeg) \ - $(use_with vorbis) \ + $(use_enable vorbis) \ $(use_with lame) \ $(use_with x264) \ $(use_with ffmpeg) \ |