# HG changeset patch
# User glenda@Krypton
# Date 1597860539 -7200
# Node ID ac0e917d7a8208f24b097a3b8212a9f911360fab
# Parent  2e535df2a0c864a82698b75b5ab8796707e6f471
updated libpng to 1.6.37

diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/config.h
--- a/ape-libs/libpng/files/config.h	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/config.h	Wed Aug 19 20:08:59 2020 +0200
@@ -19,9 +19,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 /* #undef HAVE_MEMORY_H */
 
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
 /* Define to 1 if you have the `pow' function. */
 #define HAVE_POW 1
 
@@ -59,7 +56,7 @@
 #define PACKAGE_NAME "libpng"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libpng 1.6.17"
+#define PACKAGE_STRING "libpng 1.6.37"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libpng"
@@ -68,7 +65,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.17"
+#define PACKAGE_VERSION "1.6.37"
 
 /* Turn on ARM Neon optimizations at run-time */
 /* #undef PNG_ARM_NEON_API_SUPPORTED */
@@ -79,6 +76,27 @@
 /* Enable ARM Neon optimizations */
 /* #undef PNG_ARM_NEON_OPT */
 
+/* Enable Intel SSE optimizations */
+/* #undef PNG_INTEL_SSE_OPT */
+
+/* Turn on MIPS MSA optimizations at run-time */
+/* #undef PNG_MIPS_MSA_API_SUPPORTED */
+
+/* Check for MIPS MSA support at run-time */
+/* #undef PNG_MIPS_MSA_CHECK_SUPPORTED */
+
+/* Enable MIPS MSA optimizations */
+/* #undef PNG_MIPS_MSA_OPT */
+
+/* Turn on POWERPC VSX optimizations at run-time */
+/* #undef PNG_POWERPC_VSX_API_SUPPORTED */
+
+/* Check for POWERPC VSX support at run-time */
+/* #undef PNG_POWERPC_VSX_CHECK_SUPPORTED */
+
+/* Enable POWERPC VSX optimizations */
+/* #undef PNG_POWERPC_VSX_OPT */
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -86,7 +104,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "1.6.17"
+#define VERSION "1.6.37"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/contrib/pngminus/mkfile
--- a/ape-libs/libpng/files/contrib/pngminus/mkfile	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/contrib/pngminus/mkfile	Wed Aug 19 20:08:59 2020 +0200
@@ -1,14 +1,13 @@
 </$objtype/mkfile
 TARG=png2pnm pnm2png 
 BIN=/$objtype/bin
-HFILES=../../png.h ../../pngconf.h ../../pnglibconf.h 
 
 </sys/src/cmd/mkmany
 
 CC=pcc
 LD=pcc
-CFLAGS=-c -B -I../.. -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_BSD_EXTENSION -DHAVE_UNISTD_H \
+CFLAGS=-c -B -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_BSD_EXTENSION -DHAVE_UNISTD_H \
 	-DHAVE_STDARG_H 
 
-pnm2png.$O: 
-png2pnm.$O: 
+pnm2png.$O: /$objtype/lib/ape/libpng.a /$objtype/lib/ape/libz.a
+png2pnm.$O: /$objtype/lib/ape/libpng.a /$objtype/lib/ape/libz.a
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/libpng-config
--- a/ape-libs/libpng/files/libpng-config	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/libpng-config	Wed Aug 19 20:08:59 2020 +0200
@@ -11,13 +11,13 @@
 
 # Modeled after libxml-config.
 
-version="1.6.17"
-prefix="/$objtype"
+version="1.6.37"
+prefix="/usr/local"
 exec_prefix="${prefix}"
-libdir="${exec_prefix}/lib/ape"
-includedir="/sys/include/ape"
-libs="-lpng"
-all_libs="-lpng -lz "
+libdir="${exec_prefix}/lib"
+includedir="${prefix}/include/libpng16"
+libs="-lpng16"
+all_libs="-lpng16 -lz "
 I_opts="-I${includedir}"
 L_opts="-L${libdir}"
 R_opts=""
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/libpng.pc
--- a/ape-libs/libpng/files/libpng.pc	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/libpng.pc	Wed Aug 19 20:08:59 2020 +0200
@@ -1,11 +1,12 @@
-prefix=/$objtype
+prefix=/usr/local
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/ape
-includedir=/sys/include/ape
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/libpng16
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.6.17
-Libs: -L${libdir} -lpng
+Version: 1.6.37
+Requires: zlib
+Libs: -L${libdir} -lpng16
 Libs.private: -lz 
 Cflags: -I${includedir}
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/mkfile
--- a/ape-libs/libpng/files/mkfile	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/mkfile	Wed Aug 19 20:08:59 2020 +0200
@@ -1,8 +1,14 @@
 </$objtype/mkfile
 LIB=/$objtype/lib/ape/libpng.a
-OFILES=pngread.$O example.$O pngtrans.$O pngrutil.$O pngwtran.$O pngwio.$O pngerror.$O \
-	pngwrite.$O pngget.$O png.$O pngrio.$O pngwutil.$O pngmem.$O pngrtran.$O \
-	pngpread.$O pngset.$O 
+OFILES=png.$O pngerror.$O \
+	pngget.$O pngmem.$O pngpread.$O pngread.$O pngrio.$O \
+	pngrtran.$O pngrutil.$O pngset.$O pngtrans.$O pngwio.$O \
+	pngwrite.$O pngwtran.$O pngwutil.$O arm_init.$O \
+	filter_neon_intrinsics.$O palette_neon_intrinsics.$O \
+	mips_init.$O filter_msa_intrinsics.$O \
+	intel_init.$O filter_sse2_intrinsics.$O \
+	powerpc_init.$O filter_vsx_intrinsics.$O
+
 HFILES=pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngconf.h pnglibconf.h png.h \
 	pnglibconf.h 
 
@@ -10,7 +16,19 @@
 
 CC=pcc
 LD=pcc
-CFLAGS=-c -I. -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_BSD_EXTENSION -DHAVE_CONFIG_H -DPNGLIB_LIBNAME='PNG16_0'  -DPNGLIB_VERSION='1.6.17'  -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS 
+CFLAGS=-c -I. -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_BSD_EXTENSION -DHAVE_CONFIG_H -DPNGLIB_LIBNAME='PNG16_0'  -DPNGLIB_VERSION='1.6.37'  -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS 
+
+%.$O: arm/%.c
+	$CC $CFLAGS arm/$stem.c
+
+%.$O: mips/%.c
+	$CC $CFLAGS mips/$stem.c
+
+%.$O: intel/%.c
+	$CC $CFLAGS intel/$stem.c
+
+%.$O: powerpc/%.c
+	$CC $CFLAGS powerpc/$stem.c
 
 nuke:V:
 	mk clean
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/pngh.patch
--- a/ape-libs/libpng/files/pngh.patch	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/pngh.patch	Wed Aug 19 20:08:59 2020 +0200
@@ -1,12 +1,13 @@
 --- a/png.h.orig	Fri Jul 17 05:06:01 2015
 +++ b/png.h	Fri Jul 17 05:09:11 2015
-@@ -415,6 +415,10 @@
+@@ -415,6 +415,11 @@
  #ifndef PNG_H
  #define PNG_H
  
 +#pragma lib "/$M/lib/ape/libpng.a"
 +/* need to pull in libz.a too */
 +#include <zlib.h>
++#pragma lib "/$M/lib/ape/libz.a"
 +
  /* This is not the place to learn how to use libpng. The file libpng-manual.txt
   * describes how to use libpng, and the file example.c summarizes it
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/files/pnglibconf.h
--- a/ape-libs/libpng/files/pnglibconf.h	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/files/pnglibconf.h	Wed Aug 19 20:08:59 2020 +0200
@@ -2,7 +2,8 @@
 
 /* libpng version 1.6.17, March 26, 2015 */
 
-/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
+/* Copyright (c) 2018-2019 Cosmin Truta */
+/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -42,6 +43,8 @@
 #define PNG_IO_STATE_SUPPORTED
 #define PNG_MNG_FEATURES_SUPPORTED
 #define PNG_POINTER_INDEXING_SUPPORTED
+/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
+/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
 #define PNG_PROGRESSIVE_READ_SUPPORTED
 #define PNG_READ_16BIT_SUPPORTED
 #define PNG_READ_ALPHA_MODE_SUPPORTED
@@ -80,6 +83,7 @@
 #define PNG_READ_USER_TRANSFORM_SUPPORTED
 #define PNG_READ_bKGD_SUPPORTED
 #define PNG_READ_cHRM_SUPPORTED
+#define PNG_READ_eXIf_SUPPORTED
 #define PNG_READ_gAMA_SUPPORTED
 #define PNG_READ_hIST_SUPPORTED
 #define PNG_READ_iCCP_SUPPORTED
@@ -107,6 +111,7 @@
 #define PNG_SIMPLIFIED_READ_SUPPORTED
 #define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
 #define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
 #define PNG_SIMPLIFIED_WRITE_SUPPORTED
 #define PNG_STDIO_SUPPORTED
 #define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
@@ -148,6 +153,7 @@
 #define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
 #define PNG_WRITE_bKGD_SUPPORTED
 #define PNG_WRITE_cHRM_SUPPORTED
+#define PNG_WRITE_eXIf_SUPPORTED
 #define PNG_WRITE_gAMA_SUPPORTED
 #define PNG_WRITE_hIST_SUPPORTED
 #define PNG_WRITE_iCCP_SUPPORTED
@@ -165,6 +171,7 @@
 #define PNG_WRITE_zTXt_SUPPORTED
 #define PNG_bKGD_SUPPORTED
 #define PNG_cHRM_SUPPORTED
+#define PNG_eXIf_SUPPORTED
 #define PNG_gAMA_SUPPORTED
 #define PNG_hIST_SUPPORTED
 #define PNG_iCCP_SUPPORTED
@@ -183,11 +190,14 @@
 /* end of options */
 /* settings */
 #define PNG_API_RULE 0
-#define PNG_COST_SHIFT 3
 #define PNG_DEFAULT_READ_MACROS 1
 #define PNG_GAMMA_THRESHOLD_FIXED 5000
 #define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
 #define PNG_INFLATE_BUF_SIZE 1024
+#define PNG_LINKAGE_API extern
+#define PNG_LINKAGE_CALLBACK extern
+#define PNG_LINKAGE_DATA extern
+#define PNG_LINKAGE_FUNCTION extern
 #define PNG_MAX_GAMMA_8 11
 #define PNG_QUANTIZE_BLUE_BITS 5
 #define PNG_QUANTIZE_GREEN_BITS 5
@@ -198,9 +208,8 @@
 #define PNG_USER_CHUNK_MALLOC_MAX 8000000
 #define PNG_USER_HEIGHT_MAX 1000000
 #define PNG_USER_WIDTH_MAX 1000000
-#define PNG_WEIGHT_SHIFT 8
 #define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0x1280
+#define PNG_ZLIB_VERNUM 0x12b0
 #define PNG_Z_DEFAULT_COMPRESSION (-1)
 #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
 #define PNG_Z_DEFAULT_STRATEGY 1
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/manifest
--- a/ape-libs/libpng/manifest	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/manifest	Wed Aug 19 20:08:59 2020 +0200
@@ -1,1 +1,1 @@
-a18233c99e1dc59a256180e6871d9305a42e91b3f98799b3ceb98e87e9ec5e31	libpng-1.6.17.tar.gz
+daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4	libpng-1.6.37.tar.gz
diff -r 2e535df2a0c8 -r ac0e917d7a82 ape-libs/libpng/mkfile
--- a/ape-libs/libpng/mkfile	Wed Aug 19 04:24:51 2020 +0200
+++ b/ape-libs/libpng/mkfile	Wed Aug 19 20:08:59 2020 +0200
@@ -2,7 +2,7 @@
 
 OWNER='Jens Staal <staal1978@gmail.com>'
 DESCRIPTION='png library for APE'
-VERSION=1.6.17
+VERSION=1.6.37
 DEPS=ape-libs/zlib
 
 WEBSOURCE=https://download.sourceforge.net/libpng/libpng-$VERSION.tar.gz