1 |
commit: 2cc4cf4ab5dc702c3786a2a2ad59ed3fc379beae |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 10 19:43:32 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 10 19:43:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc4cf4a |
7 |
|
8 |
media-libs/libpng-compat: Fixed build with USE="apng" |
9 |
|
10 |
- Converted to EAPI-7 |
11 |
- Minor improvements |
12 |
|
13 |
Closes: https://bugs.gentoo.org/741546 |
14 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
15 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
16 |
|
17 |
.../libpng-compat/libpng-compat-1.5.30.ebuild | 25 +++++++++++----------- |
18 |
1 file changed, 13 insertions(+), 12 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild |
21 |
index d0ba31d9b8d..da883b36c4f 100644 |
22 |
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild |
23 |
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild |
24 |
@@ -1,18 +1,18 @@ |
25 |
# Copyright 1999-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI=6 |
29 |
+EAPI=7 |
30 |
|
31 |
# this ebuild is only for the libpng15.so.15 SONAME for ABI compat |
32 |
|
33 |
inherit eutils libtool multilib-minimal |
34 |
|
35 |
-MY_P=libpng-${PV} |
36 |
+MY_P="libpng-${PV}" |
37 |
DESCRIPTION="Portable Network Graphics library" |
38 |
HOMEPAGE="http://www.libpng.org/" |
39 |
SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz |
40 |
apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )" |
41 |
-S=${WORKDIR}/${MY_P} |
42 |
+S="${WORKDIR}/${MY_P}" |
43 |
|
44 |
LICENSE="libpng" |
45 |
SLOT="1.5" |
46 |
@@ -21,13 +21,13 @@ IUSE="apng neon" |
47 |
|
48 |
RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
49 |
!=media-libs/libpng-1.5*" |
50 |
-DEPEND="${RDEPEND} |
51 |
- app-arch/xz-utils" |
52 |
+DEPEND="${RDEPEND}" |
53 |
+BDEPEND="app-arch/xz-utils" |
54 |
|
55 |
DOCS="" |
56 |
|
57 |
pkg_setup() { |
58 |
- local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15 |
59 |
+ local _preserved_lib="${EROOT}/usr/$(get_libdir)/libpng15.so.15" |
60 |
[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}" |
61 |
} |
62 |
|
63 |
@@ -36,8 +36,8 @@ src_prepare() { |
64 |
if use apng; then |
65 |
# fix windows path in patch file. Please check for each release if this can be removed again. |
66 |
sed 's@scripts\\symbols.def@scripts/symbols.def@' \ |
67 |
- -i "${WORKDIR}"/${PN}-*-apng.patch || die |
68 |
- eapply "${WORKDIR}"/${PN}-*-apng.patch |
69 |
+ -i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die |
70 |
+ eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch |
71 |
# Don't execute symbols check with apng patch wrt #378111 |
72 |
sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die |
73 |
fi |
74 |
@@ -45,10 +45,11 @@ src_prepare() { |
75 |
} |
76 |
|
77 |
multilib_src_configure() { |
78 |
- ECONF_SOURCE="${S}" \ |
79 |
- econf \ |
80 |
- --disable-static \ |
81 |
- --enable-arm-neon=$(usex neon) |
82 |
+ local myeconfargs=( |
83 |
+ --disable-static |
84 |
+ --enable-arm-neon="$(usex neon)" |
85 |
+ ) |
86 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
87 |
} |
88 |
|
89 |
multilib_src_compile() { |