libwebp: update to 0.6.1

1 files changed, 25 insertions, 15 deletions

diff --git a/abs/extra/libwebp/PKGBUILD b/abs/extra/libwebp/PKGBUILD
index bb87fd6..79ad8a9 100644
--- a/abs/extra/libwebp/PKGBUILD
+++ b/abs/extra/libwebp/PKGBUILD
@@ -4,39 +4,49 @@
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="WebP library and conversion tools"
-arch=(x86_64 i686)
+arch=(x86_64)
 url="https://developers.google.com/speed/webp/"
 license=(BSD)
 depends=(libpng libjpeg libtiff giflib)
-makedepends=(freeglut mesa glu)
+makedepends=(freeglut mesa glu git)
 optdepends=('freeglut: vwebp viewer')
-source=("http://downloads.webmproject.org/releases/webp/$pkgname-$pkgver.tar.gz")
-sha256sums=('14d825d7c2ef7d49621bcb6b83466be455585e671ae0a2ebc1f2e07775a1722d')
+_commit=6b7a95fd8385baa6d18c96d5c0f2bea5632faf55  # tags/v0.6.1^0
+source=("git+https://chromium.googlesource.com/webm/libwebp#commit=$_commit")
+sha256sums=('SKIP')
+validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname
   ./configure --prefix=/usr \
      --enable-swap-16bit-csp \
      --enable-experimental \
-     --enable-libwebpmux \
-     --enable-libwebpdemux \
-     --enable-libwebpdecoder \
+     --enable-libwebp{mux,demux,decoder,extras} \
      --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
+check() {
+  cd $pkgname
+  make check
+}
 
-  make DESTDIR="$pkgdir/" install
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }