From 9197df8c0f884fb848224eec0a52cd9eaa3f73c7 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 19 May 2017 12:55:51 +0000
Subject: [PATCH] extra/x264 to 148.20170121-6

---
 extra/x264/PKGBUILD | 87 ++++++++++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 37 deletions(-)

diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 72a7d126f..1f97c3a8c 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -8,17 +8,17 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - configure needs --disable-asm to build on non-AArch64
 
-pkgname=('x264' 'libx264' 'libx264-10bit')
+pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
 pkgver=148.20170121
-pkgrel=1
+pkgrel=6
 epoch=2
 arch=('i686' 'x86_64')
-url='http://www.videolan.org/developers/x264.html'
+url='https://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
 _commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
-source=("git://git.videolan.org/x264.git#commit=${_commit}")
+source=("git+https://git.videolan.org/git/x264.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -31,59 +31,72 @@ pkgver() {
 }
 
 prepare() {
-  cp -r ${pkgbase} ${pkgbase}-10bit
+  mkdir build-{8,10}bit
 }
 
 build() {
   [[ $CARCH != "aarch64" ]] && CONFIG="--disable-asm"
 
-  cd ${pkgbase}
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic $CONFIG
-  make
-
-  cd ../${pkgbase}-10bit
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic \
-    --bit-depth='10' $CONFIG
-  make
+  for _b in 8 10; do (
+    cd build-${_b}bit
+    ../${pkgbase}/configure \
+      --prefix='/usr' \
+      --enable-shared \
+      --enable-pic \
+      --enable-lto \
+      --bit-depth="${_b}"  $CONFIG
+    make
+  ) done
 }
 
 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
+  for _b in {8,10}bit; do
+    provides+=("x264-${_b}")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-cli
+    mv "${pkgdir}"/usr/bin/x264{,-${_b}}
+  done
+
+  ln -s x264-8bit "${pkgdir}"/usr/bin/x264
 }
 
 package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
-  provides=('libx264.so' 'x264-dev')
-  conflicts=('x264-dev')
-  replaces=('x264-dev')
+  pkgdesc='Library for encoding H264/AVC video streams (8bit depth)'
+  provides=('libx264-8bit' 'libx264.so')
+  conflicts=('libx264')
 
-  install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
+  make -C build-8bit 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')
+  pkgdesc='Library for encoding H264/AVC video streams (10bit depth)'
+  provides=('libx264' 'libx264.so')
+  conflicts=('libx264')
 
-  install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
+  make -C build-10bit DESTDIR=${pkgdir} install-lib-shared
+}
+
+package_libx264-all() {
+  pkgdesc="Library for encoding H264/AVC video streams (all depths)"
+
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
+
+  install -d "${pkgdir}"/usr/lib/x264
+
+  for _b in {8,10}bit; do
+    provides+=("libx264-${_b}.so")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-lib-shared
+
+    mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-${_b}.so.${_ver}
+    rm -r "${pkgdir}"/usr/{include,lib/libx264.so,lib/pkgconfig}
+
+    ln -sr "${pkgdir}"/usr/lib/x264/libx264-${_b}.so{.${_ver},}
+  done
 }
 
 # vim: ts=2 sw=2 et: