pool/libpng16
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 511589 from graphics

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/511589
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpng16?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2017-07-30 09:25:32 +00:00 committed by Git OBS Bridge
commit 80e8487821
3 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch Normal file
View File

@ -0,0 +1,65 @@
From 3f67eb68e05ae87ec985f413b97b4cdd2922533d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 14 Jul 2017 17:53:43 +0200
Subject: [PATCH] [libpng16] Revised pngpriv.h to use PNG_VERSION_INFO_ONLY
instead of
PNG_ARM_NEON_IMPLEMENTATION == 2 to exclude some definitions that assembler
cannot recognize.
[SBruens] Cherry-picked from 54126d5c59653e744ee8af81ba61fd910ce4d295,
removed merge conflicts.
---
pngpriv.h | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/pngpriv.h b/pngpriv.h
index a062a8da1..f50de2b86 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -452,6 +452,21 @@
# define png_fixed_error(s1,s2) png_err(s1)
#endif
+/* Some fixed point APIs are still required even if not exported because
+ * they get used by the corresponding floating point APIs. This magic
+ * deals with this:
+ */
+#ifdef PNG_FIXED_POINT_SUPPORTED
+# define PNGFAPI PNGAPI
+#else
+# define PNGFAPI /* PRIVATE */
+#endif
+
+#ifndef PNG_VERSION_INFO_ONLY
+/* Other defines specific to compilers can go here. Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
/* C allows up-casts from (void*) to any pointer and (const void*) to any
* pointer to a const object. C++ regards this as a type error and requires an
* explicit, static, cast and provides the static_cast<> rune to ensure that
@@ -480,20 +495,6 @@
# define png_aligncastconst(type, value) ((const void*)(value))
#endif /* __cplusplus */
-/* Some fixed point APIs are still required even if not exported because
- * they get used by the corresponding floating point APIs. This magic
- * deals with this:
- */
-#ifdef PNG_FIXED_POINT_SUPPORTED
-# define PNGFAPI PNGAPI
-#else
-# define PNGFAPI /* PRIVATE */
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Other defines specific to compilers can go here. Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
#if defined(PNG_FLOATING_POINT_SUPPORTED) ||\
defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
/* png.c requires the following ANSI-C constants if the conversion of
--
2.13.2

18
libpng16.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Jul 19 15:51:28 UTC 2017 - stefan.bruens@rwth-aachen.de
- Drop png-version-info-only.patch, it has no effect after applying
0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
Both patches achieve the same, prefer the upstream version
-------------------------------------------------------------------
Fri Jul 14 15:57:51 UTC 2017 - stefan.bruens@rwth-aachen.de
- Add 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
Fix build on ARM
-------------------------------------------------------------------
Mon Jul 10 15:11:14 UTC 2017 - schwab@suse.de
- png-version-info-only.patch: fix missing PNG_VERSION_INFO_ONLY check
-------------------------------------------------------------------
Fri Jun 30 15:48:21 UTC 2017 - pgajdos@suse.com

3
libpng16.spec
View File

@ -35,6 +35,8 @@ Source1: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{versio
Source2: libpng16.keyring
Source3: rpm-macros.libpng-tools
Source4: baselibs.conf
# PATCH-FIX-UPSTREAM 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch stefan.bruens@rwth-aachen.de -- Cherry-pick upstream fix for ARM build, fixed in 1.6.31
Patch0: 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
#BuildRequires: gpg-offline
BuildRequires: libtool
BuildRequires: pkg-config
@ -109,6 +111,7 @@ PNG files.
%prep
%setup -n libpng-%{version}
%patch0 -p1
%build
# PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1