diff options
| -rw-r--r-- | main/pngcrush/01-makefile-sanity.patch | 40 | ||||
| -rw-r--r-- | main/pngcrush/APKBUILD | 14 |
2 files changed, 24 insertions, 30 deletions
diff --git a/main/pngcrush/01-makefile-sanity.patch b/main/pngcrush/01-makefile-sanity.patch index 58c2640e8c..702bf77fac 100644 --- a/main/pngcrush/01-makefile-sanity.patch +++ b/main/pngcrush/01-makefile-sanity.patch @@ -1,35 +1,23 @@ ---- pngcrush-1.7.27/Makefile.orig -+++ pngcrush-1.7.27/Makefile -@@ -11,8 +11,8 @@ - # macros -------------------------------------------------------------------- - - # uncomment these 2 lines only if you are using an external copy of zlib: --#ZINC = ../../zlib --#ZLIB = ../../zlib -+ZINC = ../../zlib -+ZLIB = ../../zlib - - CC = gcc - LD = gcc -@@ -20,10 +20,10 @@ - #CFLAGS = -I. -O -Wall - #CFLAGS = -I. -O2 - #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall --#CFLAGS = -I. -Os -fomit-frame-pointer -Wall -+CFLAGS = -I. -Os -fomit-frame-pointer -Wall - #CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow - # Work around zlib compiler bug in 1.2.6 --CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow -DZ_SOLO -+#CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow -DZ_SOLO - #CFLAGS = -I${ZINC} -I. -O3 -fomit-frame-pointer -Wall +diff --git a/Makefile b/Makefile +index e5de7d3..9c86fea 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,7 +32,7 @@ TOOFAR_OK= + #CFLAGS = -O2 + #CFLAGS = -O2 -fomit-frame-pointer -Wall + #CFLAGS = -Os -fomit-frame-pointer -Wall +-CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow ++CFLAGS ?= -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow # [note that -Wall is a gcc-specific compilation flag ("all warnings on")] -@@ -37,15 +37,15 @@ + LDFLAGS = +@@ -41,16 +41,16 @@ E = PNGCRUSH = pngcrush -LIBS = -lm -+LIBS = -lz -lm ++LIBS = -lm -lz + # uncomment one of these 2 lines only if you are using an external zlib: #LIBS = -L${ZLIB} -lz -lm #LIBS = ${ZLIB}/libz.a -lm diff --git a/main/pngcrush/APKBUILD b/main/pngcrush/APKBUILD index 0ea73c1ff2..4070ee208e 100644 --- a/main/pngcrush/APKBUILD +++ b/main/pngcrush/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=pngcrush -pkgver=1.7.27 +pkgver=1.7.66 pkgrel=0 pkgdesc="PNG recompression utility" url="http://pmt.sourceforge.net/pngcrush/" @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev zlib-dev" install="" subpackages="" -source="http://downloads.sourceforge.net/project/pmt/pngcrush/$pkgver/pngcrush-$pkgver.tar.bz2 +source="http://downloads.sourceforge.net/project/pmt/pngcrush/$pkgver/pngcrush-$pkgver.tar.xz license.txt 01-makefile-sanity.patch" _builddir="$srcdir"/pngcrush-$pkgver @@ -39,6 +39,12 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="582ab2b4c262b8837cc2d30bf7d14f33 pngcrush-1.7.27.tar.bz2 +md5sums="2bbeeebc56bccaa2ebe9cdd97c4c65ca pngcrush-1.7.66.tar.xz 8e5d194d4197e51add36722cd3248717 license.txt -5b8c8a7441ec0f28960b0035fe68cc00 01-makefile-sanity.patch" +6a87145c0147355f2b0efb33f173a13b 01-makefile-sanity.patch" +sha256sums="eaff82dd58e600994281bb183ad6fb33e03c12375012a70c8b5a9600bdf770b7 pngcrush-1.7.66.tar.xz +2dedd4fae0c2c613411be8d7736d1d7b2f6573ff6eae3eb2f9f5e312e327c983 license.txt +0cb9d31ff9a49c904b3e83c61dd7860adaa09f9aa11b69e5112edbb775da2ea2 01-makefile-sanity.patch" +sha512sums="a9c7ec27740409bc715b13215702e712b71ecb2d1df76508a08bf1d64d6289fded1fa991d4f454d0abc4f8cd5179c28a08136b45a26d59b15f3d1c96db6fb3aa pngcrush-1.7.66.tar.xz +0302e756fb854ab0569c08254be522714396d554589b1d5a2822858c678eb16a78ee489d9170ebfcf7604eae27eb346c64646c4f1976e02bc258c749813fcf99 license.txt +87965282c81907332063f4f735740093799c93c7994428200e4c52e559653aa7293dde4608250479c321f1a0eba2bddc3ccbb22d75fe9610b379075a28c612cd 01-makefile-sanity.patch" |