extra/x265 to 2.9-1

extra/x265/PKGBUILD

@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: kfgz <kfgz@interia.pl>
@@ -6,31 +5,31 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to attempt fixing ARM hackery by bandwagoning developers
 #  - retain 10/12 bit separation for AArch64
-#  - upstream patch to fix ARM FTBFS
 #  - disable all ARM assembly - version 2.8 broke ARM support completely
+#  - patch from upstream bug https://bitbucket.org/multicoreware/x265/issues/442
 
 pkgname=x265
-pkgver=2.8
+pkgver=2.9
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
 arch=('x86_64')
 url='https://bitbucket.org/multicoreware/x265'
 license=('GPL')
-depends=('gcc-libs')
-makedepends=('cmake' 'nasm')
+depends=()
+makedepends=('cmake' 'mercurial' 'nasm')
 provides=('libx265.so')
-source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz"
+source=("hg+https://bitbucket.org/multicoreware/x265#tag=${pkgver}"
         arm.patch
-        https://github.com/videolan/x265/commit/8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch)
-sha256sums=('6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863'
-            'fdd9113a015679652224f2d62c4bbbffe9a15bfef8c6a928aaf2fc57d1cd8fd8'
-            'edd298ac1be919d325e618a20231a0f84c783fbdcba30e0e2372f69f471bd1cd')
+        enable512.diff)
+sha256sums=('SKIP'
+            'd292976588ea1cb12f6371a2379fe7e22b93c18a16ea0a5acd1fbebab48988f2'
+            'bc812d10a7abbd1e5646c9bd43ab46339d1b69d1be752334120a0d12222f1e0c')
 
 prepare() {
-  cd x265_${pkgver}
+  cd x265
 
   patch -p1 -i ../arm.patch
-  patch -p1 -i ../8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch
+  patch -p1 -i ../enable512.diff
   [[ $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
   [[ $CARCH != "aarch64" ]] && CONFIG="-DENABLE_ASSEMBLY=OFF"
 
@@ -45,7 +44,7 @@ prepare() {
 build() {
 if [[ $CARCH == aarch64 ]]; then
 
-  cd x265_${pkgver}/build-12
+  cd x265/build-12
 
   cmake ../source \
     -DCMAKE_INSTALL_PREFIX='/usr' \
@@ -83,7 +82,7 @@ if [[ $CARCH == aarch64 ]]; then
 
 else
 
-  cd x265_${pkgver}/build-8
+  cd x265/build-8
 
   cmake ../source \
     -DCMAKE_INSTALL_PREFIX='/usr' \
@@ -94,7 +93,7 @@ fi
 }
 
 package() {
-  cd x265_${pkgver}/build-8
+  cd x265/build-8
 
   make DESTDIR="${pkgdir}" install
 }

extra/x265/arm.patch

@@ -1,7 +1,8 @@
+Binary files a/.hg/dirstate and b/.hg/dirstate differ
 diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
---- a/source/CMakeLists.txt	2016-12-22 22:57:39.000000000 -0700
-+++ b/source/CMakeLists.txt	2016-12-28 06:36:06.297232756 -0700
-@@ -41,7 +41,7 @@
+--- a/source/CMakeLists.txt	2018-10-08 10:04:19.918015626 -0600
++++ b/source/CMakeLists.txt	2018-10-08 10:04:37.277342636 -0600
+@@ -40,7 +40,7 @@
  # System architecture detection
  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
  set(X86_ALIASES x86 i386 i686 x86_64 amd64)
@@ -10,7 +11,7 @@ diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
  list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
  list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
  set(POWER_ALIASES ppc64 ppc64le)
-@@ -71,9 +71,17 @@
+@@ -70,9 +70,17 @@
      else()
          set(CROSS_COMPILE_ARM 0)
      endif()
@@ -30,7 +31,7 @@ diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
  else()
      message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
      message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
-@@ -208,18 +216,6 @@
+@@ -227,18 +235,6 @@
              endif()
          endif()
      endif()
@@ -50,8 +51,8 @@ diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
          if(INTEL_CXX)
              add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
 diff -urN a/source/common/cpu.cpp b/source/common/cpu.cpp
---- a/source/common/cpu.cpp	2016-12-22 22:57:39.000000000 -0700
-+++ b/source/common/cpu.cpp	2016-12-28 06:36:06.297232756 -0700
+--- a/source/common/cpu.cpp	2018-10-08 10:04:19.938014851 -0600
++++ b/source/common/cpu.cpp	2018-10-08 10:04:37.277342636 -0600
 @@ -37,7 +37,7 @@
  #include <machine/cpu.h>
  #endif