media-libs/x265: Let everybody have detect512
authorJeroen Roovers <jer@gentoo.org>
Wed, 17 Oct 2018 12:40:22 +0000 (14:40 +0200)
committerJeroen Roovers <jer@gentoo.org>
Wed, 17 Oct 2018 12:48:21 +0000 (14:48 +0200)
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>
media-libs/x265/files/x265-2.9-detect512.patch [new file with mode: 0644]
media-libs/x265/x265-2.9.ebuild

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 (file)
index 0000000..8437ed0
--- /dev/null
@@ -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 )
+ {
index b62476a545d013e86483df92a466c4e345cd9118..38316ce55ea2213d1ab6c39d8213e3ba9ffb6884 100644 (file)
@@ -31,6 +31,7 @@ PATCHES=(
        "${FILESDIR}/arm.patch"
        "${FILESDIR}/neon.patch"
        "${FILESDIR}/ppc64.patch"
+       "${FILESDIR}"/${PN}-2.9-detect512.patch
 )
 
 src_unpack() {