From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/
Date: Thu, 10 Sep 2020 19:44:01 +0000 (UTC) [thread overview]
Message-ID: <1599767037.2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae.polynomial-c@gentoo> (raw)
commit: 2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 19:43:32 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 19:43:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc4cf4a
media-libs/libpng-compat: Fixed build with USE="apng"
- Converted to EAPI-7
- Minor improvements
Closes: https://bugs.gentoo.org/741546
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../libpng-compat/libpng-compat-1.5.30.ebuild | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
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 d0ba31d9b8d..da883b36c4f 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() {
next reply other threads:[~2020-09-10 19:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 19:44 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-25 21:50 [gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/ Sam James
2021-11-22 10:11 Sam James
2021-05-06 10:02 Sam James
2021-04-14 6:46 Lars Wendler
2021-04-14 6:46 Lars Wendler
2021-04-14 6:46 Lars Wendler
2020-12-27 17:47 Fabian Groffen
2019-11-08 6:48 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1599767037.2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox