upgpkg: libpng-git 1.6.37.r36.ga37d48365-1

2 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e30858feae97..c73c1e82a6e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libpng-git
 	pkgdesc = The official PNG reference library
-	pkgver = 1.6.29.r2.gfbff8986e
+	pkgver = 1.6.37.r36.ga37d48365
 	pkgrel = 1
 	url = http://www.libpng.org/pub/png/libpng.html
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index c3d2be9c5cd9..7a141eb17825 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=libpng-git
-pkgver=1.6.29.r2.gfbff8986e
+pkgver=1.6.37.r36.ga37d48365
 pkgrel=1
 pkgdesc="The official PNG reference library"
 arch=('i686' 'x86_64')
@@ -19,15 +19,23 @@ sha256sums=('SKIP')
 pkgver() {
   cd "code"
 
-  git describe --long --tags | sed 's/^libpng-//;s/master-//;s/signed-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/^libpng-//;s/^v//;s/-master//;s/-signed//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "code"
 
-  ./autogen.sh
-  ./configure --prefix="/usr"
+  ./configure \
+    --prefix="/usr"
   make
+
+  cd "contrib/pngminus"
+  make \
+    CFLAGS="$CFLAGS" \
+    LDFLAGS="$LDFLAGS" \
+    PNGLIB_SHARED="-L$pkgdir/usr/lib -lpng" \
+    png2pnm \
+    pnm2png
 }
 
 check() {
@@ -40,5 +48,7 @@ package() {
   cd "code"
 
   make DESTDIR="$pkgdir" install
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/libpng/LICENSE"
+  install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/libpng"
+
+  install -Dm755 contrib/pngminus/{png2pnm,pnm2png} -t "$pkgdir/usr/bin"
 }