commit:     a8ae9d5080bbebd83291ee530f94f5ce5e6f601a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 18:23:11 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 26 18:23:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ae9d50

media-libs/libpng: Bump to versions 1.5.27 and 1.6.22

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libpng/Manifest             |  4 +++
 media-libs/libpng/libpng-1.5.27.ebuild | 60 ++++++++++++++++++++++++++++++++++
 media-libs/libpng/libpng-1.6.22.ebuild | 43 ++++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 53e1cea..2543c40 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,9 +1,13 @@
 DIST libpng-1.2.56.tar.xz 654688 SHA256 
24ce54581468b937734a6ecc86f7e121bc46a90d76a0d948dca08f32ee000dbe SHA512 
b50cd58246590267fb123d8618387897d438cdc9514e69ca346bd09c5013845d2ca35933b236b31af9d81ae738afa7b01e9a332bcf099f4fa0e3b85048a4ac5f
 WHIRLPOOL 
436209348dde13751e8c326b8a9bceacca281e3d59e548af7eb9246fb14ee2f657e3c10437f04148a0c244f2d3bc231260fb57a2cd145d87b5d07ef5e49a8b1d
 DIST libpng-1.5.26-apng.patch.gz 10318 SHA256 
bcc0d7f1154a5004610a9102f25ce6f35985a6033cfb52887f3f2b11017fcd45 SHA512 
f7e5228fab036e63be3de58f2f85041d834e2292d04682f0b20930d5cd58c078796a8c3d6742cd28c7dc808ac641aa5d5bfe6f8daee5fb2b0b75bfb856170861
 WHIRLPOOL 
449212c403b6e8c5724e402655b42d23ed3e27d3902b219767b663fab08dedc19e684497a1be4326a99ef4b8cc26eb6acdd1ed1b0ccc0c282f19a50b1c831d28
 DIST libpng-1.5.26.tar.xz 748164 SHA256 
7ba4d85efb79e60d7a8a84bca6a0b925e043bfb5c8a47a1b878ab4d3bcd6714d SHA512 
87214671af84665277f0ac3226e6feb41a3e1deb0d7d61e62c99e77d1386fcf928b21f9863c4166a7391230166190bad00e57c3fc42902b3a0a53ba68d4db1f5
 WHIRLPOOL 
e2eda0792fc5f6b41d4f5d878fdf4c8bde0cac2591647a092fed0e6f362fd9c532d265ca7dcdcd8ade9bc23fa385bfa71bd8b532e3d1091202583230a9306724
+DIST libpng-1.5.27-apng.patch.gz 10315 SHA256 
ca86fcc54084c81b31da384626946af6b6c190b97ea92cf27300dcc050b462a8 SHA512 
68114ce8429ab900fa259c7b04699b099b8a7ab30e660df5c3ceecb7ae49a7bbfc97284567c635ecddbd626f64d8908eaf4455165642c7ae6b44429f6dfb9608
 WHIRLPOOL 
0a50a95e231fab6be55f3eb2889a2885f7cc514720a8fe7fb65feb8c82160aa72d8f20aa4bb8b648720da170f33c3c33d8c35c8f95a5449195a758aacadbaae6
+DIST libpng-1.5.27.tar.xz 752532 SHA256 
082f57d79559ba16ca3f33899e1929a510ff82aaaf100720e58b138a8c248368 SHA512 
5f31191417c11e165be7133b3b95a23207890180f0c0efe5d0982d70583144aca6734da6a116dbd96675739cf1685de87cbb61d18e7c602364871e6df2c7f804
 WHIRLPOOL 
46eff00871b3ba024338dacaa50705ec59a2fe5efda33e6f33a7f71409a3af66d426fcdd4468b453c4d20202124eac46a542baa421e33eddadbae0169c0fe23f
 DIST libpng-1.6.19-apng.patch.gz 10330 SHA256 
5ec713a51c35c25d5e53dd61270a6fd5313b26872b382f0fbaed41a0743768a2 SHA512 
2d412a74d657d366d395d13bc301d71363011fbcafbbf815dba565baca4069629450a97dfaab0ddeec7c7f646a6eddeac559d24f6910a34b072aa4a208dc4e16
 WHIRLPOOL 
4e093bcddbf114dda0c33eddac70b245f91c659f378d129731d3e486db3f6d232684bde1ad8f69109c7db726b53b8317f989d8b5c5a50198ab645eb7a869e7f9
 DIST libpng-1.6.19.tar.xz 941280 SHA256 
311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 SHA512 
166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8
 WHIRLPOOL 
8cdb5ffc7ecfafd064ae816b3bd1c7572799fc54c701e74d9c1f66ccac592fe460c1f22f1774329a8a1f177247f0fde8a22f8dc26892805a0bed64c0690967ae
 DIST libpng-1.6.20-apng.patch.gz 10304 SHA256 
ed7bc9d03bc7390c477623e1abff42977395c75ed3e69e8308ea25bc3871774d SHA512 
764bfb5a7cff395bbd6aeb6b5a53a9963f7074c41ae39dd9832d1dfd1e4eb0b6210d2cf9a1af63c8db8959ee4f0691d2fa288b0a0ecc63b61d131c7a708b38a4
 WHIRLPOOL 
