From a06c9ff545e496147f8d2cbfe3a224edaf30948e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 8 Mar 2010 22:28:14 +0000 Subject: [PATCH] Fix building with libpng14. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- media-gfx/enblend/ChangeLog | 8 ++++++-- media-gfx/enblend/Manifest | 15 +++------------ media-gfx/enblend/enblend-4.0.ebuild | 8 ++++++-- .../enblend/files/enblend-4.0-libpng14.patch | 13 +++++++++++++ 4 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 media-gfx/enblend/files/enblend-4.0-libpng14.patch diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog index f27d78ccb3af..6c4c227d6e2f 100644 --- a/media-gfx/enblend/ChangeLog +++ b/media-gfx/enblend/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/enblend -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.36 2009/12/18 11:35:10 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.37 2010/03/08 22:28:13 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen enblend-4.0.ebuild, + +files/enblend-4.0-libpng14.patch: + Fix building with libpng14. *enblend-4.0 (18 Dec 2009) diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index a4d2dec85e16..0fb80c46dca1 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX enblend-4.0-libpng14.patch 625 RMD160 3045da81a10c6b5dc87ebe33ba74c5f96d9b11c8 SHA1 84bdbcfb700659ef51774b88d54f753fae56e605 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4 DIST enblend-enfuse-3.2.tar.gz 831504 RMD160 7a9b0037b821ac287327477d52665372d0850dbb SHA1 e44226ec6759dd3e6dcf46bb34848b64536ad495 SHA256 84e367ba31102e5c9e40d55d1fb4672e3ffc89360c3fe242353b545f6c73c653 DIST enblend-enfuse-4.0.tar.gz 1047295 RMD160 2a9968f2060077f6408d86de2d0cf07258f13abb SHA1 6ae102e7d15529168bf8ec3077062fbc87d6712f SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2 EBUILD enblend-3.2.ebuild 1036 RMD160 0a7cf5cf97076e5dee1f9965520a87d49b609bfa SHA1 3b4a0ee1ed02c0016514de600592ba2ac356d1ac SHA256 3f630e1c8fda3e7ea0969001137e5af961c281863bd353facffff060bf8230fe -EBUILD enblend-4.0.ebuild 1840 RMD160 70f9f0ed7741a99d9327456f2823dc677f8c1c69 SHA1 c369c1804f7e30afadf58059f27b94abdf392294 SHA256 c3aeffa3d25a220b307475deb55e8e67f7ec33f3b20f4ab9ec11cb3a67a9ff1e -MISC ChangeLog 5027 RMD160 46a1981ff7ec0ce1d18dff9d1010405eafaa42bd SHA1 5e86662d40cfe67ff3301aa4f621e9dd01a5994b SHA256 885ea1d30c9fe4fc162f3735c01b224a582605e0d19f5c765289996e578dabea +EBUILD enblend-4.0.ebuild 1904 RMD160 f938a154a37429d430b04cd0187ad797d312be6b SHA1 b6b9c5bb91bc642b7b199d91fe4e1d25c4bf79d9 SHA256 f2b03bf7bd9eb098578b0b940df2e84b0b6c42977a3482d03e378fdf2b11f8f1 +MISC ChangeLog 5172 RMD160 459358817e2211d2854069bde22539b8a7ab2142 SHA1 b78ba1cf06b79af653d27e5b7596d4083f7116ad SHA256 eeb0dfa5ae48270f9d821fd418f6e37cb3366e976200477c1b74080f89807322 MISC metadata.xml 298 RMD160 56230140606e9654db65297324c309b3186b6983 SHA1 193c9e2a2264a47824431aaf9ca43ae225d2ad2c SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) - -iEYEARECAAYFAksraUsACgkQkKaRLQcq0GKRmgCglQqc09V9E0odJsyKS7UUH1sJ -0XMAmwegZK/kqKBm2qP713BxBrKxZ3Gw -=AH6A ------END PGP SIGNATURE----- diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild index 81ab867e56f0..a061e7387e45 100644 --- a/media-gfx/enblend/enblend-4.0.ebuild +++ b/media-gfx/enblend/enblend-4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.1 2009/12/18 11:35:10 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.2 2010/03/08 22:28:13 ssuominen Exp $ EAPI=2 @@ -42,6 +42,10 @@ pkg_setup() { fi } +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng14.patch +} + src_configure() { local myconf="" if use image-cache && use openmp; then diff --git a/media-gfx/enblend/files/enblend-4.0-libpng14.patch b/media-gfx/enblend/files/enblend-4.0-libpng14.patch new file mode 100644 index 000000000000..2fe3846f0aaa --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.0-libpng14.patch @@ -0,0 +1,13 @@ +--- 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; + } + -- 2.26.2