Remove check for faac and make appropriate dep instead

Package-Manager: portage-2.0.51.22-r3

4 files changed, 52 insertions, 8 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 019eed2b4d07..539268dd3a64 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.30 2005/12/20 05:43:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.31 2005/12/20 15:00:33 tester Exp $
+
+  20 Dec 2005; Olivier Crête <tester@gentoo.org>
+  +files/mpeg4ip-1.4.1-disable-faac-test.patch, mpeg4ip-1.4.1.ebuild:
+  Remove check for faac and make appropriate dep instead
 
   20 Dec 2005; Olivier Crête <tester@gentoo.org>
   +files/mpeg4ip-1.4.1-gcc41.patch, mpeg4ip-1.1.ebuild, -mpeg4ip-1.3.ebuild,
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index dcc0ce3c345e..433e0348932a 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -2,9 +2,10 @@
 Hash: SHA1
 
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 b557316b7ae221a1b517d08a9075e176 ChangeLog 5278
-MD5 7e036bb08cf2f66ee0f373273375c88d mpeg4ip-1.4.1.ebuild 3352
+MD5 8853be980864ab423fdcffb77dc5f7e7 ChangeLog 5456
+MD5 9247c2fd94ec4409a4db8f2413f23a11 mpeg4ip-1.4.1.ebuild 3411
 MD5 5f7b147dc4e5cedf5c1cfcba032ff098 mpeg4ip-1.1.ebuild 1790
+MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
 MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
@@ -13,7 +14,7 @@ MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDqA4JmOfEJZHYOKcRAo0mAKDUrX17hKY4Phb/0HB5oSs+qzbwngCglRA+
-xOL5P7N7VILaboFp7xwHzx8=
-=K5ui
+iD8DBQFDqByfmOfEJZHYOKcRAi8bAKCjl3VqSWWym6cG1/ozxjWkgPHAMgCg4rsl
+P/PuT4bTkPPpJOKOVHut9lM=
+=rTrE
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.4.1-disable-faac-test.patch b/media-video/mpeg4ip/files/mpeg4ip-1.4.1-disable-faac-test.patch
new file mode 100644
index 000000000000..f86539260de3
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.4.1-disable-faac-test.patch
@@ -0,0 +1,38 @@
+--- bootstrap.orig	2005-12-20 09:02:57.000000000 -0500
++++ bootstrap	2005-12-20 09:17:09.000000000 -0500
+@@ -45,35 +45,6 @@
+ fi
+ 
+ allargs="$@"
+-#
+-# Test for faac and possible error
+-#
+-if test $target_system = "Linux"; then
+-    have_faac=no
+-    if which faac >/dev/null 2>/dev/null; then
+-	have_faac=yes
+-    fi
+-
+-    if test $have_faac = "yes"; then
+-	# we have lame and faac - see if faac is built with mp4 support
+-	faac --help >&faac_help
+-	sdf=`grep "MP4 support unavailable" faac_help`
+-	rm -f faac_help
+-	if test -z "$sdf"; then
+-	    if which mpeg4ip-config >/dev/null 2>/dev/null; then
+-		echo "Warning - faac uses libmp4v, but we've detected a version"
+-		echo "of mpeg4ip.  If you get errors building mp4live, please"
+-		echo "rebuild faac without mp4v2 support"
+-	    else
+-		echo "Error - we have detected a version of faac that has libmp4v2 support"
+-		echo "and no copy of mpeg4ip-config.  This means faac was built with"
+-		echo "faad2 and the libraries will be incompatible".
+-		echo "Please reinstall faac without mp4v2 support"
+-		exit 1
+-	    fi
+-	fi
+-    fi
+-fi
+ set -x
+ 
+ # if src tree is created via cvs export to tar.gz
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
index d49178ca285f..ffd405140357 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.5 2005/12/20 13:58:21 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.6 2005/12/20 15:00:33 tester Exp $
 
 inherit eutils multilib
 
@@ -30,7 +30,7 @@ RDEPEND=" media-libs/libsdl
 	mp4live? (
 		>=x11-libs/gtk+-2
 		lame? ( >=media-sound/lame-3.92 )
-		aac? ( >=media-libs/faac-1.20.1 )
+		aac? ( >=media-libs/faac-1.24-r1 )
 		ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
 		x264? ( media-libs/x264-svn )
 	)
@@ -51,6 +51,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch
 	epatch ${FILESDIR}/mpeg4ip-1.4.1-gcc41.patch
 }