Fix build with >=dev-lang/nasm-2, bug #200858

Package-Manager: portage-2.1.3.19

4 files changed, 109 insertions, 6 deletions

diff --git a/media-libs/libmp4v2/ChangeLog b/media-libs/libmp4v2/ChangeLog
index e1a6b8c6caba..0722c98d4faa 100644
--- a/media-libs/libmp4v2/ChangeLog
+++ b/media-libs/libmp4v2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmp4v2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.35 2007/11/26 02:40:59 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.36 2008/01/22 16:26:14 tester Exp $
+
+*libmp4v2-1.5.0.1-r1 (22 Jan 2008)
+
+  22 Jan 2008; Olivier Crête <tester@gentoo.org>
+  +libmp4v2-1.5.0.1-r1.ebuild:
+  Fix build with >=dev-lang/nasm-2, bug #200858
 
   26 Nov 2007; Jeroen Roovers <jer@gentoo.org> libmp4v2-1.5.0.1.ebuild:
   Stable for HPPA (bug #199971).
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index dbbbe7695f11..5aa943fa6cf9 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mpeg4ip-1.5.0.1.tar.gz 4826180 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a SHA1 1271de695ed65284d9c39aa91bf26c5494603fd3 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6
+EBUILD libmp4v2-1.5.0.1-r1.ebuild 1869 RMD160 97e2a79943eba58970ab56c496b15d7c8db51ef3 SHA1 162e99a728d3d628142493a58c7da86d0fdfac03 SHA256 7a4c72e9f8060bd76d60c66a81def629eb9dee1b23706cb4ec97ea698cdc727b
+MD5 42c719c6b5eb88f5dc276d6324e2083c libmp4v2-1.5.0.1-r1.ebuild 1869
+RMD160 97e2a79943eba58970ab56c496b15d7c8db51ef3 libmp4v2-1.5.0.1-r1.ebuild 1869
+SHA256 7a4c72e9f8060bd76d60c66a81def629eb9dee1b23706cb4ec97ea698cdc727b libmp4v2-1.5.0.1-r1.ebuild 1869
 EBUILD libmp4v2-1.5.0.1.ebuild 1772 RMD160 42f3e06a455d450ba81c4b84e1a1aa002dee79c3 SHA1 268f43056d887b51183ae0da77417f6e8327e963 SHA256 11db8990666a8a0b9747cfb907fe10f22f7e5900ee033d1a34d0a2319d1dc4d8
 MD5 773eb6c395b15f38ae4263d6ccced3af libmp4v2-1.5.0.1.ebuild 1772
 RMD160 42f3e06a455d450ba81c4b84e1a1aa002dee79c3 libmp4v2-1.5.0.1.ebuild 1772
 SHA256 11db8990666a8a0b9747cfb907fe10f22f7e5900ee033d1a34d0a2319d1dc4d8 libmp4v2-1.5.0.1.ebuild 1772
-MISC ChangeLog 4060 RMD160 b4c3be3268a43e0745473958aad357b3b2989969 SHA1 9b5e004c961f031f3c0ce5b970ee1d9c6cc086d4 SHA256 a7b23baa5212f2875d3c4fd3f0a8031a871eccf202315bd3fe66ebb4169a9e96
-MD5 266f9de334812f546ba6eac009c878b0 ChangeLog 4060
-RMD160 b4c3be3268a43e0745473958aad357b3b2989969 ChangeLog 4060
-SHA256 a7b23baa5212f2875d3c4fd3f0a8031a871eccf202315bd3fe66ebb4169a9e96 ChangeLog 4060
+MISC ChangeLog 4229 RMD160 7f008602097c4926804bed7066861a8c7b1a66c0 SHA1 a294f55c60606709857f0fe71272027cb07ce6a4 SHA256 cd8d4deab141e715c6f1f157022c093a46278b6e9866c959fb0451dc3405dcf7
+MD5 0bbed0f6bad1e7099ddb28e9fc49bf0d ChangeLog 4229
+RMD160 7f008602097c4926804bed7066861a8c7b1a66c0 ChangeLog 4229
+SHA256 cd8d4deab141e715c6f1f157022c093a46278b6e9866c959fb0451dc3405dcf7 ChangeLog 4229
 MISC metadata.xml 222 RMD160 d342873a7670ee948b23c02e32d664c61890147b SHA1 4293498c5319dff0845d6c5668f7329cd83c17c5 SHA256 84d779e4bddf172bed193cce4cafad208ba62317ae9bfc7b26b64e02451496ee
 MD5 3e22c883db32384466af4a4db61aca02 metadata.xml 222
 RMD160 d342873a7670ee948b23c02e32d664c61890147b metadata.xml 222
@@ -14,3 +21,13 @@ SHA256 84d779e4bddf172bed193cce4cafad208ba62317ae9bfc7b26b64e02451496ee metadata
 MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-libmp4v2-1.5.0.1 250
 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-libmp4v2-1.5.0.1 250
 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-libmp4v2-1.5.0.1 250
+MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-libmp4v2-1.5.0.1-r1 250
+RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-libmp4v2-1.5.0.1-r1 250
+SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-libmp4v2-1.5.0.1-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHlhksmOfEJZHYOKcRAodwAJ97h3yEh1dgPST/iGYL0EXchsMJ8ACghdnd
+a9zzvqAMVpfzLXEN4F8ko/I=
+=ov5t
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmp4v2/files/digest-libmp4v2-1.5.0.1-r1 b/media-libs/libmp4v2/files/digest-libmp4v2-1.5.0.1-r1
new file mode 100644
index 000000000000..c15cf36b860f
--- /dev/null
+++ b/media-libs/libmp4v2/files/digest-libmp4v2-1.5.0.1-r1
@@ -0,0 +1,3 @@
+MD5 f53b06c62e914ab724bda9d9af041e08 mpeg4ip-1.5.0.1.tar.gz 4826180
+RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a mpeg4ip-1.5.0.1.tar.gz 4826180
+SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 mpeg4ip-1.5.0.1.tar.gz 4826180
diff --git a/media-libs/libmp4v2/libmp4v2-1.5.0.1-r1.ebuild b/media-libs/libmp4v2/libmp4v2-1.5.0.1-r1.ebuild
new file mode 100644
index 000000000000..d1ce79eecb90
--- /dev/null
+++ b/media-libs/libmp4v2/libmp4v2-1.5.0.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.5.0.1-r1.ebuild,v 1.1 2008/01/22 16:26:14 tester Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit libtool
+
+DESCRIPTION="libmp4v2 extracted from mpeg4ip"
+HOMEPAGE="http://www.mpeg4ip.net/"
+SRC_URI="mirror://sourceforge/mpeg4ip/mpeg4ip-${PV}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<media-video/mpeg4ip-1.4.1
+	!<media-libs/faad2-2.0-r9"
+
+S=${WORKDIR}/mpeg4ip-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's:nasm -r:nasm -v:g' -i configure || die "sed nasm"
+	elibtoolize
+}
+
+src_compile() {
+	touch bootstrapped
+	econf \
+		--disable-warns-as-err \
+		--disable-server \
+		--disable-player \
+		--disable-mp4live \
+		--disable-id3tags \
+		--disable-xvid \
+		--disable-a52dec \
+		--disable-mad \
+		--disable-mpeg2dec \
+		--disable-srtp \
+		--disable-mp3lame \
+		--disable-faac \
+		--disable-ffmpeg \
+		--disable-x264 \
+		|| die "econf failed"
+
+	cd "${S}/lib/mp4v2"
+
+	sed -i -e 's:SUBDIRS = . test util:SUBDIRS = .:' Makefile \
+		 || die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${S}/lib/mp4v2"
+
+	make DESTDIR="${D}" install || die
+
+	dodoc README INTERNALS API_CHANGES TODO
+
+	sed -i -e 's:"mpeg4ip.h":<libmp4v2/mpeg4ip.h>:' \
+		"${D}/usr/include/mp4.h" || die "sed failed"
+
+	dodir /usr/include/libmp4v2
+
+	cp "${S}/include/mpeg4ip.h"  "${D}/usr/include/libmp4v2/"
+	sed -i -e 's:mpeg4ip_config.h:libmp4v2/mpeg4ip_config.h:' \
+		-e 's:"mpeg4ip_version.h":<libmp4v2/mpeg4ip_version.h>:' \
+		 "${D}/usr/include/libmp4v2/mpeg4ip.h"  || die "sed failed"
+
+	cp "${S}/include/mpeg4ip_version.h" "${D}/usr/include/libmp4v2/"
+	cp "${S}/mpeg4ip_config.h" "${D}/usr/include/libmp4v2/"
+}