Add patch from upstream for building with libpng-1.5. Use emake everywhere. Build in parallel as it seems to work for me.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

3 files changed, 63 insertions, 6 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index c3a6eb929645..b4ef0ed2af6e 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/ming
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.76 2011/01/09 00:09:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.77 2011/02/21 17:30:11 vapier Exp $
+
+  21 Feb 2011; Mike Frysinger <vapier@gentoo.org> ming-0.4.3-r1.ebuild,
+  +files/ming-0.4.3-libpng-1.5.patch:
+  Add patch from upstream for building with libpng-1.5. Use emake everywhere.
+  Build in parallel as it seems to work for me.
 
   09 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> ming-0.4.3-r1.ebuild:
   Bug #351098: Use the new PHP_EXT_OPTIONAL_USE optional to make PHP support
diff --git a/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch b/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch
new file mode 100644
index 000000000000..fb2b62fbb6fc
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.3-libpng-1.5.patch
@@ -0,0 +1,48 @@
+From 63a408b763e3facdc8965ef216a06621f04e16ed Mon Sep 17 00:00:00 2001
+From: OBATA Akio <obata@lins.jp>
+Date: Tue, 15 Feb 2011 09:54:34 +0100
+Subject: [PATCH] Bug 109 - libpng-1.5 support
+
+---
+ src/blocks/pngdbl.c |    4 ++--
+ util/png2dbl.c      |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/blocks/pngdbl.c b/src/blocks/pngdbl.c
+index e0b88d6..77bb323 100644
+--- a/src/blocks/pngdbl.c
++++ b/src/blocks/pngdbl.c
+@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE *fp)
+ }
+ 
+ static int pngReadFunc(png_structp png, unsigned char *buf, int len)
+-{	SWFInput input = (SWFInput) png->io_ptr;
++{	SWFInput input = (SWFInput) png_get_io_ptr(png);
+ 	return SWFInput_read(input, buf, len);
+ }
+ 
+@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, dblData result)
+ 		return 0;
+ 	}
+ 
+-	if(setjmp(png_ptr->jmpbuf))
++	if(setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     	return 0;
+diff --git a/util/png2dbl.c b/util/png2dbl.c
+index 49610a3..ce44b27 100644
+--- a/util/png2dbl.c
++++ b/util/png2dbl.c
+@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
+     error("Couldn't create end_info\n");
+   }
+ 
+-  if(setjmp(png_ptr->jmpbuf))
++  if(setjmp(png_jmpbuf(png_ptr)))
+   {
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+-- 
+1.7.4.1
+
diff --git a/media-libs/ming/ming-0.4.3-r1.ebuild b/media-libs/ming/ming-0.4.3-r1.ebuild
index 00bb3b0e6de9..ae069043bef0 100644
--- a/media-libs/ming/ming-0.4.3-r1.ebuild
+++ b/media-libs/ming/ming-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r1.ebuild,v 1.2 2011/01/09 00:09:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r1.ebuild,v 1.3 2011/02/21 17:30:11 vapier Exp $
 
 EAPI="3"
 
@@ -10,13 +10,15 @@ PYTHON_DEPEND="python? 2"
 
 inherit eutils autotools flag-o-matic multilib php-ext-source-r2 perl-module python
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 DESCRIPTION="An Open Source library for Flash movie generation."
 HOMEPAGE="http://ming.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="+perl +python php"
+
 RDEPEND="perl? ( dev-lang/perl )
 	python? ( virtual/python )
 	media-libs/freetype
@@ -38,6 +40,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+
 	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
 	sed -i \
 		-e 's/libming.a/libming.so/' \
@@ -64,7 +68,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 DESTDIR="${D}" || die "emake failed"
+	emake || die
 
 	if use php; then
 		cd "${S}"/php_ext
@@ -76,11 +80,11 @@ src_compile() {
 }
 
 src_test() {
-	make check || die "tests failed"
+	emake check || die
 }
 
 src_install() {
-	make DESTDIR="${D}" INSTALLDIRS="vendor" install
+	emake DESTDIR="${D}" INSTALLDIRS="vendor" install || die
 
 	fixlocalpod