Merge branch 'testing'

1 files changed, 44 insertions, 56 deletions

diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD
index 1a728d7..fa77dac 100644
--- a/abs/core/x265/PKGBUILD
+++ b/abs/core/x265/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id$
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: kfgz <kfgz@interia.pl>
 
 pkgname=x265
-pkgver=2.2
+pkgver=3.0
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://bitbucket.org/multicoreware/x265'
 license=('GPL')
-depends=('gcc-libs')
-makedepends=('yasm' 'cmake')
+depends=()
+makedepends=('cmake' 'mercurial' 'nasm')
 provides=('libx265.so')
-source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz")
-sha256sums=('b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b')
+source=("hg+https://bitbucket.org/multicoreware/x265#tag=${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
-  cd x265_${pkgver}
+  cd x265
 
-  for d in 8 $([[ $CARCH == 'x86_64' ]] && echo "10 12"); do
+  for d in 8 10 12; do
     if [[ -d build-$d ]]; then
       rm -rf build-$d
     fi
@@ -28,56 +27,45 @@ prepare() {
 }
 
 build() {
-  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
+  cd x265/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' \
+    -DENABLE_HDR10_PLUS='TRUE' \
+    -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
+    -DEXTRA_LINK_FLAGS='-L .' \
+    -DLINKED_10BIT='TRUE' \
+    -DLINKED_12BIT='TRUE'
+  make
 }
 
 package() {
-  cd x265_${pkgver}/build-8
+  cd x265/build-8
 
   make DESTDIR="${pkgdir}" install
 }