Fix building with libpng15 (again, restore dropped patch) wrt #355039 by Hanno Boeck

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

4 files changed, 49 insertions, 11 deletions

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 2da5505e2016..947493b2d1e3 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdauthor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.32 2011/09/13 00:32:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.33 2011/09/14 17:09:55 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> dvdauthor-0.6.18.ebuild,
+  +files/dvdauthor-0.6.18-libpng15.patch:
+  Fix building with libpng15 (again, restore dropped patch) wrt #355039 by
+  Hanno Boeck
 
 *dvdauthor-0.6.18 (13 Sep 2011)
 
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index c0ebc9a84d72..323bacd48153 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dvdauthor-0.6.14-libpng-1.5.patch 488 RMD160 e28adbde9cb81457326273ac1c392672197ba19d SHA1 005f50a1aedc6969f351dbfe13ea0b064180f927 SHA256 5cbf2875e43e32733457fc02eecf567468c1e36e4f8a37ae69491a57a29645e2
+AUX dvdauthor-0.6.18-libpng15.patch 348 RMD160 5ebbaec16da612e1c79342cdb0a5bb20b79e28cf SHA1 41c4b24f7019c4f6cd8f1dfaf31a98b3dfe7a7a3 SHA256 61c28dc61470afa828df44ab46fcf5ec2cc8527313b9f02691f4b7f64faf3e31
 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
 DIST dvdauthor-0.6.18.tar.gz 392809 RMD160 d7571a8371305aefb283f433440b3be2264e9e34 SHA1 7b6e190a3903f617d08368e3cc5e6fd80677e2fb SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26
 EBUILD dvdauthor-0.6.11.ebuild 704 RMD160 aa676669d20a561f0b757767d8c00dfdd7a6b565 SHA1 41aad1a53acfc29b543e2174b52e5781ff180acf SHA256 b94f071c8d2bf9bed8606bfc8b25615fcadd9d80197282554332ff9ecdecb750
 EBUILD dvdauthor-0.6.14.ebuild 811 RMD160 7d4e143bb4cde40e90815c462733f3d1231fae9c SHA1 71d821f3d5d6ff0a03badd2b6c86efeffc067ffa SHA256 3054dfad408cc187baf1ce89e9ed83573c1bc17e2296137ab2d0b41011cec3df
-EBUILD dvdauthor-0.6.18.ebuild 772 RMD160 02fa0a067cedc0876b680a4c2a049b409675e806 SHA1 f445ff98d2d122b6cf1aa4f4b029eb8e9f3c2c5e SHA256 69eb556349816318bbe8dd872bf6d48121d8230708c6f7704352be2267d68b9d
-MISC ChangeLog 4586 RMD160 572fd1854ec56438721b90e870dbed4e4d3ebc98 SHA1 c3a58779c4be66bd9c452dbbbc6b8e17c4551baf SHA256 f65ddd41570cb53eea124bd8d2b0367424ec0ff26238f59820afe4d0c6785232
+EBUILD dvdauthor-0.6.18.ebuild 800 RMD160 88afb43987ba83f668197209ab273b43a0cd1a6f SHA1 892c9c614d3b8f292f2d9dc5a4dca5124e0f7119 SHA256 6a17779c87e68d7e9cf8d166c116a54119cad91eb7755ef0d1b64dd5b61800ed
+MISC ChangeLog 4799 RMD160 4372954e48693c7ef36682da87fb85c339d26f9a SHA1 45d0b90b6039117e3b2cee283f6e2318f2e6817e SHA256 71be44b6cfb2d9371513a91730266b8290cfc904055a553cc2797e039990fad8
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5w4BoACgkQXkR9YqOcLPGegAD/e5U2AVTUioGL8H3JVHl0c42l
+BxptrvDxepe1o4SCcKMA/jcKIldP72B9dItxpTpOaBZJNkS8BuA39+OjJqxeyOGx
+=XQVe
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
index b156498bec11..66d3fee9c05a 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
@@ -1,28 +1,31 @@
 # 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.18.ebuild,v 1.1 2011/09/13 00:32:27 beandog Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.18.ebuild,v 1.2 2011/09/14 17:09:55 ssuominen Exp $
 
+EAPI=4
 inherit eutils
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
 HOMEPAGE="http://dvdauthor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-DEPEND="media-libs/libdvdread
+
+RDEPEND="media-libs/libdvdread
 	>=media-gfx/imagemagick-5.5.7.14
 	>=dev-libs/libxml2-2.6.0
 	media-libs/freetype
 	dev-libs/fribidi
 	media-libs/libpng"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
 
-S="${WORKDIR}/${PN}"
+DOCS=( AUTHORS ChangeLog README TODO )
 
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README TODO ChangeLog AUTHORS
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 }
diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
new file mode 100644
index 000000000000..6ecd44c1e8d2
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
++++ src/spuunmux.c
+@@ -37,6 +37,7 @@
+ 
+ #include <netinet/in.h>
+ 
++#include <zlib.h>
+ #include <png.h>
+ 
+ #include "rgb.h"
+@@ -483,7 +484,7 @@
+     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;