New upstream release, closes bug #146485.

Package-Manager: portage-2.1.2_rc2-r2

6 files changed, 208 insertions, 9 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index d9870c883933..020294a12149 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.80 2006/11/13 15:33:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.81 2006/11/29 11:21:02 chainsaw Exp $
+
+*faad2-2.5 (29 Nov 2006)
+
+  29 Nov 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/faad2-2.5-missing-include.patch,
+  +files/faad2-2.5-no-xmms-or-bmp.patch, +faad2-2.5.ebuild:
+  New upstream release, closes bug #146485.
 
   13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/faad2-2.0-noext.patch, -faad2-2.0-r3.ebuild, faad2-2.0-r7.ebuild,
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 1b5b11e2c378..b6806259ecb6 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -21,6 +21,14 @@ AUX faad2-2.0-makefile-space.patch 326 RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5
 MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326
 RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5a6883b files/faad2-2.0-makefile-space.patch 326
 SHA256 da086ad6ede60f6a78bc74ac859676cdc4b5d3e7ae3aa5da617565506133d708 files/faad2-2.0-makefile-space.patch 326
+AUX faad2-2.5-missing-include.patch 342 RMD160 46ad8d495e9a64728c9c4907a3b41f99f9862c86 SHA1 5be80fb8f72e283deb24fdaae0ac4c69d10496ad SHA256 1269a6adc685d9b0f5344772c110a55f72d4e0a270239ea6599e04c59ecdf9a5
+MD5 e63deda4ede6ab7a7e9eb1a868c35107 files/faad2-2.5-missing-include.patch 342
+RMD160 46ad8d495e9a64728c9c4907a3b41f99f9862c86 files/faad2-2.5-missing-include.patch 342
+SHA256 1269a6adc685d9b0f5344772c110a55f72d4e0a270239ea6599e04c59ecdf9a5 files/faad2-2.5-missing-include.patch 342
+AUX faad2-2.5-no-xmms-or-bmp.patch 2868 RMD160 99f6ff6d2f68157f1bfc0b87b3f143c6966176bf SHA1 fb422405bbd3d5fdad4b46b7dbbbadb51b665927 SHA256 66d266f9a874fb422d4e7b5d0c8debb6a42a101a007c3e4df2fa04a83eb63e42
+MD5 6119db081ac1bb251637ee761935ed59 files/faad2-2.5-no-xmms-or-bmp.patch 2868
+RMD160 99f6ff6d2f68157f1bfc0b87b3f143c6966176bf files/faad2-2.5-no-xmms-or-bmp.patch 2868
+SHA256 66d266f9a874fb422d4e7b5d0c8debb6a42a101a007c3e4df2fa04a83eb63e42 files/faad2-2.5-no-xmms-or-bmp.patch 2868
 AUX faad2-gcc4-warnings-and-errors.patch 12071 RMD160 fdbce480063a4d5a4de63f589b251ef69ada6067 SHA1 429cb9086d8a1305a1fd6bdec1ab8906bd65b7da SHA256 60ecc66631fd202dde63f4b43dc6a88008d14f22a916902652561cb81e523c14
 MD5 9fcaf9f55fd1f37b129ce5457b50e40d files/faad2-gcc4-warnings-and-errors.patch 12071
 RMD160 fdbce480063a4d5a4de63f589b251ef69ada6067 files/faad2-gcc4-warnings-and-errors.patch 12071
@@ -30,6 +38,7 @@ MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 RMD160 08e3104023bc9288d83f450d1b4442e41e8ac271 files/mp4atom-sliver.patch 659
 SHA256 8f37bd575870e33001d05bd60a8a9d1fc353e8cf6f25bce835478ee6ce37d88a files/mp4atom-sliver.patch 659
 DIST faad2-2.0.tar.gz 766660 RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 SHA1 fc9f8d0812a9f46bbd851880045131e0e4ab08b8 SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861
+DIST faad2-2.5.tar.gz 751675 RMD160 4031786df0aded272bc4603ef18e80128e5e9063 SHA1 3805d32c9d0033572eced93482f81c1dd198cd2c SHA256 a75f9642f85030d60c332b02e53fa04e3b4677f73914da2dc1b000689f5f67bb
 DIST faad2-patches-5.tar.bz2 8667 RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa SHA1 1470d2ee2ea5acf667db6b01c259b94e746f9dba SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4
 EBUILD faad2-2.0-r11.ebuild 1510 RMD160 1426a445ab0495c5aab60573d52850bf0f5d3dff SHA1 aa2173125d46a81d6c6762fde42eba87c2ebecb2 SHA256 f573ceab63bee725f45ed3d5e3db579e945dd30db5d74769f762307ae6833e61
 MD5 91733c78bb5623c00a8068863d1c04ad faad2-2.0-r11.ebuild 1510
