Fix for building with libpng-1.5 #355039 by Lars Wendler.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 53 insertions, 7 deletions

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 53708bc766e5..10a681c7677b 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdauthor
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.30 2008/12/21 14:51:30 nixnut Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.31 2011/02/21 17:43:40 vapier Exp $
+
+  21 Feb 2011; Mike Frysinger <vapier@gentoo.org> dvdauthor-0.6.14.ebuild,
+  +files/dvdauthor-0.6.14-libpng-1.5.patch:
+  Fix for building with libpng-1.5 #355039 by Lars Wendler.
 
   21 Dec 2008; nixnut <nixnut@gentoo.org> dvdauthor-0.6.14.ebuild:
   Stable on ppc wrt bug 250664
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 263fb384eefe..e613acee939f 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dvdauthor-0.6.14-libpng-1.5.patch 488 RMD160 e28adbde9cb81457326273ac1c392672197ba19d SHA1 005f50a1aedc6969f351dbfe13ea0b064180f927 SHA256 5cbf2875e43e32733457fc02eecf567468c1e36e4f8a37ae69491a57a29645e2
 DIST dvdauthor-0.6.11.tar.gz 288452 RMD160 6c2264a5b28063c9c7bde81496c56c213e1a18a6 SHA1 a99ea7ef6e50646b77ad47a015127925053d34ea SHA256 253415ec75fe6dc5a9bc8da1f7291ba5ab42906729c2381fb42eae1dff46c575
 DIST dvdauthor-0.6.14.tar.gz 319371 RMD160 b5d75b613c3be1e41ea5c3f247a993723430977a SHA1 493412bf103069b9261af3be1bc23da56d7d112a SHA256 dd1b1512f3ed64938d40541b1f5aff6682898782469992d8caa81e2587a48ef4
 EBUILD dvdauthor-0.6.11.ebuild 704 RMD160 aa676669d20a561f0b757767d8c00dfdd7a6b565 SHA1 41aad1a53acfc29b543e2174b52e5781ff180acf SHA256 b94f071c8d2bf9bed8606bfc8b25615fcadd9d80197282554332ff9ecdecb750
-EBUILD dvdauthor-0.6.14.ebuild 751 RMD160 b7c6307fa590f7a035f96609e7f0702bfa8fbc7a SHA1 50d037a09741394027a653325b323d4d6c1764b0 SHA256 6c267afcd3efc4649dd0377ac54d32a7d4be27a4d73fb98599844ec5a9dbcad4
-MISC ChangeLog 4271 RMD160 bf19de442e70ff11520f5b07d77e798a9d8c435d SHA1 6158c02a6d1a0b8af6ac1b323807a4089db2bc1c SHA256 aea592c0dae852cdda24fb2f7765980c30304d983004694bf5f115ec2d4c2573
+EBUILD dvdauthor-0.6.14.ebuild 811 RMD160 7d4e143bb4cde40e90815c462733f3d1231fae9c SHA1 71d821f3d5d6ff0a03badd2b6c86efeffc067ffa SHA256 3054dfad408cc187baf1ce89e9ed83573c1bc17e2296137ab2d0b41011cec3df
+MISC ChangeLog 4451 RMD160 ab1974eb6412fe4664409c81d3fb5893ac36238c SHA1 62cafb7f16ac4287e2a50715348c5fce830210bc SHA256 35749df08f59da0b715ab08290bc5835848838709d50b6f5ef43e2f19d4d60a6
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1ipFEACgkQaC/OocHi7Jah6gEAiBDSU03DMO89H1BOfx0L0MhT
+KCowgcNobOgfa+Nv2ocA/AyW2XBt1gt5Hz3HWWfeA2R6bBhVcmNhTMVEfBaZxKwX
+=MedZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdauthor/dvdauthor-0.6.14.ebuild b/media-video/dvdauthor/dvdauthor-0.6.14.ebuild
index a377fd945cd9..e419b3076c1d 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.14.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.14.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.14.ebuild,v 1.3 2008/12/21 14:51:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.14.ebuild,v 1.4 2011/02/21 17:43:40 vapier Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -20,7 +22,11 @@ DEPEND="media-libs/libdvdread
 	dev-libs/fribidi
 	media-libs/libpng"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch #355039
+}
+
 src_install() {
-	make install DESTDIR="${D}" || die "installation failed"
+	emake install DESTDIR="${D}" || die
 	dodoc README TODO ChangeLog
 }
diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch b/media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch
new file mode 100644
index 000000000000..89b43add3cf5
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.6.14-libpng-1.5.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/355039
+
+$NetBSD: patch-ab,v 1.3 2011/01/14 10:57:50 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/spuunmux.c
++++ src/spuunmux.c
+@@ -38,6 +38,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ 
+@@ -483,7 +484,7 @@ static int write_png(char *file_name,str
+ 	return -1;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_write_struct(&png_ptr, &info_ptr);
+ 	fclose(fp);
+ 	return -1;