From dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Thu, 21 Apr 2022 15:30:55 +1200
Subject: zlib: Update to zlib-1.2.12

Bring in the following changes

- Fix a deflate bug when using the Z_FIXED strategy that can result in
  out-of-bound accesses.
- Fix a deflate bug when the window is full in deflate_stored().
- Speed up CRC-32 computations by a factor of 1.5 to 3.
- Use the hardware CRC-32 instruction on ARMv8 processors.
- Speed up crc32_combine() with powers of x tables.
- Add crc32_combine_gen() and crc32_combine_op() for fast combines.

Drop two patches that have been applied upstream and regenerate the
remaining two.

Fixes #1708

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 .../1.2.11/0003-crossbuild-macos-libtool.patch     | 36 ----------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch

(limited to 'packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch')

diff --git a/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch b/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch
deleted file mode 100644
index 3220a544..00000000
--- a/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 1f6bc557ec5c90eced96ae81ff1d443ee5770993
-Author: Heiko Lewin <heiko.lewin@worldiety.de>
-Date:   Fri May 22 03:32:33 2020 +0200
-
-    configure: use LIBTOOL variable for Darwin builds
-
----
- configure |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -66,6 +66,12 @@
- else
-     NM=${NM-"nm"}
- fi
-+if "${CROSS_PREFIX}libtool" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-+    LIBTOOL=${LIBTOOL-"${CROSS_PREFIX}libtool"}
-+    test -n "${CROSS_PREFIX}" && echo Using ${LIBTOOL} | tee -a configure.log
-+else
-+    LIBTOOL=${LIBTOOL-"libtool"}
-+fi
- 
- # set defaults before processing command line options
- LDCONFIG=${LDCONFIG-"ldconfig"}
-@@ -241,8 +247,8 @@
-              SHAREDLIBV=libz.$VER$shared_ext
-              SHAREDLIBM=libz.$VER1$shared_ext
-              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
--             if libtool -V 2>&1 | grep Apple > /dev/null; then
--                 AR="libtool"
-+             if ${LIBTOOL} -V 2>&1 | grep Apple > /dev/null; then
-+                 AR="${LIBTOOL}"
-              else
-                  AR="/usr/bin/libtool"
-              fi
-- 
cgit v1.2.3