Bug #123569, fix undefined symbol when used via xmms.

(Portage version: 2.1_pre10-r5)

4 files changed, 96 insertions, 1 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 4a525ad5f3b4..b24eaf2bd66c 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.67 2006/05/06 15:44:41 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.68 2006/05/13 08:25:15 robbat2 Exp $
+
+*faad2-2.0-r12 (13 May 2006)
+
+  13 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/faad-2.0-xmms.patch, +faad2-2.0-r12.ebuild:
+  Bug #123569, fix undefined symbol when used via xmms.
 
   06 May 2006; <tcort@gentoo.org> faad2-2.0-r11.ebuild:
   Added ~alpha keyword wrt Bug #116022.
diff --git a/media-libs/faad2/faad2-2.0-r12.ebuild b/media-libs/faad2/faad2-2.0-r12.ebuild
new file mode 100644
index 000000000000..a99f6b9b973f
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r12.ebuild
@@ -0,0 +1,63 @@
+# 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-r12.ebuild,v 1.1 2006/05/13 08:25:15 robbat2 Exp $
+
+inherit eutils libtool flag-o-matic autotools
+
+PATCHLEVEL="5"
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+		media-libs/id3lib )
+	media-libs/libmp4v2"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/faad-2.0-xmms.patch"
+	eautoreconf
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+	econf \
+		--with-drm \
+		$(use_with xmms) \
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+
+	# 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
+	sed -i -e "s:#include <systems.h>:#include <sys/types.h>:" \
+		${D}/usr/include/mpeg4ip.h
+	sed -i -e "s:\"mp4ff_int_types.h\":<stdint.h>:" \
+		${D}/usr/include/mp4ff.h
+
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r12 b/media-libs/faad2/files/digest-faad2-2.0-r12
new file mode 100644
index 000000000000..cb21f92dfbf2
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r12
@@ -0,0 +1,6 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
+RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 faad2-2.0.tar.gz 766660
+SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 faad2-2.0.tar.gz 766660
+MD5 51a371fb21fcbf77e27ed82d63273a95 faad2-patches-5.tar.bz2 8667
+RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa faad2-patches-5.tar.bz2 8667
+SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4 faad2-patches-5.tar.bz2 8667
diff --git a/media-libs/faad2/files/faad-2.0-xmms.patch b/media-libs/faad2/files/faad-2.0-xmms.patch
new file mode 100644
index 000000000000..55a577732197
--- /dev/null
+++ b/media-libs/faad2/files/faad-2.0-xmms.patch
@@ -0,0 +1,20 @@
+--- plugins/xmms/src/mp4_utils.c.orig	2006-02-26 23:29:45.000000000 -0500
++++ plugins/xmms/src/mp4_utils.c	2006-02-26 23:30:20.000000000 -0500
+@@ -54,7 +54,7 @@
+     const char *trackType = MP4GetTrackType(file, trackID);
+     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
+       int j=0;
+-      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
++      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
+       while(mp4AudioTypes[j]){ // what kind of audio is ?
+ 	if(mp4AudioTypes[j] == audiotype){
+ 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
+@@ -126,7 +126,7 @@
+     printf("Track %d, %s", trackID, trackType);
+     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
+       int j=0;
+-      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
++      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
+       while(mp4AudioTypes[j]){ // what kind of audio is ?
+ 	if(mp4AudioTypes[j] == audiotype){
+ 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){