upgrade to 3.1.6-1

2 files changed, 34 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbee3375623d..d06bce3e0887 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = apng-utils
 	pkgdesc = apngasm for assembling apng files, apngdis for disassembling apng files, and gif2apng/apng2gif for converting.
-	pkgver = 2.9
-	pkgrel = 3
+	pkgver = 3.1.6
+	pkgrel = 1
 	url = http://sourceforge.net/projects/apngdis/
 	arch = i686
 	arch = x86_64
 	license = LGPL
+	makedepends = boost
 	depends = libpng
 	depends = gcc-libs
 	provides = apngasm
@@ -13,19 +14,18 @@ pkgbase = apng-utils
 	provides = gif2apng
 	provides = apng2gif
 	noextract = gif2apng-1.9-src.zip
-	noextract = apngasm-2.9-src.zip
 	noextract = apng2gif-1.7-src.zip
 	noextract = apngdis-2.8-src.zip
 	source = http://sourceforge.net/projects/apngdis/files/2.8/apngdis-2.8-src.zip
-	source = http://sourceforge.net/projects/apngasm/files/2.9/apngasm-2.9-src.zip
+	source = https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz
 	source = http://sourceforge.net/projects/gif2apng/files/1.9/gif2apng-1.9-src.zip
 	source = http://sourceforge.net/projects/apng2gif/files/1.7/apng2gif-1.7-src.zip
 	md5sums = 2e8a430ae2a8c544af4965840d9fad23
-	md5sums = f2619444e125157ce22438e963a80c0b
+	md5sums = da03e28b408a54206a2e9765deb448b1
 	md5sums = 4e7336fe6b71c18ac830bb2977204819
 	md5sums = 9877249603e7d01bc1970130a40cd035
 	sha256sums = 58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741
-	sha256sums = 5dfd34c9a560da81f91d37b891e23761c74659fe36e04ab2a46696562a9ed876
+	sha256sums = 0068e31cd878e07f3dffa4c6afba6242a753dac83b3799470149d2e816c1a2a7
 	sha256sums = 3b21308e935d799b3ffb4a86c6e00ffa4cb9b3f72f52d58d51c66eb0574ae7d2
 	sha256sums = 6c7b2cce851378f2fc8f6b490ce098e9cf0038aa05da7099771c8be94620e6ca
 
diff --git a/PKGBUILD b/PKGBUILD
index a4f0e990b95e..4d6493d0d473 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 # Contributor: Tyler <tjb0607 at gmail dot com>
 # Contributor: Austin <doorknob60 at gmail dot com>
 pkgname=apng-utils
-pkgver=2.9
+pkgver=3.1.6
 _apngdis_pkgver=2.8
-_apngasm_pkgver=2.9
+_apngasm_pkgver=3.1.6
 _gif2apng_pkgver=1.9
 _apng2gif_pkgver=1.7
-pkgrel=3
+pkgrel=1
 pkgdesc="apngasm for assembling apng files, apngdis for disassembling apng files, and gif2apng/apng2gif for converting."
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/apngdis/"
@@ -17,18 +17,25 @@ url="http://sourceforge.net/projects/apngdis/"
 provides=( apngasm apngdis gif2apng apng2gif)
 license=('LGPL')
 depends=( 'libpng' 'gcc-libs' )
+makedepends=( 'boost' )
 source=("http://sourceforge.net/projects/apngdis/files/${_apngdis_pkgver}/apngdis-${_apngdis_pkgver}-src.zip"
-        "http://sourceforge.net/projects/apngasm/files/${_apngasm_pkgver}/apngasm-${_apngasm_pkgver}-src.zip"
+        "https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz"
         "http://sourceforge.net/projects/gif2apng/files/${_gif2apng_pkgver}/gif2apng-${_gif2apng_pkgver}-src.zip"
         "http://sourceforge.net/projects/apng2gif/files/${_apng2gif_pkgver}/apng2gif-${_apng2gif_pkgver}-src.zip"
 )
-
 noextract=( 
-	"gif2apng-${_gif2apng_pkgver}-src.zip" 
-	"apngasm-${_apngasm_pkgver}-src.zip" 
+	"gif2apng-${_gif2apng_pkgver}-src.zip"
 	"apng2gif-${_apng2gif_pkgver}-src.zip" 
 	"apngdis-${_apngdis_pkgver}-src.zip" 
 )
+md5sums=('2e8a430ae2a8c544af4965840d9fad23'
+         'da03e28b408a54206a2e9765deb448b1'
+         '4e7336fe6b71c18ac830bb2977204819'
+         '9877249603e7d01bc1970130a40cd035')
+sha256sums=('58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741'
+            '0068e31cd878e07f3dffa4c6afba6242a753dac83b3799470149d2e816c1a2a7'
+            '3b21308e935d799b3ffb4a86c6e00ffa4cb9b3f72f52d58d51c66eb0574ae7d2'
+            '6c7b2cce851378f2fc8f6b490ce098e9cf0038aa05da7099771c8be94620e6ca')
 
 build() {
   cd "${srcdir}"
@@ -43,22 +50,27 @@ build() {
   	make ${MAKEFLAGS}
 	
 	cd "${srcdir}"
-  done	
+  done
+  
+  cd "${srcdir}/apngasm-${_apngasm_pkgver}"
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX="/usr" ../
+  make
 }
 
 package() {
   cd "${srcdir}"
   install -d "$pkgdir/usr/bin/"
+  install -d "$pkgdir/usr/local/include/"
   for _pack in "${noextract[@]}"; do
 	_builddir=${_pack%%-*}
   	install -Dm755 "$_builddir/$_builddir" "$pkgdir/usr/bin/"
   done
+  
+  cd "${srcdir}/apngasm-${_apngasm_pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+  
+  rm -r $pkgdir/usr/local
 }
-md5sums=('2e8a430ae2a8c544af4965840d9fad23'
-         'f2619444e125157ce22438e963a80c0b'
-         '4e7336fe6b71c18ac830bb2977204819'
-         '9877249603e7d01bc1970130a40cd035')
-sha256sums=('58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741'
-            '5dfd34c9a560da81f91d37b891e23761c74659fe36e04ab2a46696562a9ed876'
-            '3b21308e935d799b3ffb4a86c6e00ffa4cb9b3f72f52d58d51c66eb0574ae7d2'
-            '6c7b2cce851378f2fc8f6b490ce098e9cf0038aa05da7099771c8be94620e6ca')
+