From 9b3f2ac2b897d7a0997375535b0253904a4de8e8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 29 May 2018 18:25:02 +0000
Subject: [PATCH] extra/x265: disable assembly
---
extra/x265/PKGBUILD | 5 +++--
extra/x265/arm.patch | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 4411daa2f..ce7c9404a 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -7,6 +7,7 @@
# - 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
pkgname=x265
pkgver=2.8
@@ -22,7 +23,7 @@ source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.g
arm.patch
https://github.com/videolan/x265/commit/8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch)
sha256sums=('6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863'
- 'c3e80d7261d5fef72bfea5c5dd4613c1e997315dc7d0d9465f99356287a8d46b'
+ 'fdd9113a015679652224f2d62c4bbbffe9a15bfef8c6a928aaf2fc57d1cd8fd8'
'edd298ac1be919d325e618a20231a0f84c783fbdcba30e0e2372f69f471bd1cd')
prepare() {
@@ -31,7 +32,7 @@ prepare() {
patch -p1 -i ../arm.patch
patch -p1 -i ../8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch
[[ $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
- [[ $CARCH == "arm" ]] && CONFIG="-DENABLE_ASSEMBLY=OFF"
+ [[ $CARCH != "aarch64" ]] && CONFIG="-DENABLE_ASSEMBLY=OFF"
for d in 8 $([[ $CARCH == 'aarch64' ]] && echo "10 12"); do
if [[ -d build-$d ]]; then
diff --git a/extra/x265/arm.patch b/extra/x265/arm.patch
index 1efd54563..23030df80 100644
--- a/extra/x265/arm.patch
+++ b/extra/x265/arm.patch
@@ -20,10 +20,10 @@ diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)
+ elseif(${SYSPROC} STREQUAL "armv6l")
+ message(STATUS "Detected ARMV6 system processor")
-+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)
++ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)
+ elseif(${SYSPROC} STREQUAL "armv7l")
+ message(STATUS "Detected ARMV7 system processor")
-+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0 -fPIC)
++ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0 -fPIC)
+ endif()
set(ARM 1)
- add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)