aboutsummaryrefslogtreecommitdiffstats
path: root/main/pngcrush
diff options
context:
space:
mode:
Diffstat (limited to 'main/pngcrush')
-rw-r--r--main/pngcrush/01-makefile-sanity.patch44
-rw-r--r--main/pngcrush/APKBUILD20
2 files changed, 48 insertions, 16 deletions
diff --git a/main/pngcrush/01-makefile-sanity.patch b/main/pngcrush/01-makefile-sanity.patch
index abbeff5533..58c2640e8c 100644
--- a/main/pngcrush/01-makefile-sanity.patch
+++ b/main/pngcrush/01-makefile-sanity.patch
@@ -1,13 +1,47 @@
---- pngcrush-1.7.25/Makefile
-+++ pngcrush-1.7.25/Makefile
-@@ -20,8 +20,8 @@
+--- 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. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow
+CFLAGS = -I. -Os -fomit-frame-pointer -Wall
-+#CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow
+ #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
# [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
+@@ -37,15 +37,15 @@
+
+ PNGCRUSH = pngcrush
+
+-LIBS = -lm
++LIBS = -lz -lm
+ #LIBS = -L${ZLIB} -lz -lm
+ #LIBS = ${ZLIB}/libz.a -lm
+
+ # uncomment these 4 lines only if you are NOT using an external copy of zlib:
+-ZHDR = zlib.h
+-ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
+- infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
+- trees$(O) uncompr$(O) zutil$(O)
++#ZHDR = zlib.h
++#ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
++# infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
++# trees$(O) uncompr$(O) zutil$(O)
+
+ OBJS = pngcrush$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+ pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
diff --git a/main/pngcrush/APKBUILD b/main/pngcrush/APKBUILD
index f6e347c98d..0ea73c1ff2 100644
--- a/main/pngcrush/APKBUILD
+++ b/main/pngcrush/APKBUILD
@@ -1,24 +1,22 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer:
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=pngcrush
-pkgver=1.7.25
+pkgver=1.7.27
pkgrel=0
pkgdesc="PNG recompression utility"
-url="http://pngcrush.sourceforge.net"
+url="http://pmt.sourceforge.net/pngcrush/"
arch="all"
license="zlib"
depends=""
depends_dev=""
-makedepends="$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.bz2
license.txt
- 01-makefile-sanity.patch
- "
-
+ 01-makefile-sanity.patch"
_builddir="$srcdir"/pngcrush-$pkgver
+
prepare() {
local i
cd "$_builddir"
@@ -41,6 +39,6 @@ package() {
rm -f "$pkgdir"/usr/lib/*.la
}
-md5sums="c891a418419efa07aa513db602d8f403 pngcrush-1.7.25.tar.bz2
+md5sums="582ab2b4c262b8837cc2d30bf7d14f33 pngcrush-1.7.27.tar.bz2
8e5d194d4197e51add36722cd3248717 license.txt
-837e46dc592ef087547372e278502b57 01-makefile-sanity.patch"
+5b8c8a7441ec0f28960b0035fe68cc00 01-makefile-sanity.patch"