Package updated to 1.6.39.

2 files changed, 20 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9f995587541..684c7a596bdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-x86-64-libpng
 	pkgdesc = A collection of routines used to create PNG format graphics (android)
-	pkgver = 1.6.37
-	pkgrel = 4
+	pkgver = 1.6.39
+	pkgrel = 1
 	url = http://www.libpng.org/pub/png/libpng.html
 	arch = any
 	license = custom
@@ -11,10 +11,7 @@ pkgbase = android-x86-64-libpng
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = http://downloads.sourceforge.net/sourceforge/libpng/libpng-1.6.37.tar.xz
-	source = http://downloads.sourceforge.net/project/apng/libpng/libpng16/libpng-1.6.37-apng.patch.gz
-	sha256sums = 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
-	sha256sums = 10d9e0cb60e2b387a79b355eb7527c0bee2ed8cbd12cf04417cabc4d6976683c
+	source = http://downloads.sourceforge.net/sourceforge/libpng/libpng-1.6.39.tar.xz
+	sha256sums = 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
 
 pkgname = android-x86-64-libpng
-
diff --git a/PKGBUILD b/PKGBUILD
index a6b21be7f480..865920a17be9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 _android_arch=x86-64
 
 pkgname=android-${_android_arch}-libpng
-pkgver=1.6.37
-pkgrel=4
+pkgver=1.6.39
+pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics (android)"
 arch=('any')
 url="http://www.libpng.org/pub/png/libpng.html"
@@ -13,32 +13,18 @@ license=('custom')
 depends=("android-${_android_arch}-zlib")
 options=(!strip !buildflags staticlibs !emptydirs)
 makedepends=('android-configure')
-source=("http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/project/apng/libpng/libpng16/libpng-$pkgver-apng.patch.gz")
-sha256sums=('505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca'
-            '10d9e0cb60e2b387a79b355eb7527c0bee2ed8cbd12cf04417cabc4d6976683c')
-
-prepare() {
-    cd "$srcdir/libpng-$pkgver"
-    source android-env ${_android_arch}
-
-    # Add animated PNG (apng) support
-    # see http://sourceforge.net/projects/libpng-apng/
-    gzip -dkf ../libpng-$pkgver-apng.patch.gz
-    patch -Np0 -i ../libpng-$pkgver-apng.patch
-    sed -i "s/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@/libpng/g" libpng.pc.in
-    sed -i "s/-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@/\-lpng/g" libpng.pc.in
-    sed -i "s/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@/libpng/g" Makefile.in
-}
+source=("http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz")
+sha256sums=('1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937')
 
 build() {
     cd "$srcdir/libpng-$pkgver"
     source android-env ${_android_arch}
 
     android-${_android_arch}-configure \
-        --disable-unversioned-links \
-        --disable-unversioned-libpng-pc \
-        --disable-unversioned-libpng-config
+        --enable-unversioned-links \
+        --enable-unversioned-libpng-pc\
+        --enable-unversioned-libpng-config \
+        --enable-hardware-optimizations
 
     make $MAKEFLAGS
 }
@@ -51,8 +37,14 @@ package () {
     sed -i "s|include/libpng|include|g" "${pkgdir}"/${ANDROID_PREFIX_LIB}/pkgconfig/libpng.pc
     rm -r "${pkgdir}"/${ANDROID_PREFIX_BIN}
     rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
-    mv -f "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/libpng/* "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/
-    rm -r "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/libpng
+    mv -f "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/libpng16/ "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/libpng/
+    rm -f "${pkgdir}"/${ANDROID_PREFIX_INCLUDE}/*.h
+    rm -f "${pkgdir}"/${ANDROID_PREFIX_LIB}/libpng.{a,so}
+    mv -f "${pkgdir}"/${ANDROID_PREFIX_LIB}/libpng16.a "${pkgdir}"/${ANDROID_PREFIX_LIB}/libpng.a
+    mv -f "${pkgdir}"/${ANDROID_PREFIX_LIB}/libpng16.so "${pkgdir}"/${ANDROID_PREFIX_LIB}/libpng.so
+    rm -f "${pkgdir}"/${ANDROID_PREFIX_LIB}/pkgconfig/libpng16.pc
+    sed -i 's|include16|include/libpng|g' "${pkgdir}"/${ANDROID_PREFIX_LIB}/pkgconfig/libpng.pc
+    sed -i 's|lpng16|lpng|g' "${pkgdir}"/${ANDROID_PREFIX_LIB}/pkgconfig/libpng.pc
     ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
     ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }