Add patch to fix build failures, see bug #130428.

(Portage version: 2.1_pre7-r5)

5 files changed, 178 insertions, 11 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 41ac494f275c..c24c1de27a54 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.39 2006/03/06 15:58:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.40 2006/04/20 03:35:22 flameeyes Exp $
+
+*libmpeg3-1.5.2-r3 (20 Apr 2006)
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libmpeg3-1.5.2-a52.patch, +libmpeg3-1.5.2-r3.ebuild:
+  Add patch to fix build failures, see bug #130428.
 
   06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   libmpeg3-1.5.2-r1.ebuild, libmpeg3-1.5.2-r2.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 1af53a15dabe..0fe974dacc53 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0e99b70e9cfe7971a5bcaa2833050c07 ChangeLog 6545
 RMD160 22bac3dc514482e8ba18e6317032b0c40f7dfe96 ChangeLog 6545
 SHA256 d7de9ab98ffa251d4742663720090655b8508b5dba211e1b97447384f9532f52 ChangeLog 6545
@@ -13,22 +10,24 @@ SHA256 eb07ace03e96dfd6609ae05f65b2a47288ea93750cb20f6621d19bf8ae22da1c files/di
 MD5 80a0c734edfea0d53c9ea85e058f5c26 files/digest-libmpeg3-1.5.2-r2 140
 RMD160 a995830d5c105e948ff992ab0f121bcc309b8622 files/digest-libmpeg3-1.5.2-r2 140
 SHA256 d1d65194b85d04e52b7f71500d71ca7719668a6c5bd860e39a2959334ca41d50 files/digest-libmpeg3-1.5.2-r2 140
+MD5 652f940c23f681542d125f3b67d215f4 files/digest-libmpeg3-1.5.2-r3 512
+RMD160 573794a437d10297f713321e47cc622e51d551f0 files/digest-libmpeg3-1.5.2-r3 512
+SHA256 03fa862c63807b3b16bbc35844b17048cdadc729742d7dc9f3a0c6474f4c977c files/digest-libmpeg3-1.5.2-r3 512
+MD5 5a8203b4e0f074a75883fec16e2c883a files/libmpeg3-1.5.2-a52.patch 2866
+RMD160 9661ab5b21dbeed9d016694027a88139f6c9fac6 files/libmpeg3-1.5.2-a52.patch 2866
+SHA256 08cfa24a53e5413e0d0dccb1ca64fe818d0f2af840c8b8b2de7d33e491ec75da files/libmpeg3-1.5.2-a52.patch 2866
 MD5 116d5918c4dc0b76e0b82da0185afffa libmpeg3-1.5.2-r1.ebuild 2611
 RMD160 d6c5f36ebb80eb0eb9ee3f2af8de253e39ca4dd0 libmpeg3-1.5.2-r1.ebuild 2611
 SHA256 05b5b516868400e1456349eec1e47567e4a6a0eaae192d4686a323c7e1edf05d libmpeg3-1.5.2-r1.ebuild 2611
 MD5 730caa4f16fc47c0c379a4b1e8c87baf libmpeg3-1.5.2-r2.ebuild 2610
 RMD160 babb4aa25f3e5dac0ed8dcb7bc8404c9a1e099c4 libmpeg3-1.5.2-r2.ebuild 2610
 SHA256 49f05d4fdebd8f30705714e04f67b2eadb8ea4fc0d5e7dbd015fd89effc458e0 libmpeg3-1.5.2-r2.ebuild 2610
