[arch-commits] Commit in x265/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Tuesday, June 2, 2020 @ 10:35:20
  Author: alucryd
Revision: 388074

upgpkg: x265 3.4-1

Modified:
  x265/trunk/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-02 09:56:14 UTC (rev 388073)
+++ PKGBUILD	2020-06-02 10:35:20 UTC (rev 388074)
@@ -3,7 +3,7 @@
 # Contributor: kfgz <kfgz at interia.pl>
 
 pkgname=x265
-pkgver=3.3
+pkgver=3.4
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
 arch=(x86_64)
@@ -14,9 +14,10 @@
   cmake
   mercurial
   nasm
+  ninja
 )
 provides=(libx265.so)
-source=(hg+https://bitbucket.org/multicoreware/x265#tag=057215961bc4b51b6260a584ff3d506e6d65cfd6)
+source=(hg+https://bitbucket.org/multicoreware/x265#tag=2a65b720985096bcb1664f7cb05c3d04aeb576f5)
 sha256sums=(SKIP)
 
 pkgver() {
@@ -25,45 +26,27 @@
   hg id --tags
 }
 
-prepare() {
-  cd x265
-
-  for d in 8 10 12; do
-    if [[ -d build-$d ]]; then
-      rm -rf build-$d
-    fi
-    mkdir build-$d
-  done
-}
-
 build() {
-  cd x265/build-12
-
-  cmake ../source \
+  cmake -S x265/source -B build-12 -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DHIGH_BIT_DEPTH=TRUE \
     -DMAIN12=TRUE \
     -DEXPORT_C_API=FALSE \
     -DENABLE_CLI=FALSE \
-    -DENABLE_SHARED=FALSE
-  make
+    -DENABLE_SHARED=FALSE \
+    -Wno-dev
+  ninja -C build-12
 
-  cd ../build-10
-
-  cmake ../source \
+  cmake -S x265/source -B build-10 -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DHIGH_BIT_DEPTH=TRUE \
     -DEXPORT_C_API=FALSE \
     -DENABLE_CLI=FALSE \
-    -DENABLE_SHARED=FALSE
-  make
+    -DENABLE_SHARED=FALSE \
+    -Wno-dev
+  ninja -C build-10
 
-  cd ../build-8
-
-  ln -s ../build-10/libx265.a libx265_main10.a
-  ln -s ../build-12/libx265.a libx265_main12.a
-
-  cmake ../source \
+  cmake -S x265/source -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_SHARED=TRUE \
     -DENABLE_HDR10_PLUS=TRUE \
@@ -70,14 +53,15 @@
     -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
     -DEXTRA_LINK_FLAGS='-L .' \
     -DLINKED_10BIT=TRUE \
-    -DLINKED_12BIT=TRUE
-  make
+    -DLINKED_12BIT=TRUE \
+    -Wno-dev
+  ln -s ../build-10/libx265.a build/libx265_main10.a
+  ln -s ../build-12/libx265.a build/libx265_main12.a
+  ninja -C build
 }
 
 package() {
-  cd x265/build-8
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: