Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

5 files changed, 26 insertions, 7 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index a001c24f3da6..0283f99e86a6 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.76 2010/02/24 19:38:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.77 2010/03/10 23:49:37 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild,
+  +files/gpac-0.4.5-libpng14.patch:
+  Fix building with libpng14.
 
   24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild:
   Rename USE wxwindows to wxwidgets wrt #306287.
@@ -24,7 +28,7 @@
   stable x86, bug 297503
 
   20 Dec 2009; Markos Chandras <hwoarang@gentoo.org> gpac-0.4.5-r1.ebuild,
-  +files/glx-define-prototype.patch:
+  +files/gpac-0.4.5-glx-define-prototype.patch:
   Apply patch to fix amd64 compilation issues. Stable on amd64 wrt bug
   #297503
 
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 017c14ceffa4..9786dd61aabf 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,6 +1,7 @@
-AUX glx-define-prototype.patch 561 RMD160 c51ce9aa4a2d6a8da69c2bdc0b6ac0fbaaa0b958 SHA1 e777afe95ba7e4c5f9f5854b9cf473a159884082 SHA256 319dbf60ee953c5eb173c0e1ce4d8bee314f561fb08b53538375c974ed8154d3
+AUX gpac-0.4.5-glx-define-prototype.patch 561 RMD160 c51ce9aa4a2d6a8da69c2bdc0b6ac0fbaaa0b958 SHA1 e777afe95ba7e4c5f9f5854b9cf473a159884082 SHA256 319dbf60ee953c5eb173c0e1ce4d8bee314f561fb08b53538375c974ed8154d3
+AUX gpac-0.4.5-libpng14.patch 463 RMD160 08446a21efbe22ee81e7a774e82e3cdd26383880 SHA1 1479e4bd714235a333bfb3e1cebb9f93ff030d01 SHA256 c2920ab31000a5dcdde01ba0e7809bfda63e811af6ae0fa2e7e28c56a73656d6
 DIST gpac-0.4.5-patches-2.tar.bz2 3680 RMD160 dea4191716220e88172e57682a08c546e5c49471 SHA1 01736f9f34b9a5b01e7bf9e3718b7e425c2a9f5d SHA256 2103c61126cb99e1e76899b369ab223730860adbbc65f18aec0a68395e238862
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
-EBUILD gpac-0.4.5-r1.ebuild 3843 RMD160 cf80b609b8f878cf668c4ba65762b41f397f5414 SHA1 0f8ca1f5473d2f0e7c9aa24b535766be8c87fa12 SHA256 a098cac9fbd4d5438786791c07ca7741ee5fe65e166bc597a490b60b5c9876d9
-MISC ChangeLog 11035 RMD160 4ce8b5950d833c160aeb1596cc2b2a4a7689187e SHA1 64066202b168ba05a96ccca3d35efaa9b012f432 SHA256 174eeed93fb8e2449ea8a4e585ceabefa4fc00f921278d845ef22cd092ddf38d
+EBUILD gpac-0.4.5-r1.ebuild 3886 RMD160 1f42c1a821d8f393853cffe9f7e5f9d4abb61ba8 SHA1 46b5692902cd9acb4f2ddc2bc9e6770dcdf47bba SHA256 a3260f9d08c40c292aa072bda83513bde3b1b581786db1dd42980bad0773b001
+MISC ChangeLog 11189 RMD160 71107105be9fc0e1d7a16530373bd4feebb1c3e4 SHA1 91f90f455b3ca140ff85b60ad586a1aa13e4c4dd SHA256 65355e492bf9426bb6d6721385369bbd990cbcf33ce699fef6dd3fca401c830c
 MISC metadata.xml 465 RMD160 32e7ff16a199c89e72a05f60849601dc1fa1452a SHA1 7740a56b8f7061ce7391cf65f5a515f76c62efe0 SHA256 501d9674a483b0ade39ea40123b20f2d332f3b69447a89389560f749fcb6a04c
diff --git a/media-video/gpac/files/glx-define-prototype.patch b/media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch
index f62781d49b1b..f62781d49b1b 100644
--- a/media-video/gpac/files/glx-define-prototype.patch
+++ b/media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch
diff --git a/media-video/gpac/files/gpac-0.4.5-libpng14.patch b/media-video/gpac/files/gpac-0.4.5-libpng14.patch
new file mode 100644
index 000000000000..4a6748160d68
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.5-libpng14.patch
@@ -0,0 +1,13 @@
+http://repos.archlinux.org/wsvn/community/gpac/trunk/libpng14-infopp-null.patch
+
+--- src/media_tools/img.c
++++ src/media_tools/img.c
+@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
+ 	/* Allocate/initialize the image information data.  REQUIRED */
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (info_ptr == NULL) {
+-		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++		png_destroy_write_struct(&png_ptr,  NULL);
+ 		return GF_IO_ERR;
+ 	}
+ 	
diff --git a/media-video/gpac/gpac-0.4.5-r1.ebuild b/media-video/gpac/gpac-0.4.5-r1.ebuild
index 850799feb957..839c791b56ac 100644
--- a/media-video/gpac/gpac-0.4.5-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r1.ebuild,v 1.10 2010/02/24 19:38:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r1.ebuild,v 1.11 2010/03/10 23:49:37 ssuominen Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -63,7 +63,8 @@ src_unpack() {
 	cd "${S}"
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}"/glx-define-prototype.patch
+	epatch "${FILESDIR}"/${P}-glx-define-prototype.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 
 	sed -ie '/ldconfig / d' "${S}/Makefile"