[pkgsrc/trunk]: pkgsrc/graphics/png png: don't typedef things when included b...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0834eb4cda08
branches:  trunk
changeset: 364817:0834eb4cda08
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Jul 05 04:59:16 2017 +0000

description:
png: don't typedef things when included by assembler code.
the current change is somewhat overkill and excludes some extra function
declarations, but there's only one assembler file for which it applies and
it was tested to build.

Fixes compilation on ARM reported by John Klos in PR pkg/52367

diffstat:

 graphics/png/distinfo                |   3 ++-
 graphics/png/patches/patch-pngpriv.h |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r caa5103dfea1 -r 0834eb4cda08 graphics/png/distinfo
--- a/graphics/png/distinfo     Tue Jul 04 22:42:06 2017 +0000
+++ b/graphics/png/distinfo     Wed Jul 05 04:59:16 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.135 2017/07/03 11:07:00 wiz Exp $
+$NetBSD: distinfo,v 1.136 2017/07/05 04:59:16 maya Exp $
 
 SHA1 (libpng-1.6.30.tar.xz) = b6f8ac4d83116a87d8e10e15ec360dab8a898f5c
 RMD160 (libpng-1.6.30.tar.xz) = 581e0d22c4ec839d05d895646dfeb45f214f6722
 SHA512 (libpng-1.6.30.tar.xz) = 8c58f0f8523d7c7e8e641134c9a0e7fb6b60cddd6b4689afaafde0c99cff74652c6fb800a45149910aa2d8f06695ba4774f6a4d64810f2419a714d4188d72f82
 Size (libpng-1.6.30.tar.xz) = 988608 bytes
+SHA1 (patch-pngpriv.h) = 3da29edb5d89ab26b9787a71b87c3fd8f451ea39
diff -r caa5103dfea1 -r 0834eb4cda08 graphics/png/patches/patch-pngpriv.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/png/patches/patch-pngpriv.h      Wed Jul 05 04:59:16 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-pngpriv.h,v 1.1 2017/07/05 04:59:16 maya Exp $
+
+Don't typedef types when included by assembler files
+
+--- pngpriv.h.orig     2017-06-28 18:46:03.000000000 +0000
++++ pngpriv.h
+@@ -464,7 +464,7 @@
+    static_cast<type>(static_cast<void*>(value))
+ #  define png_aligncastconst(type, value) \
+    static_cast<type>(static_cast<const void*>(value))
+-#else
++#elif !defined(__ASSEMBLER__)
+ #  define png_voidcast(type, value) (value)
+ #  ifdef _WIN64
+ #     ifdef __GNUC__