From 6d69ca5eb48e7f5adc8eb620003c29156b1ac778 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 29 May 2018 13:11:16 +0000
Subject: [PATCH] extra/x265: fix
---
extra/x265/PKGBUILD | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index d3cbc634c..4411daa2f 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -6,6 +6,7 @@
# 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
pkgname=x265
pkgver=2.8
@@ -18,14 +19,17 @@ depends=('gcc-libs')
makedepends=('cmake' 'nasm')
provides=('libx265.so')
source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz"
- arm.patch)
+ arm.patch
+ https://github.com/videolan/x265/commit/8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch)
sha256sums=('6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863'
- 'c3e80d7261d5fef72bfea5c5dd4613c1e997315dc7d0d9465f99356287a8d46b')
+ 'c3e80d7261d5fef72bfea5c5dd4613c1e997315dc7d0d9465f99356287a8d46b'
+ 'edd298ac1be919d325e618a20231a0f84c783fbdcba30e0e2372f69f471bd1cd')
prepare() {
cd x265_${pkgver}
patch -p1 -i ../arm.patch
+ patch -p1 -i ../8911cbae1f7f868b213c5c0aa41cf827cdf367bb.patch
[[ $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
[[ $CARCH == "arm" ]] && CONFIG="-DENABLE_ASSEMBLY=OFF"