From e83615201d332af851af51937b4f90ea279855cc Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 15 Oct 2018 16:20:58 +0200 Subject: extra/x265: detect512-is-needed-on-all-architectures --- ...-detect512-is-needed-on-all-architectures.patch | 35 ++++++++++++++++++++++ extra/x265/PKGBUILD | 9 ++++++ 2 files changed, 44 insertions(+) create mode 100644 extra/x265/0003-detect512-is-needed-on-all-architectures.patch (limited to 'extra') diff --git a/extra/x265/0003-detect512-is-needed-on-all-architectures.patch b/extra/x265/0003-detect512-is-needed-on-all-architectures.patch new file mode 100644 index 00000000..16aab240 --- /dev/null +++ b/extra/x265/0003-detect512-is-needed-on-all-architectures.patch @@ -0,0 +1,35 @@ +From: Adam Sampson +Date: Sun, 14 Oct 2018 14:04:18 +0200 +Subject: detect512 is needed on all architectures + +--- + source/common/cpu.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp +index 0681ff5..fa687da 100644 +--- a/source/common/cpu.cpp ++++ b/source/common/cpu.cpp +@@ -110,6 +110,11 @@ const cpu_name_t cpu_names[] = + { "", 0 }, + }; + ++bool detect512() ++{ ++ return(enable512); ++} ++ + #if X265_ARCH_X86 + + extern "C" { +@@ -123,10 +128,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr); + #pragma warning(disable: 4309) // truncation of constant value + #endif + +-bool detect512() +-{ +- return(enable512); +-} + uint32_t cpu_detect(bool benableavx512 ) + { + diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD index 70b20b4c..0dc3dc58 100644 --- a/extra/x265/PKGBUILD +++ b/extra/x265/PKGBUILD @@ -6,3 +6,12 @@ eval "$( s/cmake/cmake -DENABLE_ASSEMBLY=OFF/ ' )" +# thanks, debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910963 +source+=('0003-detect512-is-needed-on-all-architectures.patch') +sha256sum+=('+6baa25d11c81ad4ee49e9f2a367db4c770eb8cccf81f7bdaadb942621288a271') +eval "$( + declare -f prepare | \ + sed ' + 3 a patch -p1 -i "$srcdir/0003-detect512-is-needed-on-all-architectures.patch" + ' +)" -- cgit v1.2.3-70-g09d2