@@ -47,10 +56,14 @@ EBUILD faad2-2.0-r7.ebuild 1957 RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c
 MD5 554c3c256e3c9c8ba19cd5cd138bab44 faad2-2.0-r7.ebuild 1957
 RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c faad2-2.0-r7.ebuild 1957
 SHA256 97ef83943cec14d205c00ff9b13eb12f91856603bb0975ed92fc2eb881ab089b faad2-2.0-r7.ebuild 1957
-MISC ChangeLog 11211 RMD160 ce4b8d59e312b5ba929e65fdaeaf3b382d294e4c SHA1 a3b7ba8c8b63170f7abab45e033fc26d5c027aa5 SHA256 e56d64a12c6943e9289639a434610e40323895b73cb681af3b9315fb2320d133
-MD5 85c94039f2608bc1522eb90ba99bf1a2 ChangeLog 11211
-RMD160 ce4b8d59e312b5ba929e65fdaeaf3b382d294e4c ChangeLog 11211
-SHA256 e56d64a12c6943e9289639a434610e40323895b73cb681af3b9315fb2320d133 ChangeLog 11211
+EBUILD faad2-2.5.ebuild 1864 RMD160 80fecf8d754517d9f1a911dc38e9ea8ca5dfaeab SHA1 4c6bdc3cacf19eb96669c8ec6a2482613fe769f1 SHA256 499cc2cf51acb68da745d72a38fb39ffcac3c69ccace90daf50a3554d31f69e0
+MD5 9075786225ef642131026c385956150b faad2-2.5.ebuild 1864
+RMD160 80fecf8d754517d9f1a911dc38e9ea8ca5dfaeab faad2-2.5.ebuild 1864
+SHA256 499cc2cf51acb68da745d72a38fb39ffcac3c69ccace90daf50a3554d31f69e0 faad2-2.5.ebuild 1864
+MISC ChangeLog 11431 RMD160 8c9b9643730a48e275e04d281f99e49f4a9a5a2b SHA1 ba3dc607424820b2c508ff1ebef5b92cc0a77677 SHA256 d066495ab68f24e4e3acd767cf6effc82dc6926da9d761c156b35ffe1bb20289
+MD5 82b87cc1f1898946a58f18ea2492069e ChangeLog 11431
+RMD160 8c9b9643730a48e275e04d281f99e49f4a9a5a2b ChangeLog 11431
+SHA256 d066495ab68f24e4e3acd767cf6effc82dc6926da9d761c156b35ffe1bb20289 ChangeLog 11431
 MISC metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace SHA1 f013305de22423b585f4138b1a5e9d67ca45c17f SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356
 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387
 RMD160 891f0392b255f261ca75a0e8541d453579313ace metadata.xml 387
@@ -67,10 +80,13 @@ SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/di
 MD5 a46d304d3915a77a1c628a501d7fd693 files/digest-faad2-2.0-r7 229
 RMD160 324f8ba6e8f513994e0a3abd7a78967838a16214 files/digest-faad2-2.0-r7 229
 SHA256 286a43349ed357736d71bc0ea7b79d3a73ae37a89bdd9aa69837f7e12a4ddf54 files/digest-faad2-2.0-r7 229
+MD5 d74eec83471dee1c48898200601383f6 files/digest-faad2-2.5 229
+RMD160 40b33c7286395e8f6cbb8900453003cbc154c74c files/digest-faad2-2.5 229
+SHA256 6df7cb06df17b4ababd767b6b16a399f9dd8eb969c222679c56a311cf8da50af files/digest-faad2-2.5 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFWJBXAiZjviIA2XgRAkLoAJ0Xu8u39dq0Lyawx0R/3rrvy714cgCgzhBY
-7zevq5y8xUjW9p6vMPvQZHk=
-=2SQs
+iD8DBQFFbW1Hp5vW4rUFj5oRAn/1AJ9HmCo+YSTK/O0G6s/2AkKU3UYl9ACfd+Qp
+cj8XtmWPVjop4qDA3mBmznU=
+=5BTg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.5.ebuild b/media-libs/faad2/faad2-2.5.ebuild
new file mode 100644
index 000000000000..79ce04503f68
--- /dev/null
+++ b/media-libs/faad2/faad2-2.5.ebuild
@@ -0,0 +1,75 @@
+# 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.5.ebuild,v 1.1 2006/11/29 11:21:02 chainsaw 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 ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!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}-no-xmms-or-bmp.patch
+	epatch ${FILESDIR}/${P}-missing-include.patch
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	# Fix for bug #67510
+	ebegin "Rebuilding configure scripts (this will take a while)"
+	WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7  \
+		aclocal -I . &> /dev/null && \
+		autoheader &> /dev/null && \
+		libtoolize --automake --copy &> /dev/null && \
+		automake --add-missing --copy &> /dev/null && \
+		autoconf &> /dev/null || die "Couldn't build configuration file"
+	eend $?
+	elibtoolize
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		|| die
+
+	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.5 b/media-libs/faad2/files/digest-faad2-2.5
new file mode 100644
index 000000000000..26571d43d5f3
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.5
@@ -0,0 +1,3 @@
+MD5 696490935bf65b2ace4aafaff79e2396 faad2-2.5.tar.gz 751675
+RMD160 4031786df0aded272bc4603ef18e80128e5e9063 faad2-2.5.tar.gz 751675
+SHA256 a75f9642f85030d60c332b02e53fa04e3b4677f73914da2dc1b000689f5f67bb faad2-2.5.tar.gz 751675
diff --git a/media-libs/faad2/files/faad2-2.5-missing-include.patch b/media-libs/faad2/files/faad2-2.5-missing-include.patch
new file mode 100644
index 000000000000..ab41fd55349c
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.5-missing-include.patch
@@ -0,0 +1,11 @@
+diff -uNr faad2.ORIG/frontend/main.c faad2/frontend/main.c
+--- faad2.ORIG/frontend/main.c	2006-11-29 11:12:09.000000000 +0000
++++ faad2/frontend/main.c	2006-11-29 11:15:56.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include <stdarg.h>

+ #include <stdlib.h>

+ #include <getopt.h>

++#include <string.h>

+ 

+ #include <neaacdec.h>

+ #include <mp4ff.h>

diff --git a/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch b/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch
new file mode 100644
index 000000000000..1d200bab4609
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch
@@ -0,0 +1,87 @@
+diff -uNr faad2.ORIG/configure.in faad2/configure.in
+--- faad2.ORIG/configure.in	2006-11-29 11:06:17.000000000 +0000
++++ faad2/configure.in	2006-11-29 11:06:48.000000000 +0000
+@@ -4,7 +4,6 @@
+ dnl - libfaad.so

+ dnl - libmp4ff.a (only static for moment)

+ dnl - faad

+-dnl - xmms input mp4/aac plugin

+ dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)

+ 

+ AC_INIT

+@@ -26,12 +25,6 @@
+ 

+ AM_CONFIG_HEADER(config.h)

+ 

+-AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],

+-	     WITHXMMS=$withval, WITHXMMS=no)

+-

+-AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],

+-	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])

+-

+ AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],

+ 	     WITHDRM=$withval, WITHDRM=no)

+ 

+@@ -94,32 +87,6 @@
+    fi

+ fi

+ 

+-if test x$WITHXMMS = xyes; then

+-  AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")

+-  if test "$XMMS_CONFIG" = "not_found"; then

+-    AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")

+-  fi

+-  AC_CHECK_HEADER(pthread.h,,

+-           AC_MSG_ERROR(*** pthread headers support not installed or not found))

+-  AC_CHECK_HEADER(id3.h,,

+-       AC_MSG_ERROR(*** id3lib headers support not installed or not found))

+-  AC_CHECK_PROGS(GTK_CONFIG, gtk-config, "not_found")

+-  if test "$XGTK_CONFIG" = "not_found"; then

+-    AC_MSG_ERROR("*** gtk-config not found - xmms plugin can't be build without")

+-  fi

+-

+-  AM_CONDITIONAL(HAVE_XMMS, true)

+-else

+- AC_MSG_NOTICE(no xmms build configured)

+- AM_CONDITIONAL(HAVE_XMMS, false)

+-fi

+-

+-if test x$WITHBMP = xyes; then

+-  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])

+-  AM_CONDITIONAL([HAVE_XMMS], true)

+-  AM_CONDITIONAL([HAVE_BMP], true)

+-fi

+-

+ if test x$WITHDRM = xyes; then

+   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])

+   AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])

+@@ -129,8 +96,6 @@
+ AC_CONFIG_FILES(common/Makefile)

+ AC_CONFIG_FILES(common/mp4ff/Makefile)

+ AC_CONFIG_FILES(plugins/Makefile)

+-AC_CONFIG_FILES(plugins/xmms/Makefile)

+-AC_CONFIG_FILES(plugins/xmms/src/Makefile)

+ AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)

+ AC_CONFIG_FILES(faad2.spec)

+ AC_CONFIG_FILES(frontend/Makefile)

+diff -uNr faad2.ORIG/plugins/Makefile.am faad2/plugins/Makefile.am
+--- faad2.ORIG/plugins/Makefile.am	2006-11-29 11:06:17.000000000 +0000
++++ faad2/plugins/Makefile.am	2006-11-29 11:07:07.000000000 +0000
+@@ -1,17 +1,5 @@
+ if HAVE_MPEG4IP_PLUG

+-if HAVE_XMMS

+-SUBDIRS = xmms mpeg4ip

+-else

+ SUBDIRS = mpeg4ip

+-endif #HAVE_XMMS

+-else

+-if HAVE_XMMS

+-SUBDIRS = xmms

+-else

+-if HAVE_BMP

+-SUBDIRS = bmp

+ else

+ SUBDIRS =

+-endif #HAVE_BMP

+-endif #HAVE_XMMS

+ endif #HAVE_MPEG4IP_PLUG