* [ports] updated zlib, libpng, libjpeg
@ 2020-08-20 12:26 Jens Staal
2020-08-20 13:16 ` [9front] " Stanley Lieber
0 siblings, 1 reply; 11+ 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] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 12:26 [ports] updated zlib, libpng, libjpeg Jens Staal
@ 2020-08-20 13:16 ` Stanley Lieber
2020-08-20 13:30 ` Lucas Francesco
0 siblings, 1 reply; 11+ messages in thread
From: Stanley Lieber @ 2020-08-20 13:16 UTC (permalink / raw)
To: 9front
On August 20, 2020 8:26:02 AM EDT, Jens Staal <staal1978@gmail.com> wrote:
>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 -----
i received both.
sl
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 13:16 ` [9front] " Stanley Lieber
@ 2020-08-20 13:30 ` Lucas Francesco
2020-08-20 15:57 ` Stanley Lieber
2020-08-20 16:49 ` ori
0 siblings, 2 replies; 11+ messages in thread
From: Lucas Francesco @ 2020-08-20 13:30 UTC (permalink / raw)
To: 9front
strange, I didn't receive both of them, but did receive sl's reply to it.
Em qui., 20 de ago. de 2020 às 10:18, Stanley Lieber
<sl@stanleylieber.com> escreveu:
>
> On August 20, 2020 8:26:02 AM EDT, Jens Staal <staal1978@gmail.com> wrote:
> >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 -----
>
> i received both.
>
> sl
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 13:30 ` Lucas Francesco
@ 2020-08-20 15:57 ` Stanley Lieber
2020-08-20 16:49 ` ori
1 sibling, 0 replies; 11+ messages in thread
From: Stanley Lieber @ 2020-08-20 15:57 UTC (permalink / raw)
To: 9front
On August 20, 2020 9:30:06 AM EDT, Lucas Francesco <lucas.francesco93@gmail.com> wrote:
>strange, I didn't receive both of them, but did receive sl's reply to
>it.
>
>Em qui., 20 de ago. de 2020 às 10:18, Stanley Lieber
><sl@stanleylieber.com> escreveu:
>>
>> On August 20, 2020 8:26:02 AM EDT, Jens Staal <staal1978@gmail.com>
>wrote:
>> >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 -----
>>
>> i received both.
>>
>> sl
okay, i'll look into this.
sl
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 13:30 ` Lucas Francesco
2020-08-20 15:57 ` Stanley Lieber
@ 2020-08-20 16:49 ` ori
2020-08-20 16:59 ` telephil9
1 sibling, 1 reply; 11+ messages in thread
From: ori @ 2020-08-20 16:49 UTC (permalink / raw)
To: lucas.francesco93, 9front
> strange, I didn't receive both of them, but did receive sl's reply to it.
>
Sanity check: is it possibly in your spam folder?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 16:49 ` ori
@ 2020-08-20 16:59 ` telephil9
2020-08-20 17:09 ` Stanley Lieber
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: telephil9 @ 2020-08-20 16:59 UTC (permalink / raw)
To: 9front
>> strange, I didn't receive both of them, but did receive sl's reply to it.
>>
>
> Sanity check: is it possibly in your spam folder?
Did not receive it either and checking gmail interface I don't have anything in spam.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 16:59 ` telephil9
@ 2020-08-20 17:09 ` Stanley Lieber
2020-08-21 0:14 ` sl
[not found] ` <6E6307A5E61D07684A0DE825FA50956F@ewsd.inri.net>
2 siblings, 0 replies; 11+ messages in thread
From: Stanley Lieber @ 2020-08-20 17:09 UTC (permalink / raw)
To: 9front
On August 20, 2020 12:59:52 PM EDT, telephil9@gmail.com wrote:
>>> strange, I didn't receive both of them, but did receive sl's reply
>to it.
>>>
>>
>> Sanity check: is it possibly in your spam folder?
>
>Did not receive it either and checking gmail interface I don't have
>anything in spam.
the list sends them out one at a time, so if something interrupted the list processing, something like this could happen. i'm not aware of this happening, bit i won't be able to check logs until later tonight.
sl
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-20 16:59 ` telephil9
2020-08-20 17:09 ` Stanley Lieber
@ 2020-08-21 0:14 ` sl
[not found] ` <6E6307A5E61D07684A0DE825FA50956F@ewsd.inri.net>
2 siblings, 0 replies; 11+ messages in thread
From: sl @ 2020-08-21 0:14 UTC (permalink / raw)
To: 9front
gmailllllllllllllllll:
ewsd; cd /sys/log
ewsd; grep francesco93 *fail
ewsd Aug 19 17:36:51 delivery demetrius.iatrakis,rweichler,alex.mclin,lucas.francesco93,telephil9,ktullavik,narghile,tswoskowiak,albandecrevoisier,weitzeug,covertusername967,daghan.tinaztepe,skhds1,huffman1337,juan.cuzmar.s,luke.ovalle at net!gmail.com (gmail-smtp-in.l.google.com:74.125.20.26) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd Aug 20 08:46:45 delivery soy.jmi2k,demetrius.iatrakis,rweichler,alex.mclin,lucas.francesco93,telephil9,ktullavik,narghile,tswoskowiak,albandecrevoisier,weitzeug,covertusername967,skhds1,huffman1337,juan.cuzmar.s,luke.ovalle at net!gmail.com (gmail-smtp-in.l.google.com:74.125.20.26) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd; grep telephil9 *fail
ewsd Jan 10 23:39:25 delivery telephil9,ktullavik,narghile,tswoskowiak at net!gmail.com (gmail-smtp-in.l.google.com:74.125.142.26) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd Jan 11 16:47:18 delivery telephil9,ktullavik,narghile,tswoskowiak at net!gmail.com (gmail-smtp-in.l.google.com:74.125.142.27) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd Apr 12 00:27:25 delivery telephil9,ktullavik,narghile,tswoskowiak,albandecrevoisier,weitzeug,covertusername967,r.lacherade,daghan.tinaztepe,skhds1,huffman1337,juan.cuzmar.s,luke.ovalle,nin.collin,philippe.mechai,demerzal at net!gmail.com (gmail-smtp-in.l.google.com:74.125.20.27) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd Aug 19 17:36:51 delivery demetrius.iatrakis,rweichler,alex.mclin,lucas.francesco93,telephil9,ktullavik,narghile,tswoskowiak,albandecrevoisier,weitzeug,covertusername967,daghan.tinaztepe,skhds1,huffman1337,juan.cuzmar.s,luke.ovalle at net!gmail.com (gmail-smtp-in.l.google.com:74.125.20.26) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd Aug 20 08:46:45 delivery soy.jmi2k,demetrius.iatrakis,rweichler,alex.mclin,lucas.francesco93,telephil9,ktullavik,narghile,tswoskowiak,albandecrevoisier,weitzeug,covertusername967,skhds1,huffman1337,juan.cuzmar.s,luke.ovalle at net!gmail.com (gmail-smtp-in.l.google.com:74.125.20.26) rcptto failed: 550-5.7.1 [107.191.116.128 12] Our system has detected that this message is
ewsd;
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
[not found] ` <6E6307A5E61D07684A0DE825FA50956F@ewsd.inri.net>
@ 2020-08-21 0:32 ` Kurt H Maier
2020-08-21 0:55 ` sl
0 siblings, 1 reply; 11+ messages in thread
From: Kurt H Maier @ 2020-08-21 0:32 UTC (permalink / raw)
To: 9front
ewsd is on two spam blacklists. SORBS requires a login and manual
complaining to get delisted. Backscatter will happily take money to get
delisted, in Swiss Francs.
khm
http://www.sorbs.net/lookup.shtml?107.191.116.128
107.191.116.128 - 7 entries [00:03:28 20 Aug 2016 GMT-04].
(no further details given)
http://www.backscatterer.org/index.php
Testresult for 107.191.116.128:
This IP IS CURRENTLY LISTED in our Database.
Please note that this listing does NOT mean you are a spammer, it means
your mailsystem is either poorly configured or it is using abusive
techniques.
This kind of abuse is known as BACKSCATTER (Misdirected Bounces or
Misdirected Autoresponders or Sender Callouts). Click the links above to
get clue how and why to stop that kind of abuse.
To track down what happened investigate your smtplogs near 20.08.2020
02:16 CEST +/-1 minute.
You will either find that your system tried to send misdirected bounces
or misdirected autoresponders to claimed but in reality faked senders,
or your system tried sender verify callouts against our members near
that time.
So you should look for outgoing emails that have a NULL SENDER or
POSTMASTER in MAIL FROM.
Reading your logs carefully it shouldn't be a big deal to figure out
what caused or renewed your listing.
History:
25.12.2018 15:29 CET listed
23.01.2019 21:27 CET expired
15.03.2019 03:00 CET listed
12.04.2019 04:26 CEST expired
20.04.2019 02:37 CEST listed
07.03.2020 02:26 CET expired
18.04.2020 01:03 CEST listed
A total of 148 Impacts were detected during this listing. Last was
20.08.2020 02:16 CEST +/- 1 minute.
Earliest date this IP can expire is 17.09.2020 02:16 CEST.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [9front] [ports] updated zlib, libpng, libjpeg
2020-08-21 0:32 ` Kurt H Maier
@ 2020-08-21 0:55 ` sl
0 siblings, 0 replies; 11+ messages in thread
From: sl @ 2020-08-21 0:55 UTC (permalink / raw)
To: 9front
walk with me:
sorbs:
NOTE: If you are using a mail server that is not RFC 2821/2822 compliant in that it rejects or discards emails with "NULL" addresses, you will NOT be able to complete the registration process.
backscatter:
So you should look for outgoing emails that have a NULL SENDER or POSTMASTER in MAIL FROM.
sorbs registration e-mail rejected as spam:
smtp.idsbangladesh.net.bd:117.103.80.91) rcptto failed: 554 5.7.1 Service unavailable; Client host [107.191.116.128] blocked using spam.dnsbl.sorbs.net; Spam Received See: http://www.sorbs.net/lookup.shtml?107.191.116.128
backscatter is happy to bypass 4-week penalty box:
You will be charged 89 CHF using the following payment service.
sl
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ports] updated zlib, libpng, libjpeg
@ 2020-08-19 21:17 Jens Staal
0 siblings, 0 replies; 11+ 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] 11+ messages in thread
end of thread, other threads:[~2020-08-21 0:55 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20 12:26 [ports] updated zlib, libpng, libjpeg Jens Staal
2020-08-20 13:16 ` [9front] " Stanley Lieber
2020-08-20 13:30 ` Lucas Francesco
2020-08-20 15:57 ` Stanley Lieber
2020-08-20 16:49 ` ori
2020-08-20 16:59 ` telephil9
2020-08-20 17:09 ` Stanley Lieber
2020-08-21 0:14 ` sl
[not found] ` <6E6307A5E61D07684A0DE825FA50956F@ewsd.inri.net>
2020-08-21 0:32 ` Kurt H Maier
2020-08-21 0:55 ` sl
-- strict thread matches above, loose matches on Subject: below --
2020-08-19 21:17 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).