* [ports] updated zlib, libpng, libjpeg
@ 2020-08-19 21:17 Jens Staal
0 siblings, 0 replies; 2+ messages in thread
From: Jens Staal @ 2020-08-19 21:17 UTC (permalink / raw)
To: 9front
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
I aim to port libwebp later which is another image format supported by
netsurf. I have not seen anything about netsurf being able to use libvpx for
webm-based video but if that works it would be cool.
libwebp also depends on libtiff and giflib.
[-- Attachment #2: ports_libjpeg.patch --]
[-- Type: text/x-patch, Size: 1091 bytes --]
# HG changeset patch
# User glenda@Krypton
# Date 1597861643 -7200
# Node ID b7df70abce467aca94fa4b2dc8dffc1b0dd317c8
# Parent ac0e917d7a8208f24b097a3b8212a9f911360fab
Updated libjpeg to 9d
diff -r ac0e917d7a82 -r b7df70abce46 ape-libs/libjpeg/manifest
--- a/ape-libs/libjpeg/manifest Wed Aug 19 20:08:59 2020 +0200
+++ b/ape-libs/libjpeg/manifest Wed Aug 19 20:27:23 2020 +0200
@@ -1,1 +1,1 @@
-3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz
+99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz
diff -r ac0e917d7a82 -r b7df70abce46 ape-libs/libjpeg/mkfile
--- a/ape-libs/libjpeg/mkfile Wed Aug 19 20:08:59 2020 +0200
+++ b/ape-libs/libjpeg/mkfile Wed Aug 19 20:27:23 2020 +0200
@@ -2,10 +2,10 @@
OWNER='Jens Staal <staal1978@gmail.com>'
DESCRIPTION='JPEG library for APE'
-VERSION=9a
+VERSION=9d
-WEBSOURCE=http://ijg.org/files/jpegsrc.v9a.tar.gz
-BUILDPATH=work/jpeg-9a
+WEBSOURCE=http://ijg.org/files/jpegsrc.v9d.tar.gz
+BUILDPATH=work/jpeg-9d
BUILDCOMMAND=mk
INSTALLCOMMAND=mk install
CLEANCOMMAND=mk clean
[-- Attachment #3: ports_libpng.patch --]
[-- Type: text/x-patch, Size: 10044 bytes --]
# 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
[-- Attachment #4: ports_zlib.patch --]
[-- Type: text/x-patch, Size: 6726 bytes --]
# HG changeset patch
# User glenda@Krypton
# Date 1597803891 -7200
# Node ID 2e535df2a0c864a82698b75b5ab8796707e6f471
# Parent e85cc978b82e12481a62cdb7135970cf77aeb6e9
Updated zlib port to 1.2.11
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/files/zconf.h
--- a/ape-libs/zlib/files/zconf.h Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/files/zconf.h Wed Aug 19 04:24:51 2020 +0200
@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -19,7 +19,7 @@
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
-/* all linked symbols */
+/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
@@ -31,6 +31,7 @@
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
+# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
@@ -39,10 +40,14 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
+# define deflateGetDictionary z_deflateGetDictionary
+# define deflateInit z_deflateInit
+# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
@@ -69,6 +74,8 @@
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
+# define gzfread z_gzfread
+# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
@@ -80,7 +87,6 @@
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
-# define gzvprintf z_gzvprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
@@ -91,32 +97,39 @@
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
+# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
+# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
+# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
+# define inflateInit z_inflateInit
+# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
+# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
-# define inflateGetDictionary z_inflateGetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
+# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
+# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
@@ -226,9 +239,19 @@
# define z_const
#endif
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
+#ifdef Z_SOLO
+ typedef unsigned long z_size_t;
+#else
+# define z_longlong long long
+# if defined(NO_SIZE_T)
+ typedef unsigned NO_SIZE_T z_size_t;
+# elif defined(STDC)
+# include <stddef.h>
+ typedef size_t z_size_t;
+# else
+ typedef unsigned long z_size_t;
+# endif
+# undef z_longlong
#endif
/* Maximum value for memLevel in deflateInit2 */
@@ -258,7 +281,7 @@
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
@@ -410,11 +433,11 @@
typedef unsigned long z_crc_t;
#endif
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H
#endif
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/manifest
--- a/ape-libs/zlib/manifest Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/manifest Wed Aug 19 04:24:51 2020 +0200
@@ -1,1 +1,1 @@
-ecc93190eaaa5b8ddffd4237f668f8465b0f53f2b11713aa794ef03cd0a36620 zlib-1.2.7.tar.gz
+c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 zlib-1.2.11.tar.gz
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/mkfile
--- a/ape-libs/zlib/mkfile Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/mkfile Wed Aug 19 04:24:51 2020 +0200
@@ -2,9 +2,9 @@
OWNER='Jens Staal <staal1978@gmail.com>'
DESCRIPTION='zlib compression library for APE'
-VERSION=1.2.7
+VERSION=1.2.11
-WEBSOURCE=https://ftp.osuosl.org/pub/libpng/src/archive/gz/zlib/zlib-$VERSION.tar.gz
+WEBSOURCE=https://zlib.net/zlib-$VERSION.tar.gz
BUILDPATH=work/zlib-$VERSION
BUILDCOMMAND=mk
INSTALLCOMMAND=mk install
^ permalink raw reply [flat|nested] 2+ messages in thread
* [ports] updated zlib, libpng, libjpeg
@ 2020-08-20 12:26 Jens Staal
0 siblings, 0 replies; 2+ messages in thread
From: Jens Staal @ 2020-08-20 12:26 UTC (permalink / raw)
To: 9front
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
It seems like my first message failed to be sent to the list so I hope this one
works.
----- Forwarded message from Jens Staal <staal1978@gmail.com> -----
Date: Wed, 19 Aug 2020 23:17:24 +0200
From: Jens Staal <staal1978@gmail.com>
To: 9front@9front.org
Subject: [ports] updated zlib, libpng, libjpeg
I aim to port libwebp later which is another image format supported by
netsurf. I have not seen anything about netsurf being able to use libvpx for
webm-based video but if that works it would be cool.
libwebp also depends on libtiff and giflib.
----- End forwarded message -----
[-- Attachment #2: ports_libjpeg.patch --]
[-- Type: text/plain, Size: 1091 bytes --]
# HG changeset patch
# User glenda@Krypton
# Date 1597861643 -7200
# Node ID b7df70abce467aca94fa4b2dc8dffc1b0dd317c8
# Parent ac0e917d7a8208f24b097a3b8212a9f911360fab
Updated libjpeg to 9d
diff -r ac0e917d7a82 -r b7df70abce46 ape-libs/libjpeg/manifest
--- a/ape-libs/libjpeg/manifest Wed Aug 19 20:08:59 2020 +0200
+++ b/ape-libs/libjpeg/manifest Wed Aug 19 20:27:23 2020 +0200
@@ -1,1 +1,1 @@
-3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz
+99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz
diff -r ac0e917d7a82 -r b7df70abce46 ape-libs/libjpeg/mkfile
--- a/ape-libs/libjpeg/mkfile Wed Aug 19 20:08:59 2020 +0200
+++ b/ape-libs/libjpeg/mkfile Wed Aug 19 20:27:23 2020 +0200
@@ -2,10 +2,10 @@
OWNER='Jens Staal <staal1978@gmail.com>'
DESCRIPTION='JPEG library for APE'
-VERSION=9a
+VERSION=9d
-WEBSOURCE=http://ijg.org/files/jpegsrc.v9a.tar.gz
-BUILDPATH=work/jpeg-9a
+WEBSOURCE=http://ijg.org/files/jpegsrc.v9d.tar.gz
+BUILDPATH=work/jpeg-9d
BUILDCOMMAND=mk
INSTALLCOMMAND=mk install
CLEANCOMMAND=mk clean
[-- Attachment #3: ports_libpng.patch --]
[-- Type: text/plain, Size: 10044 bytes --]
# 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
[-- Attachment #4: ports_zlib.patch --]
[-- Type: text/plain, Size: 6726 bytes --]
# HG changeset patch
# User glenda@Krypton
# Date 1597803891 -7200
# Node ID 2e535df2a0c864a82698b75b5ab8796707e6f471
# Parent e85cc978b82e12481a62cdb7135970cf77aeb6e9
Updated zlib port to 1.2.11
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/files/zconf.h
--- a/ape-libs/zlib/files/zconf.h Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/files/zconf.h Wed Aug 19 04:24:51 2020 +0200
@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -19,7 +19,7 @@
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
-/* all linked symbols */
+/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
@@ -31,6 +31,7 @@
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
+# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
@@ -39,10 +40,14 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
+# define deflateGetDictionary z_deflateGetDictionary
+# define deflateInit z_deflateInit
+# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
@@ -69,6 +74,8 @@
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
+# define gzfread z_gzfread
+# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
@@ -80,7 +87,6 @@
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
-# define gzvprintf z_gzvprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
@@ -91,32 +97,39 @@
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
+# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
+# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
+# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
+# define inflateInit z_inflateInit
+# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
+# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
-# define inflateGetDictionary z_inflateGetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
+# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
+# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
@@ -226,9 +239,19 @@
# define z_const
#endif
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
+#ifdef Z_SOLO
+ typedef unsigned long z_size_t;
+#else
+# define z_longlong long long
+# if defined(NO_SIZE_T)
+ typedef unsigned NO_SIZE_T z_size_t;
+# elif defined(STDC)
+# include <stddef.h>
+ typedef size_t z_size_t;
+# else
+ typedef unsigned long z_size_t;
+# endif
+# undef z_longlong
#endif
/* Maximum value for memLevel in deflateInit2 */
@@ -258,7 +281,7 @@
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
@@ -410,11 +433,11 @@
typedef unsigned long z_crc_t;
#endif
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H
#endif
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/manifest
--- a/ape-libs/zlib/manifest Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/manifest Wed Aug 19 04:24:51 2020 +0200
@@ -1,1 +1,1 @@
-ecc93190eaaa5b8ddffd4237f668f8465b0f53f2b11713aa794ef03cd0a36620 zlib-1.2.7.tar.gz
+c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 zlib-1.2.11.tar.gz
diff -r e85cc978b82e -r 2e535df2a0c8 ape-libs/zlib/mkfile
--- a/ape-libs/zlib/mkfile Thu Aug 06 15:56:41 2020 +0200
+++ b/ape-libs/zlib/mkfile Wed Aug 19 04:24:51 2020 +0200
@@ -2,9 +2,9 @@
OWNER='Jens Staal <staal1978@gmail.com>'
DESCRIPTION='zlib compression library for APE'
-VERSION=1.2.7
+VERSION=1.2.11
-WEBSOURCE=https://ftp.osuosl.org/pub/libpng/src/archive/gz/zlib/zlib-$VERSION.tar.gz
+WEBSOURCE=https://zlib.net/zlib-$VERSION.tar.gz
BUILDPATH=work/zlib-$VERSION
BUILDCOMMAND=mk
INSTALLCOMMAND=mk install
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-20 12:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 21:17 [ports] updated zlib, libpng, libjpeg Jens Staal
2020-08-20 12:26 Jens Staal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).