Closing #32951

5 files changed, 90 insertions, 14 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index d70acb766584..6b6514857997 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.7 2003/06/30 18:47:26 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.8 2003/11/27 20:13:07 aliz Exp $
+
+  27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> ming-0.2a.ebuild:
+  Fixed -fPIC compilation. Closing #32951.
 
   30 Jun 2003; Bartosch Pixa <darkspecter@gentoo.org> ming-0.2a.ebuild:
   set ppc in keywords
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 92a6bd84a768..a004266b39c5 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,4 +1,5 @@
-MD5 480f3f3e3fd6f4fb8ddb45b12e95bb01 ChangeLog 1123
-MD5 9ce2e6ea956fbdbf8ebd6da4fe5657fa ming-0.2a.ebuild 1106
+MD5 4e9bcffdbc4f6057e7b3300a69eafadb ming-0.2a.ebuild 1061
+MD5 95c210e9c09a7b4c2a3c1c262208b4bd ChangeLog 1226
+MD5 0d2b63f032d402518c9384d5db4404b1 files/ming-0.2a-fpic.patch 1814
+MD5 e086353fa9ba2b2e6b9ca9c87b04a367 files/ming-0.2a-gentoo.diff 369
 MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a 58
-MD5 46c3b68c77b141182b7d2da65bbbd81c files/ming-0.2a-gentoo.diff 359
diff --git a/media-libs/ming/files/ming-0.2a-fpic.patch b/media-libs/ming/files/ming-0.2a-fpic.patch
new file mode 100644
index 000000000000..814974ce9150
--- /dev/null
+++ b/media-libs/ming/files/ming-0.2a-fpic.patch
@@ -0,0 +1,75 @@
+diff -ur /tmp/ming-0.2a/src/Makefile ./src/Makefile
+--- src/Makefile	2001-08-17 17:06:01.000000000 +0000
++++ src/Makefile	2003-11-27 20:06:20.802157704 +0000
+@@ -1,7 +1,7 @@
+-
+ #CC = gcc -g -pg -a	# profiling flags
+ #CC = gcc -O5
+-CC = gcc -g -Wall
++CC = gcc
++CFLAGS = -g -Wall
+ 
+ LIBDIR = /usr/local/lib
+ 
+@@ -16,12 +16,15 @@
+ 		 actioncompiler/compileaction.o \
+ 		 actioncompiler/assembler.o
+ 
++%.o: %.c
++	${CC} ${CFLAGS} -fPIC -c -o $@ $<
++
+ all: dynamic
+ 
+ dynamic: ${OFILES}
+ 	cd blocks && make
+ 	cd actioncompiler && make
+-	${CC} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared -fpic \
++	${CC} ${CFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
+ 	  -o libming.so
+ 	cp libming.so ..
+ 
+diff -ur /tmp/ming-0.2a/src/actioncompiler/Makefile ./src/actioncompiler/Makefile
+--- src/actioncompiler/Makefile	2001-08-17 17:35:48.000000000 +0000
++++ src/actioncompiler/Makefile	2003-11-27 20:07:50.409535312 +0000
+@@ -1,7 +1,8 @@
+ 
+ #CC = gcc -g -pg -a	# profiling flags
+ #CC = gcc -O5
+-CC = gcc -g -Wall
++CC = gcc
++CFLAGS = -g -Wall
+ 
+ DEBUG = --debug
+ 
+@@ -18,6 +19,9 @@
+ 
+ OFILES = ${MOSTFILES} compileaction.o
+ 
++%.o: %.c
++	${CC} ${CFLAGS} -fPIC -c -o $@ $<
++
+ all: ${OFILES}
+ 
+ clean:
+diff -ur /tmp/ming-0.2a/src/blocks/Makefile ./src/blocks/Makefile
+--- src/blocks/Makefile	2001-08-17 17:06:05.000000000 +0000
++++ src/blocks/Makefile	2003-11-27 20:06:20.802157704 +0000
+@@ -1,6 +1,7 @@
+ #CC = gcc -g -pg -a	# profiling flags
+ #CC = gcc -O5
+-CC = gcc -g -Wall
++CC = gcc
++CFLAGS = -g -Wall
+ 
+ OFILES = output.o character.o shape.o morph.o fillstyle.o matrix.o font.o \
+ 	 block.o cxform.o text.o action.o button.o placeobject.o \
+@@ -9,6 +10,9 @@
+ 	 dbl.o linestyle.o gradient.o bitmap.o error.o input.o \
+ 	 placeobject.o #sound.o
+ 
++%.o: %.c
++	${CC} ${CFLAGS} -fPIC -c -o $@ $<
++
+ all: ${OFILES}
+ 
+ clean:
diff --git a/media-libs/ming/files/ming-0.2a-gentoo.diff b/media-libs/ming/files/ming-0.2a-gentoo.diff
index c839e74886e0..d9e0d02309e9 100644
--- a/media-libs/ming/files/ming-0.2a-gentoo.diff
+++ b/media-libs/ming/files/ming-0.2a-gentoo.diff
@@ -1,5 +1,5 @@
---- lmp3.c	Mon May 13 22:51:15 2002
-+++ listmp3.c	Mon May 13 22:50:18 2002
+--- util/lmp3.c	Mon May 13 22:51:15 2002
++++ util/listmp3.c	Mon May 13 22:50:18 2002
 @@ -169,7 +169,7 @@
  
    putchar('\n');
diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild
index 37207c9ee0b7..13235b2c112b 100644
--- a/media-libs/ming/ming-0.2a.ebuild
+++ b/media-libs/ming/ming-0.2a.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.10 2003/09/06 23:59:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.11 2003/11/27 20:13:07 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A OpenSource library from flash movie generation"
-SRC_URI="http://www.opaque.net/ming/${PN}-${PV}.tgz"
+SRC_URI="http://www.opaque.net/ming/${P}.tgz"
 HOMEPAGE="http://www.opaque.net/ming/"
 
 SLOT="0"
@@ -14,15 +14,12 @@ KEYWORDS="x86 sparc hppa ppc amd64"
 DEPEND="virtual/glibc"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}/util
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-fpic.patch
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
-
-	[ "${ARCH}" = "hppa" ] && CFLAGS="${CFLAGS} -fPIC"
-
 	make CC="gcc -Wall" all static || die
 	cd util
 	make CC="gcc -Wall" bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp \