From dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4 Mon Sep 17 00:00:00 2001 From: Chris Packham 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 --- packages/zlib/1.2.11/0002-mingw-static-only.patch | 28 ----------------------- 1 file changed, 28 deletions(-) delete mode 100644 packages/zlib/1.2.11/0002-mingw-static-only.patch (limited to 'packages/zlib/1.2.11/0002-mingw-static-only.patch') diff --git a/packages/zlib/1.2.11/0002-mingw-static-only.patch b/packages/zlib/1.2.11/0002-mingw-static-only.patch deleted file mode 100644 index 6d5c89c5..00000000 --- a/packages/zlib/1.2.11/0002-mingw-static-only.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- - win32/Makefile.gcc | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -71,7 +71,11 @@ - gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o - OBJA = - --all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe -+all: $(STATICLIB) example.exe minigzip.exe -+ -+ifeq ($(SHARED_MODE),1) -+all: $(SHAREDLIB) $(IMPLIB) example_d.exe minigzip_d.exe -+endif - - test: example.exe minigzip.exe - ./example -@@ -125,7 +129,7 @@ - .PHONY: install uninstall clean - - install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) -- @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \ -+ @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \ - echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \ - exit 1; \ - fi -- cgit v1.2.3