From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 17 Oct 2018 12:40:22 +0000 (+0200)
Subject: media-libs/x265: Let everybody have detect512
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=432f45bd8ece2a10ea64b7b07f951d0ac6aa0666;p=gentoo.git

media-libs/x265: Let everybody have detect512

Upstream commit d55132eb4201 introduced detect512() but the function is
defined only when X265_ARCH_X86 so the linker fails with non x86
targets:

libx265.so.165: undefined reference to `x265_12bit::detect512()'
libx265.so.165: undefined reference to `x265_10bit::detect512()'
libx265.so.165: undefined reference to `x265::detect512()'

Fix it by defining the function unconditionally.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---

diff --git a/media-libs/x265/files/x265-2.9-detect512.patch b/media-libs/x265/files/x265-2.9-detect512.patch
new file mode 100644
index 000000000000..8437ed09b884
--- /dev/null
+++ b/media-libs/x265/files/x265-2.9-detect512.patch
@@ -0,0 +1,25 @@
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
index b62476a545d0..38316ce55ea2 100644
--- a/media-libs/x265/x265-2.9.ebuild
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}/arm.patch"
 	"${FILESDIR}/neon.patch"
 	"${FILESDIR}/ppc64.patch"
+	"${FILESDIR}"/${PN}-2.9-detect512.patch
 )
 
 src_unpack() {