From: Samuli Suominen Date: Sun, 7 Aug 2011 23:39:53 +0000 (+0000) Subject: Fix building with libpng15 wrt #378147 by Diego Elio Pettenò X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d705841972d10fd8ced66c83ce9e232120577379;p=gentoo.git Fix building with libpng15 wrt #378147 by Diego Elio Pettenò Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- 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 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 videorbits-2.201.ebuild: Updated depends from media-libs/jpeg to virtual/jpeg diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest index a692621a8235..75ce67d12652 100644 --- a/media-gfx/videorbits/Manifest +++ b/media-gfx/videorbits/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX videorbits-2.201-libpng15.patch 758 RMD160 697d1e585e603be38037ed316b180106383fa634 SHA1 cba9328af38b7915e505accfe68e8dfbd2ed69bc SHA256 0e2fd5c5ca4a7b1ba3f285b73decce556b4bfe0a932b7066a147513fc8cee984 DIST videorbits-2.201.tgz 648187 RMD160 d914ca00a69d82e74b1ccd6736031bd5ebc03939 SHA1 b085587813cb05bf373f482ed979b35e177c9e87 SHA256 2d3b7dd906e2e20e2082b5106b92d279d662a8877ec780cac0913c877642d1bb -EBUILD videorbits-2.201.ebuild 1047 RMD160 eb4645c1f21888b50c79872afea193e9ee5fce3e SHA1 592c6bd1ebd91317d8d456e48d71a83d4e603dc4 SHA256 7c21459d6c74a23fc0cca5d70e9e5432f532476c69d473c1f73ede615ae5a507 -MISC ChangeLog 1943 RMD160 4e85eea90d5850d08787dcae0910df39bb709e92 SHA1 dd193a34bace285d5670e335961312174527c2be SHA256 64225920dc2c1fceb07cd59ca437e3a6ddcab8513f8dad1a0ae60cff44cc0fa0 +EBUILD videorbits-2.201.ebuild 962 RMD160 6a961cffcbfc5fc6617eb30ef046ee219fa6181b SHA1 57d47e980e75acdea0f55933b130fbab86e0e287 SHA256 5206f8d8f4f87d1bc2e0950b91f0c6420aeb90ffb95b1aa3e136ed7730d542c9 +MISC ChangeLog 2131 RMD160 44ba6a414d8fb4ec6fdfb852001cf740bfa4843b SHA1 720dc10b56d35c287e3dd39fa8b5e2b99d1b0ec8 SHA256 9dc38773555f86c1bc715f9bd3668b4844ec0b8ac3e3d5c88e6bb8fd715e8a6d MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk4/Ik8ACgkQXkR9YqOcLPEBxAD/RSQm/YnZg2kemN9w046xgTnH +LhYoHuxCdUL+mx0k9jsBAI7MFTUOMO6ptyPsqmqvB9fhJaWPeXYw6lfjAEPutfbG +=7ilj +-----END PGP SIGNATURE----- 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 + #include + #include ++#include + + 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 -}