+MD5 cf2c34e31ee697f9f452292f9873a81a libmpeg3-1.5.2-r3.ebuild 1939
+RMD160 7346039e16c41ec2b568e7f9180d0fe7b71970ee libmpeg3-1.5.2-r3.ebuild 1939
+SHA256 bc192c590d1b78651d636aa356996f150ebbb111bef7e96003911274376d1b3a libmpeg3-1.5.2-r3.ebuild 1939
 MD5 c6c6825ba565aae9d3a5d7399745e98f libmpeg3-1.5.2.ebuild 2008
 RMD160 c68202364954b2d073a6a61cdacae9b5d60827b1 libmpeg3-1.5.2.ebuild 2008
 SHA256 9a258c25505a73d5a924f972b8d0eecfacfb5132495ef072cc863b1131ba617d libmpeg3-1.5.2.ebuild 2008
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDFw7AiZjviIA2XgRAiZ+AKDUtWtPZ3Je/LbQerRCgI5SKRtThQCgh6Un
-F/tbp5ZVQserbdH5so1oYgA=
-=ybZC
------END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
new file mode 100644
index 000000000000..21d1de144fcb
--- /dev/null
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
@@ -0,0 +1,6 @@
+MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
+SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
+RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 libmpeg3-patches-3.tar.bz2 4251
+SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/files/libmpeg3-1.5.2-a52.patch b/media-libs/libmpeg3/files/libmpeg3-1.5.2-a52.patch
new file mode 100644
index 000000000000..f81128fe286d
--- /dev/null
+++ b/media-libs/libmpeg3/files/libmpeg3-1.5.2-a52.patch
@@ -0,0 +1,90 @@
+Index: libmpeg3-1.5.2/Makefile
+===================================================================
+--- libmpeg3-1.5.2.orig/Makefile
++++ libmpeg3-1.5.2/Makefile
+@@ -2,9 +2,11 @@ CC = gcc
+ NASM =
+ USE_MMX = 0
+ USE_CSS = 1
+-A52DIR := $(shell expr a52dec* )
++#A52DIR := $(shell expr a52dec* )
+ 
+ HAVE_NASM := $(shell if [ -x /usr/bin/nasm -o -x /usr/local/bin/nasm ]; then echo y; else echo n; fi)
++
++.SUFFIXES: .lo
+                                                                                 
+ #ifeq ($(HAVE_NASM), n)
+ #$(error "Nasm is required.  Download it from nasm.sourceforge.net.")
+@@ -66,8 +68,7 @@ endif
+ 
+ CFLAGS += \
+ 	-I. \
+-	-I$(A52DIR)/include \
+-	-I$(A52DIR)/liba52
++	-I/usr/include/a52dec
+ 
+ #CFLAGS += -g
+ 
+@@ -113,6 +114,9 @@ OBJS = \
+ 	$(OBJDIR)/video/vlc.o \
+ 	$(OBJDIR)/workarounds.o
+ 
++LTOBJS = $(OBJS:%.o=%.lo)
++LTASMOBJS = $(ASMOBJS:%.o=%.lo)
++
+ #OBJS = \
+ #	$(OBJDIR)/audio/ac3.o \
+ #	$(OBJDIR)/audio/bit_allocation.o \
+@@ -132,9 +136,9 @@ DIRS := \
+ 	$(OBJDIR)/audio \
+ 	$(OBJDIR)/video
+ 
+-include Makefile.a52
++#include Makefile.a52
+ 
+-DIRS += $(A52DIRS)
++#DIRS += $(A52DIRS)
+ 
+ 
+ INSTALL_HEADERS = \
+@@ -168,10 +172,10 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp
+ 
+ LIBS = -lm -lpthread -L${ROOT}usr/lib64  -la52
+ 
+-$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
++#$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
+ 
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
++#$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+ $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+ $(shell mkdir -p $(DIRS) )
+ 
+@@ -181,8 +185,8 @@ all: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
+ $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
+ 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+ 
+-$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
+-	gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(LIBS)
++$(SHAREDOUTPUT): $(LTOBJS) $(LTASMOBJS) $(NASMOBJS)
++	gcc -shared -o $(SHAREDOUTPUT) $(LTOBJS) $(LTASMOBJS) $(NASMOBJS) $(LIBS)
+ 
+ $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
+ 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
+@@ -234,10 +238,14 @@ $(OBJS): 
+ 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+ $(ASMOBJS): 
+ 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
++$(LTOBJS): 
++	$(CC) -fPIC -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.lo
++$(LTASMOBJS): 
++	$(CC) -fPIC -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.lo
+ $(NASMOBJS): 
+ 	$(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-$(A52OBJS):
+-	$(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
++#$(A52OBJS):
++#	$(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+ 
+ $(OBJDIR)/bitstream.o:  			    bitstream.c
+ $(OBJDIR)/mpeg3dump.o: 				    mpeg3dump.c
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..b2abc63a2259
--- /dev/null
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.1 2006/04/20 03:35:22 flameeyes Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+PATCHLEVEL="3"
+DESCRIPTION="An mpeg library for linux"
+HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="mmx"
+
+RDEPEND="sys-libs/zlib
+	media-libs/jpeg
+	media-libs/a52dec"
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# The Makefile is patched to install the header files as well.
+	# This patch was generated using the info in the src.rpm that
+	# SourceForge provides for this package.
+	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
+	[ "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
+	sed -i -e "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) -la52:" Makefile
+
+	epatch "${FILESDIR}/${P}-a52.patch"
+
+	if ! use mmx || has_pic ; then
+		sed -i -e 's:^NASM =.*:NASM =:' \
+			-e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
+			-e 's|USE_MMX = 1|USE_MMX = 0|' \
+			Makefile
+	fi
+}
+
+src_compile() {
+	local obj_dir=$(uname --machine)
+
+	mkdir $obj_dir
+
+	rm -f ${obj_dir}/*.o &> /dev/null
+
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	# This patch patches the .h files that get installed into /usr/include
+	# to show the correct include syntax '<>' instead of '""'  This patch
+	# was also generated using info from SF's src.rpm
+	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
+	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
+	dohtml -r docs
+}