x264: update to 148.20160920

1 files changed, 33 insertions, 23 deletions

diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD
index b3c6a71..061ee76 100644
--- a/abs/core/x264/PKGBUILD
+++ b/abs/core/x264/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Maintainer:  Maxime Gauduin <alucryd@archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20150725
+pkgver=148.20160920
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -14,12 +14,13 @@ url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14
-source=(git://git.videolan.org/x264.git#commit=${_commit})
-md5sums=('SKIP')
+_commit='86b71982e131eaa70125f8d0e725fcade9c4c677'
+source=("git://git.videolan.org/x264.git#commit=${_commit}")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd ${pkgbase}
+
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
   local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
 
@@ -27,31 +28,38 @@ pkgver() {
 }
 
 prepare() {
-  cp -r $pkgname $pkgname-10bit
+  cp -r ${pkgbase} ${pkgbase}-10bit
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr \
-    --enable-shared --enable-pic
+  cd ${pkgbase}
+
+  ./configure \
+    --prefix='/usr' \
+    --enable-shared \
+    --enable-pic
   make
 
-  cd ../$pkgname-10bit
-  ./configure --prefix=/usr \
-    --enable-shared --enable-pic \
-    --bit-depth=10
+  cd ../${pkgbase}-10bit
+
+  ./configure \
+    --prefix='/usr' \
+    --enable-shared \
+    --enable-pic \
+    --bit-depth='10'
   make
 }
 
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends=('ffmpeg' 'liblsmash.so')
+  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+            'libswscale.so')
   provides=('x264-10bit')
   conflicts=('x264-10bit')
   replaces=('x264-10bit')
 
-  make -C $pkgbase DESTDIR="$pkgdir" install-cli
-  install -Dm755 $pkgbase-10bit/x264 "$pkgdir"/usr/bin/x264-10bit
+  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli
+  install -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit
 }
 
 package_libx264() {
@@ -60,8 +68,8 @@ package_libx264() {
   conflicts=('x264-dev')
   replaces=('x264-dev')
 
-  install -d "$pkgdir"/usr/lib
-  make -C $pkgbase DESTDIR="$pkgdir" install-lib-shared
+  install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
 }
 
 package_libx264-10bit() {
@@ -69,6 +77,8 @@ package_libx264-10bit() {
   provides=('libx264.so' 'libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 
-  install -d "$pkgdir"/usr/lib
-  make -C $pkgbase-10bit DESTDIR="$pkgdir" install-lib-shared
+  install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
 }
+
+# vim: ts=2 sw=2 et: