[gentoo-commits] dev/maekke:master commit in: media-gfx/enblend/, media-gfx/enblend/files/

[Markus Meier]

commit:     ea879b8f696e93ac6cc4dfa92e0d5c702d4fe00d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 20:03:39 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 20:03:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ea879b8f

sync media-gfx/enblend and add cmake-based ebuild for 4.1.1

Package-Manager: portage-2.2.1
Manifest-Sign-Key: 072AD062

---
 media-gfx/enblend/ChangeLog                        |  18 +-
 media-gfx/enblend/Manifest                         |  21 +-
 media-gfx/enblend/enblend-4.0.ebuild               |  85 --------
 media-gfx/enblend/enblend-4.1.1-r1.ebuild          |  65 ++++++
 media-gfx/enblend/enblend-4.1.1.ebuild             |   6 +-
 media-gfx/enblend/enblend-4.1.ebuild               |  81 --------
 media-gfx/enblend/files/enblend-4.0-libpng14.patch |  13 --
 media-gfx/enblend/files/enblend-4.0-libpng15.patch | 220 ---------------------
 8 files changed, 96 insertions(+), 413 deletions(-)

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index ab93e14..0b0d665 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-gfx/enblend
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.50 2012/12/11 22:33:45 maekke Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.53 2013/05/08 08:50:30 radhermit Exp $
+
+  08 May 2013; Tim Harder <radhermit@g.o> -enblend-4.0.ebuild,
+  -files/enblend-4.0-libpng14.patch, -files/enblend-4.0-libpng15.patch,
+  -enblend-4.1.ebuild:
+  Remove old.
+
+  11 Apr 2013; Vicente Olivert Riera <vincent@g.o> enblend-4.1.1.ebuild:
+  amd64, ppc and x86 stable, wrt bug #465428
+
+*enblend-4.1.1 (03 Mar 2013)
+
+  03 Mar 2013; Markus Meier <maekke@g.o> +enblend-4.1.1.ebuild:
+  version bump
 
   11 Dec 2012; Markus Meier <maekke@g.o> enblend-4.1.ebuild:
   add missing sci-libs/gsl dependency by Martin Jansa in bug #446816
@@ -196,4 +209,3 @@
   +enblend-2.1.ebuild:
   First commit, thanks to David Grant <david.grant@×××××.net> for the updated
   ebuild
-

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 6be1982..8396aa8 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,10 +1,15 @@
-AUX enblend-4.0-libpng14.patch 625 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4 SHA512 b1acfb999cb8d37cb3e1020f081114b75b21842ff19629c99d407825436b54105377aa7c2b2e26e7194a86eab2834f77f22a2e7ad9ba530db439f411649678f7 WHIRLPOOL d498123036e0d23a1024773ad4b6c44fdcbf89c54f0093333b992d54959df91842b738ac1e3e6262f3e89245157422c2288e56e1cfb1f17964c24f10613bfc4a
-AUX enblend-4.0-libpng15.patch 9442 SHA256 05350a8dd5810a2940d65975af4b121375bc49dcb09a9fc36111aaf8ada02a3b SHA512 3b283fdd0af3f09d1b486251b8fcae8175914c7e2fe693b0ef054a647ad2d8d1b7409b03146d33065d883b66b06c10ba18b1ace8de7379023d7e9082224e80a7 WHIRLPOOL f6d9b065ade9a98bb6042d3b111b5bb42dfccfac334bc406461ee273c5735a52366ffe69cc79c2912b4af7aa42e99c37932c1166120a2ee3f5ec99ed00bb6b03
-DIST enblend-enfuse-4.0.tar.gz 1047295 SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2 SHA512 a5ac7e3cd34eee136d6580d47455b9abf652272049e5b6aaf4210c3ab664ecdb2b81ad21038eae7f1f03df1e395b10436747ca25f3707dc19a1078429b63adc3 WHIRLPOOL 3fe0776d07ac9b4fa073d50d872855a3b4e80166ee4a054ff30ce8a69927e8f5aec3b7f10f5275e2862276c968ca744b8d003084c7721c764d3ddb781a9be727
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST enblend-enfuse-4.1.1.tar.gz 850214 SHA256 9d0947633ebaa0dc1211331b31009408de6fe2108751ad4190760e3a9f181bc9 SHA512 dd4c8f205986beef1268210a8ccad10107125fc15a45b2e7266f250d36a294356f557d577b80e923e04b5f14ed5f6070201793c067cc3a2e7d6020cf5669a61f WHIRLPOOL c9938499116f26f3bfe6eae874414722a15380cbda959c82315bb124cb7b58456550174b0d43355d924cb6e107ef3ee4d1b83f8adc82d7144d974b66207ff965
-DIST enblend-enfuse-4.1.tar.gz 857011 SHA256 cdf59cc4963846b9fb0c934dd8f8c5630414e1c45abb1ee3efc21021a0e427a2 SHA512 062f54330828d1830ab6053c13d027c06736030157039664b9153cb0b648d9fc4133a5c589cf4cc673933a1535a2f6ec4e4b5414706ab14bb92673f45c2d9fd8 WHIRLPOOL 2b4f387a40609d2d3812dd53195cc1824db60761b1183ff6ea55d6f74c3f70f4d59ad6c1d786f4c142bad69da9d1234ae3c0eebcf709e4b8bc2f6b1f6bb97040
-EBUILD enblend-4.0.ebuild 2034 SHA256 e1c94e44521b0c448318769edeb814bf709a84b3e23d7dd6f9d8ec9561afc1f3 SHA512 4c38c6d6f120bdba10573bb04f4665ad0fc4f48b4636fbfafdb405f4356af1fddc403c8b40900dc2ad17a34bc7b12ae96ea758a97472954c45204c1f642d2d8e WHIRLPOOL a90c892f0ae429283057bd0e68a7ed4e91b6dd0d8e4c7e00e74550400c5fd3b82d69a6cb0351b6e36293cadbfcc4757c3ff22da851209a05fe4d3a7564cfaabe
-EBUILD enblend-4.1.1.ebuild 1937 SHA256 76f17398cbf741eb89006b829992b21ab7e67d633e119ba57a3bee9950d63eff SHA512 6cab74edf1d0b81ef2fc2631c2537033fe5e1ce1459c94121952f6d943f13c1ce13af809c6ab36870e838288acafb5daf2722c5a9267baf14f1e862b1a14a462 WHIRLPOOL 9a1bbb9b6a545d55a9f1401a262803888375190f91869bc5bf5b13c7801d89481ef948f558a2487ebe5b988ef54cb51b6a6b3b5bd88de411f991b63fb2213d6b
-EBUILD enblend-4.1.ebuild 1937 SHA256 76f17398cbf741eb89006b829992b21ab7e67d633e119ba57a3bee9950d63eff SHA512 6cab74edf1d0b81ef2fc2631c2537033fe5e1ce1459c94121952f6d943f13c1ce13af809c6ab36870e838288acafb5daf2722c5a9267baf14f1e862b1a14a462 WHIRLPOOL 9a1bbb9b6a545d55a9f1401a262803888375190f91869bc5bf5b13c7801d89481ef948f558a2487ebe5b988ef54cb51b6a6b3b5bd88de411f991b63fb2213d6b
-MISC ChangeLog 6670 SHA256 6610399ce13febb2f430d043022add9776c62cdaa48973d073b39d71fffdf3a7 SHA512 a9ba8621c4fcc75d3816fa101cdbb58fd6ad8b1448be3337df19a9f9bc7c9d978e8b71a9b93d16449b06f1742db236f93cd07a511dcec1841afb3fcba56df432 WHIRLPOOL 4b8f05bc1530436fe1708496b570fa8695ea0c6300c37f953c6915e052da98e0277c428273d83db3074b444511c5e98e878faa3b5630d7108dcdbe144b4e6cdb
+EBUILD enblend-4.1.1-r1.ebuild 1548 SHA256 73d15a3777f7ba06c0f96c65fa2b81f0088959d476b3b5a15866062fcd320bcf SHA512 aebfcc50af7f5148d6f4308b9c3495d70051264af23e10ae9c6fcde635f411990b14b715f8ecdc82afd17f9a170f7ca0365369e9942c9e428e1219bdc4de5647 WHIRLPOOL 267d04e8cbb2e2368c94120dd300c7ee920804a09721f9d5a9932405b2233692bebcd9b4df895cbe0569284dbbc0313a3a29ddedeafb5abbb5d19fff3b798000
+EBUILD enblend-4.1.1.ebuild 1937 SHA256 a7c519f40c3c4b9149bf7fed592280cc29bad5da2cf8a594e9d8885ced21937a SHA512 d5be6d54b83c917e352c1a8e354cf730fa61679d14b46208f274fbae7a127bb5115902ac4e2997864544e904678f39c541c6dadb5c8bc0560913f262e3f104a8 WHIRLPOOL 5475db49caae94c7a92df20a10b4d0332f5049e2ba0e4386e0e4fecea93fdc46ebfc817b41c296449fc2724bd301496bebb58062041bec0aa39978fe3a8be6dc
+MISC ChangeLog 7095 SHA256 978091f06cf9de8667d9ece2a8358dee33dda13f6c2b5e3aa2e08f6e09e69fb2 SHA512 9f6787bdecb0b055c2ea256c746d5ab5eb43874748d0bd9d7a383b06fa096e984ff0e5688461baea4e69c2194c07e09d3ea62ec6a5b44392c36e4ee6d0af2fa2 WHIRLPOOL 77b6fb1858b87e8a7667e1bd828418e0d74dd0c267bcc0048368b97632595451c716eaffadbd55d93763b9b620634de6902961adf27250dbd8133bc9bbb9b7df
 MISC metadata.xml 298 SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3 SHA512 a92eebec232855ca89459a7c112c54c65f9ffb6e40e712da5eb9369b8389e1278768441a4c83a901ce90640adb321d068ed96bc95d63b6048bf4b7c90b5c999a WHIRLPOOL 015f7e2a6cdc965f1b385358bbdf3d2c784f044a0134018bce3aec87fd64677b2e6b04a3d6279d51dddd2a07b09d7b6fe43fe60fd74b7546104bbeff1231406a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlIeV5sACgkQkKaRLQcq0GInAACfQs8yHv7Jn6L82Oaxttlitgnm
