Added a patch to stop the xmms plugin from segfaulting on files lacking extentions. See bug #40726.

5 files changed, 117 insertions, 3 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 51e366d56cc5..d3f686886cb5 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.22 2004/03/25 04:07:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.23 2004/03/26 05:19:17 eradicator Exp $
+
+*faad2-2.0-r1 (25 Mar 2004)
+
+  25 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> faad2-2.0-r1.ebuild,
+  files/faad2-2.0-noext.patch:
+  Added a patch to stop the xmms plugin from segfaulting on files lacking
+  extentions. See bug #40726.
 
   24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> faad2-2.0.ebuild:
   Using elibtoolize instead of old hack for xmms plugin.
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 8a378f5f3012..7c45045aa8e8 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,14 +1,17 @@
 MD5 9dacb8ea7625e127d600b96f11f5b175 faad2-2.0_rc3-r1.ebuild 1627
-MD5 1a900aaa9abdd4aa6e41c9683488e472 faad2-2.0.ebuild 1620
+MD5 c2200c491bd0bd5e740842136495f0d1 faad2-2.0-r1.ebuild 1674
+MD5 c2200c491bd0bd5e740842136495f0d1 faad2-2.0.ebuild 1674
 MD5 08b4c5ec4b5bd331adf26f265dd15f8f faad2-2.0_rc3.ebuild 1258
 MD5 f1a3955e38e1fbd5220743bccfb4df43 faad2-1.1.ebuild 1017
-MD5 6d4922a315b67f0282ed478df278582d ChangeLog 3288
+MD5 83f8e2268a77f131fced2533c4da7bff ChangeLog 3549
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
 MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0 61
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
+MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
+MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r1 61
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3-r1 65
 MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440
diff --git a/media-libs/faad2/faad2-2.0-r1.ebuild b/media-libs/faad2/faad2-2.0-r1.ebuild
new file mode 100644
index 000000000000..9c913290faa9
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r1.ebuild,v 1.1 2004/03/26 05:19:18 eradicator Exp $
+
+inherit eutils libtool flag-o-matic
+
+DESCRIPTION="The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files"
+HOMEPAGE="http://faac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa ~mips"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+	media-libs/id3lib )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.7
+	sys-devel/automake
+	sys-devel/autoconf"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-space.patch
+	epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch
+
+	cd ${S}/common/mp4v2
+	epatch ${FILESDIR}/mp4atom-sliver.patch
+
+	cd ${S}/plugins/xmms/src
+	epatch ${FILESDIR}/${P}-noext.patch
+
+	# Get the xmms plugin to behave
+	cd ${S}
+	elibtoolize
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 sh ./bootstrap
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		`use_with xmms` \
+		|| die
+
+	# emake causes xmms plugin building to fail
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc ${DOCS}
+
+	# unneeded include, breaks building of apps
+	# <foser@gentoo.org>
+	dosed "s:#include <systems.h>::" /usr/include/mpeg4ip.h
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r1 b/media-libs/faad2/files/digest-faad2-2.0-r1
new file mode 100644
index 000000000000..38c97b9bd3b4
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r1
@@ -0,0 +1 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
diff --git a/media-libs/faad2/files/faad2-2.0-noext.patch b/media-libs/faad2/files/faad2-2.0-noext.patch
new file mode 100644
index 000000000000..7d18ace5e893
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.0-noext.patch
@@ -0,0 +1,30 @@
+--- libmp4.c.orig	2004-03-25 20:41:17.000000000 -0800
++++ libmp4.c	2004-03-25 21:01:50.000000000 -0800
+@@ -34,6 +34,9 @@
+ static int	mp4_isFile(char *);
+ static void*	mp4Decode(void *);
+ 
++void getMP4info(char* file);
++int getAACTrack(MP4FileHandle file);
++
+ InputPlugin mp4_ip =
+   {
+     0,	// handle
+@@ -112,11 +115,13 @@
+     gchar*	extention;
+ 
+     extention = strrchr(filename, '.');
++
+     if (extention &&
+-	!strcasecmp(extention, ".mp4") ||	// official extention
+-	!strcasecmp(extention, ".m4a") ||	// Apple mp4 extention
+-	!strcasecmp(extention, ".aac")		// old MPEG2/4-AAC extention
+-	){
++        (!strcasecmp(extention, ".mp4") ||	// official extention
++         !strcasecmp(extention, ".m4a") ||	// Apple mp4 extention
++         !strcasecmp(extention, ".aac")		  // old MPEG2/4-AAC extention
++        ))
++    {
+       return (1);
+     }
+   }