8673db8f8b47704493d925d436f07822b3b92c0e251649670efe1f0db6cd4ecb9c38fd0c2d5153503c02f4afc677a25be835d12878ee0e0fbfa5a5027278e766
 DIST libpng-1.6.20.tar.xz 942672 SHA256 
55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b SHA512 
bbf7d9a21a13eb1fd1fa06f9761df72c0b37bd62da7049afe20ec4e63c02c3708aca8a2c2b7f2d7332f3941469b4aca1653cc8423c7fea6de8084201cb8b5f5f
 WHIRLPOOL 
fe745030bc7d09e41b20c11f26ed4b1ba1b49cd2f3d0bbafab181fbb28aa0a87165ef10f66d734314e7a73343d6c38bfedbe176fdc7b03c1273ec13d4f3f0953
 DIST libpng-1.6.21-apng.patch.gz 10318 SHA256 
e3987bb341dc0e936f3a28fc555d5a46577f629c72a42287a1f3cbb204138d1a SHA512 
196d2d7c8ea461cee1cfd8763763619f63469e1e017f76fe88879437475b936aeb593fce6df586f95203465e2f1026f23fe1a02f3d4fa45d427d5d206469c9d8
 WHIRLPOOL 
bede3b8c379b21dfb74bb2f9e8e64151d8c579b174dfa0e42d0c4e2eaacf010860f1b2362d5c336c9919fc5849c05f05db5ccc03bf4afbcf1a4383b7f65c2e91
 DIST libpng-1.6.21.tar.xz 943980 SHA256 
6c8f1849eb9264219bf5d703601e5abe92a58651ecae927a03d1a1aa15ee2083 SHA512 
84f644d455cf90ad721a098fa9e0fcfa6df22a12625faad1c36bf2353ab2315040c7cbd05522c05937c3a31b1c9dd7821cbe29c4a5ba27dec3de92c81ef9ed32
 WHIRLPOOL 
0d227f13a2375f1e8aeedadab91eead0ab1de29e0e77814235de5866deb58914adea4e9ec74de6a5503282d0966afe5568a8298f75516f7cc431f9eb578dc480
+DIST libpng-1.6.22-apng.patch.gz 10332 SHA256 
e50c318ba2eba3a1cfae9b6da632b07491a7380c000567dc1b382dd03ec3d9a8 SHA512 
a6e5bbc2d19946dff71b026c07337d62a87ed9ab3acfb05ea8eaeca2842218dd04023ec579543b5a5da6a84f72556c328c9a600a3a9f535174a5575c40c4a9ea
 WHIRLPOOL 
43877ca5d082184fbadafb9d471c0a26b8f3f657e91b779a4d7ff41de7ff458c5c7c4c0c2e1292baf04855e1684c55cd49109ab2692c56e1c22c7b0c20ef64cb
+DIST libpng-1.6.22.tar.xz 958976 SHA256 
6b5a6ad5c5801ec4d24aacc87a0ed7b666cd586478174f69368a1d7747715226 SHA512 
48b11123661c382273d033371907347aec53d405e9e31e92a32ed77cf5d154bc720e2047a52b670cb4421c92d4a706a00cc1f73a25cd41a766fa2f2b75acc51c
 WHIRLPOOL 
2cf7194e0e4e702d1481cee0baaf008483f54fce1fa5ded27500b129496abb76b7243c7ef8b7cace4cecca0d53cad2244c34865ad7912726b945b014a9526d1c

diff --git a/media-libs/libpng/libpng-1.5.27.ebuild 
b/media-libs/libpng/libpng-1.5.27.ebuild
new file mode 100644
index 0000000..b7bb55e
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.27.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+       apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+IUSE="apng neon"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+       !=media-libs/libpng-1.5*:0
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils"
+
+DOCS=""
+
+pkg_setup() {
+       local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
+       [[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
+}
+
+src_prepare() {
+       if use apng; then
+               # fix windows path in patch file. Please check for each release 
if this can be removed again.
+               sed 's@scripts\\symbols.def@scripts/symbols.def@' \
+                       -i "${WORKDIR}"/${PN}-*-apng.patch || die
+               epatch "${WORKDIR}"/${PN}-*-apng.patch
+               # Don't execute symbols check with apng patch wrt #378111
+               sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+       fi
+       elibtoolize
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" \
+       econf \
+               --disable-static \
+               --enable-arm-neon=$(usex neon)
+}
+
+multilib_src_compile() {
+       emake libpng15.la
+}
+
+multilib_src_install() {
+       newlib.so .libs/libpng15.so.15.* libpng15.so.15
+}

diff --git a/media-libs/libpng/libpng-1.6.22.ebuild 
b/media-libs/libpng/libpng-1.6.22.ebuild
new file mode 100644
index 0000000..b83049c
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.22.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+       apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils"
+
+src_prepare() {
+       if use apng; then
+               epatch "${WORKDIR}"/${PN}-*-apng.patch
+               # Don't execute symbols check with apng patch wrt #378111
+               sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+       fi
+       elibtoolize
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" econf \
+               $(use_enable static-libs static) \
+               --enable-arm-neon=$(usex neon)
+}
+
+multilib_src_install_all() {
+       dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+       prune_libtool_files --all
+}

Reply via email to