Add patch to avoid segmentation fault when using unknown long options. Bug #70387. Thanks to Thomas Cort for the patch.

(Portage version: 2529-svn)

7 files changed, 14 insertions, 114 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index c8879b627c2e..f5fdf9314244 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.60 2006/01/08 17:34:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.61 2006/01/15 17:52:42 flameeyes Exp $
+
+*faad2-2.0-r10 (15 Jan 2006)
+
+  15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -faad2-2.0-r6.ebuild,
+  -faad2-2.0-r9.ebuild, +faad2-2.0-r10.ebuild:
+  Add patch to avoid segmentation fault when using unknown long options. Bug
+  #70387. Thanks to Thomas Cort for the patch.
 
   08 Jan 2006; Joseph Jezak <josejx@gentoo.org> faad2-2.0-r9.ebuild:
   Marked ~ppc for bug #116022.
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 195ac8e3b215..dda27e551f33 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7a1e0b6c4ececbddc6ce98b295d7f878 ChangeLog 8341
+MD5 5f30265bd731743abb49e731c12377b2 faad2-2.0-r10.ebuild 1477
 MD5 9167396e4beb71ea1c2f38c0933e2241 faad2-2.0-r3.ebuild 2091
 MD5 f17e09277ed7b2502a798579f4517d72 faad2-2.0-r6.ebuild 2127
 MD5 9744749cd5b5b9f8315709147174f04e faad2-2.0-r7.ebuild 2141
-MD5 7280572a3a1b93dc8f8eab1324b4d31f faad2-2.0-r9.ebuild 1557
+MD5 de6aa302f0d9b074fc8da5b2c43f4583 files/digest-faad2-2.0-r10 127
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r6 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r7 61
-MD5 2f6065fa55eb2dab935c4c20f1e1fc60 files/digest-faad2-2.0-r9 127
 MD5 edab653b8b9960b0ea4a04a745786c5f files/faad2-2.0-amd64.patch 9564
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
 MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
@@ -18,10 +15,3 @@ MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
 MD5 c3dc0623a7f8ff83085ae703b2312d48 files/faad2-gcc4-warnings-and-errors.patch.gz 3265
 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwU1HcsIHjyDViGQRAluuAJwO9ggOLtGMNO7k9p1a6yCQlTRGKQCgi5aA
-qKDCt0J/jsSzjN+AqE1LXW8=
-=gu25
------END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.0-r9.ebuild b/media-libs/faad2/faad2-2.0-r10.ebuild
index baac9922a158..6adb62de81ac 100644
--- a/media-libs/faad2/faad2-2.0-r9.ebuild
+++ b/media-libs/faad2/faad2-2.0-r10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r9.ebuild,v 1.5 2006/01/08 17:34:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r10.ebuild,v 1.1 2006/01/15 17:52:42 flameeyes Exp $
 
 inherit eutils libtool flag-o-matic autotools
 
-PATCHLEVEL="3"
+PATCHLEVEL="4"
 
 DESCRIPTION="AAC audio decoding library"
 HOMEPAGE="http://www.audiocoding.com/"
@@ -20,11 +20,6 @@ RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
 		media-libs/id3lib )
 	media-libs/libmp4v2"
 
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/automake
-	sys-devel/autoconf"
-
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
diff --git a/media-libs/faad2/faad2-2.0-r6.ebuild b/media-libs/faad2/faad2-2.0-r6.ebuild
deleted file mode 100644
index 4092039067d6..000000000000
--- a/media-libs/faad2/faad2-2.0-r6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r6.ebuild,v 1.3 2005/07/27 11:23:23 pvdabeel Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="http://www.audiocoding.com/"
-SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="xmms"
-
-RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
-		media-libs/id3lib )
-	!media-video/mpeg4ip"
-
-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
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	cd ${S}/common/mp4v2
-	epatch ${FILESDIR}/mp4atom-sliver.patch
-
-	cd ${S}/plugins/xmms/src
-	epatch ${FILESDIR}/${P}-noext.patch
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-amd64.patch
-
-	# Get the xmms plugin to behave
-	cd ${S}
-	elibtoolize
-
-}
-
-src_compile() {
-	# see #34392
-	filter-flags -mfpmath=sse
-
-	# Fix for bug #67510
-	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7  \
-		aclocal -I . && \
-		autoheader && \
-		libtoolize --automake --copy	&& \
-		automake --add-missing --copy	&& \
-		autoconf || die "Couldn't build configuration file"
-
-	# 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, <systems.h> breaks building of apps, but
-	# it is necessary because includes <sys/types.h>,
-	# which is needed by /usr/include/mp4.h... so we just
-	# include <sys/types.h> instead.  See bug #55767
-	dosed "s:#include <systems.h>:#include <sys/types.h>:" /usr/include/mpeg4ip.h
-	# make latexer happy
-	dosed "s:\"mp4ff_int_types.h\":<stdint.h>:" /usr/include/mp4ff.h
-
-}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r10 b/media-libs/faad2/files/digest-faad2-2.0-r10
new file mode 100644
index 000000000000..1b27e6a49402
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r10
@@ -0,0 +1,2 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
+MD5 5754a2951a7da57e05d1fa18036c0a64 faad2-patches-4.tar.bz2 8128
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r6 b/media-libs/faad2/files/digest-faad2-2.0-r6
deleted file mode 100644
index 38c97b9bd3b4..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r9 b/media-libs/faad2/files/digest-faad2-2.0-r9
deleted file mode 100644
index 70c09a17897b..000000000000
--- a/media-libs/faad2/files/digest-faad2-2.0-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
-MD5 445b79dd0bd2ba9d3e07dcd1eaa0369d faad2-patches-3.tar.bz2 7960