public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/
Date: Wed, 17 Oct 2018 12:48:24 +0000 (UTC)	[thread overview]
Message-ID: <1539780501.432f45bd8ece2a10ea64b7b07f951d0ac6aa0666.jer@gentoo> (raw)

commit:     432f45bd8ece2a10ea64b7b07f951d0ac6aa0666
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 12:40:22 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 12:48:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432f45bd

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 <AT> gentoo.org>

 media-libs/x265/files/x265-2.9-detect512.patch | 25 +++++++++++++++++++++++++
 media-libs/x265/x265-2.9.ebuild                |  1 +
 2 files changed, 26 insertions(+)

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 00000000000..8437ed09b88
--- /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 b62476a545d..38316ce55ea 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() {


             reply	other threads:[~2018-10-17 12:48 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-17 12:48 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-25 15:44 [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/ Sam James
2023-12-21  9:57 Sam James
2021-12-01 15:46 Sam James
2020-06-05 15:21 Alexis Ballier
2020-05-24 20:25 Thomas Deutschmann
2018-11-11 22:10 Andreas Sturmlechner
2018-06-29  7:39 Alexis Ballier
2017-02-24  9:00 Alexis Ballier
2015-10-14 21:08 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1539780501.432f45bd8ece2a10ea64b7b07f951d0ac6aa0666.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox