x264: update to 155.r0a84d986

1 files changed, 28 insertions, 54 deletions

diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD
index 061ee76..d1d3baa 100644
--- a/abs/core/x264/PKGBUILD
+++ b/abs/core/x264/PKGBUILD
@@ -1,84 +1,58 @@
-# $Id$
 # 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.20160920
-pkgrel=1
+pkgname=x264
+pkgver=155.r0a84d986
+pkgrel=2
 epoch=2
-arch=('i686' 'x86_64')
-url='http://www.videolan.org/developers/x264.html'
+pkgdesc='Open Source H264/AVC video encoder'
+arch=('x86_64')
+url='https://www.videolan.org/developers/x264.html'
 license=('GPL')
-depends=('glibc')
-makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='86b71982e131eaa70125f8d0e725fcade9c4c677'
-source=("git://git.videolan.org/x264.git#commit=${_commit}")
+depends=(
+  'libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+  'libswscale.so'
+)
+makedepends=('git' 'ffmpeg' 'l-smash' 'nasm')
+provides=('libx264' 'libx264.so')
+conflicts=('libx264' 'libx264-10bit' 'libx264-all')
+replaces=('libx264' 'libx264-10bit' 'libx264-all')
+_commit='0a84d986e7020f8344f00752e3600b9769cc1e85'
+source=("git+https://git.videolan.org/git/x264.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd ${pkgbase}
+  cd x264
 
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+  local _rev=$(git rev-parse --short HEAD)
 
-  echo ${_ver}.${_date}
+  echo ${_ver}.r${_rev}
 }
 
 prepare() {
-  cp -r ${pkgbase} ${pkgbase}-10bit
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build
 }
 
 build() {
-  cd ${pkgbase}
+  cd build
 
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic
-  make
-
-  cd ../${pkgbase}-10bit
-
-  ./configure \
+  ../x264/configure \
     --prefix='/usr' \
     --enable-shared \
     --enable-pic \
-    --bit-depth='10'
+    --enable-lto
   make
 }
 
-package_x264() {
-  pkgdesc='CLI tools for encoding H264/AVC video streams'
-  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 -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit
-}
-
-package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
-  provides=('libx264.so' 'x264-dev')
-  conflicts=('x264-dev')
-  replaces=('x264-dev')
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
-}
-
-package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
-  provides=('libx264.so' 'libx264' 'x264-dev')
-  conflicts=('libx264' 'x264-dev')
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
+package() {
+  make -C build DESTDIR="${pkgdir}" install-cli install-lib-shared
 }
 
 # vim: ts=2 sw=2 et: