From e3c4581050af622ee037de5a1486797667aa4ae4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 1 Dec 2019 17:45:27 +0100
Subject: [PATCH] libzopfli: Update from 1.0.2 to 1.0.3

---
 packages/libzopfli/Makefile.patch | 44 -------------------------------
 packages/libzopfli/build.sh       |  5 ++--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 packages/libzopfli/Makefile.patch

diff --git a/packages/libzopfli/Makefile.patch b/packages/libzopfli/Makefile.patch
deleted file mode 100644
index 620aa6497..000000000
--- a/packages/libzopfli/Makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u -r ../zopfli-zopfli-1.0.2/Makefile ./Makefile
---- ../zopfli-zopfli-1.0.2/Makefile	2018-05-18 10:16:14.000000000 +0000
-+++ ./Makefile	2018-05-18 21:27:42.159933403 +0000
-@@ -1,8 +1,8 @@
--CC = gcc
--CXX = g++
-+CC ?= gcc
-+CXX ?= g++
- 
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS ?= -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
-+CXXFLAGS ?= -W -Wall -Wextra -ansi -pedantic -O2
- 
- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
-                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
-@@ -20,22 +20,22 @@
- 
- # Zopfli binary
- zopfli:
--	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
-+	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopfli -lm
- 
- # Zopfli shared library
--libzopfli:
-+install:
- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
-+	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) -shared -o @TERMUX_PREFIX@/lib/libzopfli.so -lm
- 
- # ZopfliPNG binary
- zopflipng:
- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopflipng -lm
- 
- # ZopfliPNG shared library
- libzopflipng:
- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2 -lm
- 
- # Remove all libraries and binaries
- clean:
diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh
index d386fd028..c75722145 100644
--- a/packages/libzopfli/build.sh
+++ b/packages/libzopfli/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/google/zopfli
 TERMUX_PKG_DESCRIPTION="New zlib compatible compressor library"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=1.0.2
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_VERSION=1.0.3
 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55
+TERMUX_PKG_SHA256=e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd
 TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BREAKS="libzopfli-dev"
 TERMUX_PKG_REPLACES="libzopfli-dev"