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

(Portage version: 2.1.3.19)

3 files changed, 88 insertions, 2 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/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/"
+}