sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libzopfli: Update from 1.0.1 to 1.0.2

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-05-18 23:34:45 +02:00
parent 51c65880e4
commit ef4834a4d1
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/libzopfli/Makefile.patch
View File

@ -1,17 +1,20 @@
diff -u -r ../zopfli-zopfli-1.0.1/Makefile ./Makefile
--- ../zopfli-zopfli-1.0.1/Makefile 2015-08-22 10:36:46.000000000 -0400
+++ ./Makefile 2016-01-09 20:43:38.611197626 -0500
@@ -1,9 +1,3 @@
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++
-
-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
+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\
src/zopfli/hash.c src/zopfli/katajainen.c\
@@ -20,22 +14,22 @@
@@ -20,22 +20,22 @@
# Zopfli binary
zopfli:
@ -22,7 +25,7 @@ diff -u -r ../zopfli-zopfli-1.0.1/Makefile ./Makefile
-libzopfli:
+install:
$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
- $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
- $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
+ $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -o @TERMUX_PREFIX@/lib/libzopfli.so -lm
# ZopfliPNG binary
@ -34,8 +37,8 @@ diff -u -r ../zopfli-zopfli-1.0.1/Makefile ./Makefile
# 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.0
+ $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so -lm
- $(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:

5
packages/libzopfli/build.sh
View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://github.com/google/zopfli
TERMUX_PKG_DESCRIPTION="New zlib compatible compressor library"
TERMUX_PKG_VERSION=1.0.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.0.2
TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55
TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4
TERMUX_PKG_BUILD_IN_SRC=yes
termux_step_post_make_install () {