Merge branch 'testing'

1 files changed, 65 insertions, 15 deletions

diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD
index 246166f..bee22f5 100644
--- a/abs/core/x265/PKGBUILD
+++ b/abs/core/x265/PKGBUILD
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: kfgz <kfgz at interia pl>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: kfgz <kfgz@interia.pl>
 
 pkgname=x265
-pkgver=1.7
-pkgrel=3
+pkgver=1.9
+pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
 arch=('i686' 'x86_64')
 url='https://bitbucket.org/multicoreware/x265'
@@ -12,24 +13,73 @@ license=('GPL')
 depends=('gcc-libs')
 makedepends=('yasm' 'cmake')
 provides=('libx265.so')
-source=($pkgname-$pkgver.tar.bz2::$url/get/$pkgver.tar.bz2
-        x265-1.7-fix-slowness-with-gcc-5.1.patch)
-md5sums=('d6020c277b05ab44f8222342aaa9c99f'
-         '30c7fc491f22cbdec1ee17caab7d620a')
+source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz")
+md5sums=('f34a1c4c660ff07511365cb0983cf164')
 
 prepare() {
-  cd multicoreware-x265-*
-  patch -p1 -i "$srcdir"/x265-1.7-fix-slowness-with-gcc-5.1.patch
+  cd x265_${pkgver}
+
+  for d in 8 $([[ $CARCH == 'x86_64' ]] && echo "10 12"); do
+    if [[ -d build-$d ]]; then
+      rm -rf build-$d
+    fi
+    mkdir build-$d
+  done
 }
 
 build() {
-  cd multicoreware-x265-*/build/linux
-  [[ $CARCH == x86_64 ]] && LDFLAGS+=',-z,noexecstack'
-  cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ../../source
-  make
+  if [[ $CARCH == x86_64 ]]; then
+
+    cd x265_${pkgver}/build-12
+
+    cmake ../source \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DHIGH_BIT_DEPTH='TRUE' \
+      -DMAIN12='TRUE' \
+      -DEXPORT_C_API='FALSE' \
+      -DENABLE_CLI='FALSE' \
+      -DENABLE_SHARED='FALSE'
+    make
+
+    cd ../build-10
+
+    cmake ../source \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DHIGH_BIT_DEPTH='TRUE' \
+      -DEXPORT_C_API='FALSE' \
+      -DENABLE_CLI='FALSE' \
+      -DENABLE_SHARED='FALSE'
+    make
+
+    cd ../build-8
+
+    ln -s ../build-10/libx265.a libx265_main10.a
+    ln -s ../build-12/libx265.a libx265_main12.a
+
+    cmake ../source \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DENABLE_SHARED='TRUE' \
+      -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
+      -DEXTRA_LINK_FLAGS='-L.' \
+      -DLINKED_10BIT='TRUE' \
+      -DLINKED_12BIT='TRUE'
+    make
+
+  else
+
+    cd x265_${pkgver}/build-8
+
+    cmake ../source \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DENABLE_SHARED='TRUE'
+
+  fi
 }
 
 package() {
-  cd multicoreware-x265-*/build/linux
-  make DESTDIR="$pkgdir" install
+  cd x265_${pkgver}/build-8
+
+  make DESTDIR="${pkgdir}" install
 }
+
+# vim: ts=2 sw=2 et: