Fix building with libpng15 wrt #378147 by Diego Elio Pettenò

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

3 files changed, 50 insertions, 16 deletions

diff --git a/media-gfx/videorbits/ChangeLog b/media-gfx/videorbits/ChangeLog
index c89798477a65..dd5f36a51e31 100644
--- a/media-gfx/videorbits/ChangeLog
+++ b/media-gfx/videorbits/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/videorbits
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.14 2011/02/26 18:29:10 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.15 2011/08/07 23:39:53 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> videorbits-2.201.ebuild,
+  +files/videorbits-2.201-libpng15.patch:
+  Fix building with libpng15 wrt #378147 by Diego Elio Pettenò
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> videorbits-2.201.ebuild:
   Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch b/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
new file mode 100644
index 000000000000..e384738b9357
--- /dev/null
+++ b/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
@@ -0,0 +1,30 @@
+--- src/simple_png_read.c
++++ src/simple_png_read.c
+@@ -92,7 +92,7 @@
+     return -1;
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     fprintf(stderr, "simple_png_read: error (internal)\n"); 
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+@@ -226,7 +226,7 @@
+     return -1;
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     fprintf(stderr, "simple_png_read_header: error\n"); 
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+--- src/simple_png_write.c
++++ src/simple_png_write.c
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ int simple_png_write_rgba(
+   char *filename, 
diff --git a/media-gfx/videorbits/videorbits-2.201.ebuild b/media-gfx/videorbits/videorbits-2.201.ebuild
index e139e1a909f8..d0ef37e532da 100644
--- a/media-gfx/videorbits/videorbits-2.201.ebuild
+++ b/media-gfx/videorbits/videorbits-2.201.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.16 2011/02/26 18:29:10 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.17 2011/08/07 23:39:53 ssuominen Exp $
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="a collection of programs for creating high dynamic range images"
 HOMEPAGE="http://comparametric.sourceforge.net/"
@@ -14,27 +14,27 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	sys-libs/zlib
 	media-libs/libpng
 	virtual/jpeg"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README README.MORE )
 
 src_prepare() {
-	cd "${S}"/images
-	mv Makefile.in Makefile.in-orig
-	sed -e "s:\$(prefix)/images:\$(prefix)/share/${PN}/images:" Makefile.in-orig > Makefile.in
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
+	sed -i \
+		-e "s:\$(prefix)/images:\$(prefix)/share/${PN}/images:" \
+		images/Makefile.in || die
 
-	cd "${S}"/lookuptables
-	mv Makefile.in Makefile.in-orig
-	sed -e "s:\$(prefix)/lookuptables:\$(prefix)/share/${PN}/lookuptables:" Makefile.in-orig > Makefile.in
+	sed -i \
+		-e "s:\$(prefix)/lookuptables:\$(prefix)/share/${PN}/lookuptables:" \
+		lookuptables/Makefile.in || die
 }
 
 src_configure() {
 	tc-export CC
 	econf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README README.MORE
-}