[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng/, profiles/base/

[Sam James]

commit:     3f81fdd413ee8aabc746ae0f61fee6dcdb44fe9e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 14:05:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 14:05:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f81fdd4

media-libs/libpng: add 1.6.38

apng masked as patch not rebased upstream.

Bug: https://bugs.gentoo.org/824018
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libpng/Manifest             |  1 +
 media-libs/libpng/libpng-1.6.38.ebuild | 50 ++++++++++++++++++++++++++++++++++
 media-libs/libpng/metadata.xml         |  2 ++
 profiles/base/package.use.mask         |  4 +++
 4 files changed, 57 insertions(+)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index cff7dcacd338..8709d00fea9f 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,2 +1,3 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
+DIST libpng-1.6.38.tar.xz 1023168 BLAKE2B b855f85c69336c21891fc9c074e5c03bb074f2262bf99ed6915573664379efcf427834ea049391ffec21e83c89a574c2e888989792fcae4598761718772d29c8 SHA512 4e450636062fcc75ecc65715e0b23ddc1097b73b4c95ffd31bef627144c576f58660b2130105f5f5781212cf54f00c7b6dd3facefd7e9de70c76b981d499f81e

diff --git a/media-libs/libpng/libpng-1.6.38.ebuild b/media-libs/libpng/libpng-1.6.38.ebuild
new file mode 100644
index 000000000000..26f8a8b0427d
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.38.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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/${PN}-1.6.37-apng.patch.gz )"
+
+LICENSE="libpng2"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+src_prepare() {
+	default
+
+	if use apng; then
+		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
+
+		# Don't execute symbols check with apng patch, bug #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_arm_neon arm-neon check)
+		$(use_enable cpu_flags_x86_sse intel-sse)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	find "${ED}" \( -type f -o -type l \) -name '*.la' -delete || die
+}

diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 10e62abda656..9fc5e446743d 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -15,6 +15,8 @@
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
 		<remote-id type="github">glennrp/libpng</remote-id>
+		<remote-id type="github">pnggroup/libpng-EXPERIMENTAL</remote-id>
+		<remote-id type="github">glennrp/libpng-releases</remote-id>
 		<remote-id type="sourceforge">libpng</remote-id>
 	</upstream>
 	<slots>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 25a7ce9973b3..4aac007f6130 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@g.o> (2022-09-15)
+# Patch not rebased and supporting it is not a priority: bug #824018.
+>=media-libs/libpng-1.6.38 apng
+
 # Matt Jolly <Matt.Jolly@××××××××.ninja (2022-09-09)
 # app-antivirus/clamav JIT support requires LLVM <=13
 # ebuild support is there but currently failing to link