Fix building with libpng15 wrt #368315 with NetBSD patch.

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

4 files changed, 106 insertions, 8 deletions

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index 7d7f5fe97358..83d62df8c2cd 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lensfun
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.26 2011/07/13 14:38:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.27 2011/08/07 09:10:19 ssuominen Exp $
+
+*lensfun-0.2.5-r2 (07 Aug 2011)
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +lensfun-0.2.5-r2.ebuild,
+  +files/lensfun-0.2.5-libpng15.patch:
+  Fix building with libpng15 wrt #368315 with NetBSD patch.
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> lensfun-0.2.5-r1.ebuild:
   ppc64 stable wrt #354033
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index daec558e8e19..4657aab6e4c4 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lensfun-0.2.3-as-needed.patch 873 RMD160 d79964b411a70efe268c5464ee901a6d160b2004 SHA1 c16ddb0f39253462b8fa0882461ed7bd85d1c5fc SHA256 94bdc6b1145043d9d8f240144dc60c38f6df10ef380c7f151899d633600ce85f
 AUX lensfun-0.2.3-glibc-2.10.patch 355 RMD160 b918df336b42771d400a60d3fd8d30f78b2bac68 SHA1 f0804a6445376f55d91d565d2a546b14b0990bf7 SHA256 a26c32645280239edb5ccfff9dc169a250fbb7361bfd00e15cfbaa6614e3befa
+AUX lensfun-0.2.5-libpng15.patch 1254 RMD160 72f6eb784255d2e419368a40496150b64699d11d SHA1 3bf2041a49369a6a6af4a3da4aac8fead139e9da SHA256 19f533bf5c3a1172c7f5ae0b849579c72d3968500cc84de41bc5a13ef2f1e367
 DIST lensfun-0.2.4.tar.bz2 207877 RMD160 f33d36c602da323c9d089b16cf3c2e32863654bb SHA1 e756332d406df78edbe9d15bec9c4f697f8a0d4b SHA256 0beee0a3fc15d4199e20070da001fa2a5a459cab56963e449eb2dbe5c40805b4
 DIST lensfun-0.2.5.tar.bz2 470733 RMD160 2f421cefb65d271b937e3d61f41f8536fd078971 SHA1 7e8568cb131b6e2090264274483721a959f6b9bc SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87
 EBUILD lensfun-0.2.4.ebuild 1212 RMD160 e2b295edb9941e11c0efe15aa54c1beeb18adce3 SHA1 00f475b2b62bd4704a83833439eaeaf0154882d0 SHA256 484869221dea90e9eea62056a7356abfd8d086a940a6279e68d99473fe5951ec
 EBUILD lensfun-0.2.5-r1.ebuild 1287 RMD160 47d986da396498519ce81bbe78ec5fba88cc1066 SHA1 0ae5571a75934e17f847b238d6ea71fb58a99419 SHA256 42a611bf33e4970801b0341d036be53f9e6da88522afc7a92e0749994f3beda3
+EBUILD lensfun-0.2.5-r2.ebuild 1332 RMD160 290cccfc7cb9110ddb877bc793cde3b2944fb3d5 SHA1 991dd20a10e3868d7bd55ba700a0bdf6198011b3 SHA256 c7ee308c9be5cb3b66f3413456d79a4f53e18963c4030f204bcdacaf0f71eb60
 EBUILD lensfun-0.2.5.ebuild 1114 RMD160 3b08b46e3f95062e38913d5b6c0bf95b7b48c42c SHA1 68a4554a573366ea937ae46c9750a8a1aa2cabd2 SHA256 3eaa1f50bb8135f5486ae18589bfae1567ffdbff9eb6421a609d8ef3399ae79f
-MISC ChangeLog 3270 RMD160 3db995d736e13530ac5d28a96e0365348e99a411 SHA1 c7ace0f8209dc295b8644581ad02e7773a829099 SHA256 5174bfdbfe0aa0b0aebd0b05a429949d6a9603c7346350b085f43c299d64952a
+MISC ChangeLog 3482 RMD160 c4dfdb106efbe6ba37008d34ad7261b0f851db94 SHA1 11700a33496b501c417ad850da5c4ef2db52f545 SHA256 2c415ccd049866b0d9a29edd34a174d712d7b195c91793d9d63f13a91adb55ee
 MISC metadata.xml 434 RMD160 50bd60c8f0e7c9da3ca52b50b8b4705c9c0bb219 SHA1 a57ff3680e403b95d6f19138167a103cea711987 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4drdQACgkQIiMqcbOVdxR7eAP/aj2lULeqOeJuKC6hYo7Ubq/d
-pfh+xSGHp6qfljRsG/fEP6FtTuh84Ye5oFGnTRXibBtwa1wj/NjreigixfJJjTQP
-oKo9l8RUhmSI3VPLUfVpQULlCFge0it9j+og2GOxM9CvKjcbYkG9XWZEqcpckXlv
-aj4kQt2fkn90iIzxSuE=
-=/xoG
+iF4EAREIAAYFAk4+VbUACgkQXkR9YqOcLPG09QD/fiZdZi8GtyCvovjtPvPBWqai
+Vh0USZi7mKw2vHrOFOoA/3q3+90zdxq0eMRD/LEMJ3hGRf1ZasJDQ7uOMeFd75f4
+=eiK8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
new file mode 100644
index 000000000000..6d10b6c7d0ca
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
@@ -0,0 +1,40 @@
+--- libs/auxfun/image.cpp
++++ libs/auxfun/image.cpp
+@@ -94,7 +94,7 @@ bool Image::LoadPNG ()
+ 
+     png_init_io (png, file);
+ 
+-    if (setjmp (png->jmpbuf))
++    if (setjmp (png_jmpbuf(png)))
+         // If we get here, we had a problem reading the file
+         goto nomem;
+ 
+@@ -157,7 +157,7 @@ bool Image::LoadPNG ()
+     row_pointers = new png_bytep [Height];
+ 
+     if (!row_pointers
+-        || setjmp (png->jmpbuf))             // Set a new exception handler
++        || setjmp (png_jmpbuf(png)))             // Set a new exception handler
+     {
+         delete [] row_pointers;
+     nomem:
+@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName)
+     }
+ 
+     /* Catch processing errors */
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+         /* If we get here, we had a problem writing the file */
+         goto error2;
+ 
+@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName)
+     /* It is REQUIRED to call this to finish writing the rest of the file */
+     png_write_end (png, info);
+ 
+-    /* if you malloced the palette, free it here */
+-    if (info->palette)
+-        free (info->palette);
+-
+     /* clean up after the write, and free any memory allocated */
+     png_destroy_write_struct (&png, &info);
+ 
diff --git a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..475c6d7b0fce
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5-r2.ebuild,v 1.1 2011/08/07 09:10:19 ssuominen Exp $
+
+EAPI=2
+inherit eutils python
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.berlios.de/"
+SRC_URI="mirror://berlios/lensfun/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*
+	doc? ( >=app-doc/doxygen-1.5.0 )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# disable stripping, remove ricer CFLAGS
+	sed -i \
+		-e 's:-s -O3 -fomit-frame-pointer -funroll-loops::g' \
+		-e 's:GCC.LDFLAGS.release = -s:GCC.LDFLAGS.release =:g' \
+		build/tibs/compiler/gcc.mak || die
+
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	local myconf=""
+	use debug && myconf="--mode=debug"
+	# econf does NOT work
+	./configure --prefix=/usr --docdir="/usr/share/doc/${PF}" --vectorization= ${myconf} || die
+}
+
+src_compile() {
+	emake all V=1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	# TODO remove docs if ! use doc
+}