From f7e2ccabcdf30d6937df1ac968545184ef425336 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 5 Feb 2021 15:37:44 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libpng.git#415e5c5ef5eafd320d7302fd5b0d902debf82aca --- libpng.spec | 12 +++++++++++- pngtest-aarch64.png | Bin 0 -> 8715 bytes 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pngtest-aarch64.png diff --git a/libpng.spec b/libpng.spec index 4e7b579..feb16ce 100644 --- a/libpng.spec +++ b/libpng.spec @@ -2,12 +2,13 @@ Summary: A library of functions for manipulating PNG image format files Name: libpng Epoch: 2 Version: 1.6.37 -Release: 7%{?dist} +Release: 8%{?dist} License: zlib URL: http://www.libpng.org/pub/png/ Source0: https://github.com/glennrp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: pngusr.dfa +Source2: pngtest-aarch64.png Patch0: libpng-multilib.patch Patch1: libpng-fix-arm-neon.patch @@ -60,6 +61,12 @@ The libpng-tools package contains tools used by the authors of libpng. # Provide pngusr.dfa for build. cp -p %{SOURCE1} . +%ifarch aarch64 +# zlib on aarch64 produces output different from other arches: +# https://bugzilla.redhat.com/show_bug.cgi?id=1665221 +cp -p %{SOURCE2} pngtest.png +%endif + %patch0 -p1 %patch1 -p1 -b .arm @@ -103,6 +110,9 @@ make check %{_bindir}/pngfix %changelog +* Fri Feb 05 2021 Nikola Forró - 2:1.6.37-8 +- Use proper pngtest.png reference image on aarch64 + * Tue Jan 26 2021 Fedora Release Engineering - 2:1.6.37-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/pngtest-aarch64.png b/pngtest-aarch64.png new file mode 100644 index 0000000000000000000000000000000000000000..a5e52b3fe54b34b95ff69890e79bfe2f2fdfd178 GIT binary patch literal 8715 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