diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-libs/libpng-compat | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
Diffstat (limited to 'media-libs/libpng-compat')
| -rw-r--r-- | media-libs/libpng-compat/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 25 |
2 files changed, 14 insertions, 13 deletions
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest index 220e85db9685..ee2b182dd511 100644 --- a/media-libs/libpng-compat/Manifest +++ b/media-libs/libpng-compat/Manifest @@ -2,5 +2,5 @@ DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff2890 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d EBUILD libpng-compat-1.2.59.ebuild 900 BLAKE2B f0cdaf25bd129a47fe60229973497b3d45d772eaefc6eac9406947d0acd72969e49bb9cfaf838a4798a9ca4edb00ff612c805a1e8b563ba99ed08a5b4c1ac6e7 SHA512 810dc61ed8cf6e17e6be2e3b3f9c4f8232dce3c20a32f7680a641f09b28e188130158a95f147405aafb9e164c43a44608c79d604517c022c5e3bbd59044d33e4 -EBUILD libpng-compat-1.5.30.ebuild 1662 BLAKE2B 1f3835184a94f5a84d5553f0d9bfab91663414901d21603f8163c9cc645daa341ab6c882619b9ad7bfe8e2beba9585e3d7687a6f684bbfaa17259d8dce051d1b SHA512 9767fab62ba107fd34dd6b704f0693cbad1be19d720c9ccbc63e8ae875ffed77af4685af8ee8bb521d766ad799ecdd148157187c2127a4abaeac872fea4c96df +EBUILD libpng-compat-1.5.30.ebuild 1732 BLAKE2B 985e98e1017f1664f28a038a672c7c06f177d9c4de08b0b704324405cc0b620f9db3e432bc4430ba63b3f45b33c5782bb9aee6a4892204058aede53b3430e235 SHA512 0ed6f0bd11602456fbadb528b2a2d4d6a4f853b1ed4e4a2625d116c82b874b8315683389259d26345583074c83461f309e90569dad29c671bbfddd790741c72f MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3 diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild index d0ba31d9b8d6..da883b36c4f1 100644 --- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild +++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat inherit eutils libtool multilib-minimal -MY_P=libpng-${PV} +MY_P="libpng-${PV}" DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" LICENSE="libpng" SLOT="1.5" @@ -21,13 +21,13 @@ IUSE="apng neon" RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] !=media-libs/libpng-1.5*" -DEPEND="${RDEPEND} - app-arch/xz-utils" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils" DOCS="" pkg_setup() { - local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15 + local _preserved_lib="${EROOT}/usr/$(get_libdir)/libpng15.so.15" [[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}" } @@ -36,8 +36,8 @@ 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 - eapply "${WORKDIR}"/${PN}-*-apng.patch + -i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die + eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch # Don't execute symbols check with apng patch wrt #378111 sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die fi @@ -45,10 +45,11 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-static \ - --enable-arm-neon=$(usex neon) + local myeconfargs=( + --disable-static + --enable-arm-neon="$(usex neon)" + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_compile() { |