+GvEAn3rpswtLs9vod6qB3mQaiO7VMM7/
+=hUTT
+-----END PGP SIGNATURE-----

diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild
deleted file mode 100644
index 82ad606..0000000
--- a/media-gfx/enblend/enblend-4.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.12 2012/05/05 07:00:26 jdhore Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${PN}-enfuse-${PV/_rc/RC}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc gpu +image-cache +openexr openmp"
-
-RDEPEND="
-	media-libs/glew
-	=media-libs/lcms-1*
-	>=media-libs/libpng-1.2.43
-	media-libs/plotutils[X]
-	media-libs/tiff
-	virtual/jpeg
-	gpu? ( media-libs/freeglut )
-	openexr? ( >=media-libs/openexr-1.0 )"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.31.0
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${PN}-enfuse-4.0-753b534c819d"
-
-pkg_setup() {
-	if use image-cache && use openmp; then
-		ewarn "the openmp and image-cache USE-flags are mutually exclusive"
-		ewarn "image-cache will be disabled in favour of openmp"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	# 378677, temp workaround
-	has_version ">=media-libs/libpng-1.5" && epatch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	local myconf=""
-	if use image-cache && use openmp; then
-		myconf="--disable-image-cache --enable-openmp"
-	else
-		myconf="$(use_enable image-cache) $(use_enable openmp)"
-	fi
-
-	use doc && myconf="${myconf} --with-gnuplot=$(type -p gnuplot)" \
-		|| myconf="${myconf} --with-gnuplot=false"
-
-	econf \
-		--with-x \
-		$(use_enable debug) \
-		$(use_enable gpu gpu-support) \
-		$(use_with openexr) \
-		${myconf}
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	emake -j1 || die
-	if use doc; then
-		cd doc
-		make enblend.pdf enfuse.pdf || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-	use doc && dodoc doc/en{blend,fuse}.pdf
-}

diff --git a/media-gfx/enblend/enblend-4.1.1-r1.ebuild b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
new file mode 100644
index 0000000..f94d89d
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P="${PN}-enfuse-${PV/_rc/rc}"
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc gpu image-cache openmp"
+
+REQUIRED_USE="openmp? ( !image-cache )"
+
+RDEPEND="
+	media-libs/glew
+	=media-libs/lcms-2*
+	>=media-libs/libpng-1.2.43:0=
+	>=media-libs/openexr-1.0
+	media-libs/plotutils[X]
+	media-libs/tiff
+	>=media-libs/vigra-1.8.0
+	sci-libs/gsl
+	virtual/jpeg:0=
+	debug? ( dev-libs/dmalloc )
+	gpu? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.31.0
+	virtual/pkgconfig
+	doc? (
+		media-gfx/imagemagick
+		media-gfx/transfig
+		sci-visualization/gnuplot[gd]
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "s:doc/enblend:doc/${P}:" doc/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable debug DMALLOC)
+		$(cmake-utils_use doc DOC)
+		$(cmake-utils_use_enable image-cache IMAGECACHE)
+		$(cmake-utils_use_enable openmp)
+		$(cmake-utils_use_enable gpu OPENCL)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+	enable_cmake-utils_src_compile -j1
+}

diff --git a/media-gfx/enblend/enblend-4.1.1.ebuild b/media-gfx/enblend/enblend-4.1.1.ebuild
index c2210f8..1394af1 100644
--- a/media-gfx/enblend/enblend-4.1.1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.ebuild,v 1.2 2012/12/11 22:33:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.1.ebuild,v 1.2 2013/04/11 20:12:38 vincent Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug doc gpu +image-cache +openexr openmp"
 
 RDEPEND="

diff --git a/media-gfx/enblend/enblend-4.1.ebuild b/media-gfx/enblend/enblend-4.1.ebuild
deleted file mode 100644
index c2210f8..0000000
--- a/media-gfx/enblend/enblend-4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.ebuild,v 1.2 2012/12/11 22:33:45 maekke Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc gpu +image-cache +openexr openmp"
-
-RDEPEND="
-	media-libs/glew
-	=media-libs/lcms-2*
-	>=media-libs/libpng-1.2.43
-	media-libs/plotutils[X]
-	media-libs/tiff
-	>=media-libs/vigra-1.8.0
-	sci-libs/gsl
-	virtual/jpeg
-	gpu? ( media-libs/freeglut )
-	openexr? ( >=media-libs/openexr-1.0 )"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.31.0
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use image-cache && use openmp; then
-		ewarn "the openmp and image-cache USE-flags are mutually exclusive"
-		ewarn "image-cache will be disabled in favour of openmp"
-	fi
-}
-
-src_configure() {
-	local myconf="--with-boost-filesystem"
-	if use image-cache && use openmp; then
-		myconf="${myconf} --disable-image-cache --enable-openmp"
-	else
-		myconf="${myconf} $(use_enable image-cache) $(use_enable openmp)"
-	fi
-
-	use doc && myconf="${myconf} --with-gnuplot=$(type -p gnuplot)" \
-		|| myconf="${myconf} --with-gnuplot=false"
-
-	econf \
-		--with-x \
-		$(use_enable debug) \
-		$(use_enable gpu gpu-support) \
-		$(use_with openexr) \
-		${myconf}
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	emake -j1 || die
-	if use doc; then
-		cd doc
-		make enblend.pdf enfuse.pdf || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-	use doc && dodoc doc/en{blend,fuse}.pdf
-}

diff --git a/media-gfx/enblend/files/enblend-4.0-libpng14.patch b/media-gfx/enblend/files/enblend-4.0-libpng14.patch
deleted file mode 100644
index 2fe3846..0000000
--- a/media-gfx/enblend/files/enblend-4.0-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -274,8 +274,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 

diff --git a/media-gfx/enblend/files/enblend-4.0-libpng15.patch b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465cc..0000000
--- a/media-gfx/enblend/files/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-             png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }