Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/files/, media-libs/x265/
Date: Fri, 29 Jun 2018 07:39:31
Message-Id: 1530257956.47c0313dd95bf0284fd9eef981f742124f1d2d01.aballier@gentoo
1 commit: 47c0313dd95bf0284fd9eef981f742124f1d2d01
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 29 07:39:06 2018 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 29 07:39:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c0313d
7
8 media-libs/x265: backport upstream patch to fix build error
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 media-libs/x265/files/non_x86.patch | 20 ++++++++++++++++++++
13 media-libs/x265/x265-2.8.ebuild | 1 +
14 2 files changed, 21 insertions(+)
15
16 diff --git a/media-libs/x265/files/non_x86.patch b/media-libs/x265/files/non_x86.patch
17 new file mode 100644
18 index 00000000000..3c7e389329a
19 --- /dev/null
20 +++ b/media-libs/x265/files/non_x86.patch
21 @@ -0,0 +1,20 @@
22 +# HG changeset patch
23 +# User Jayashree <jayashree.c@××××××××××××××××.com>
24 +# Date 1527224165 -19800
25 +# Fri May 25 10:26:05 2018 +0530
26 +# Node ID 4504219210793536d921ee4e0b3058698c630bf4
27 +# Parent cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
28 +Fix build error on on ppc64le
29 +
30 +diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp
31 +--- a/source/common/param.cpp Mon May 21 18:42:29 2018 +0530
32 ++++ b/source/common/param.cpp Fri May 25 10:26:05 2018 +0530
33 +@@ -633,7 +633,7 @@
34 + if (bValueWasNull)
35 + p->cpuid = atobool(value);
36 + else
37 +- p->cpuid = parseCpuName(value, bError);
38 ++ p->cpuid = parseCpuName(value, bError, false);
39 + #endif
40 + }
41 + OPT("fps")
42
43 diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
44 index b7f4c3f2050..7f60a7f1134 100644
45 --- a/media-libs/x265/x265-2.8.ebuild
46 +++ b/media-libs/x265/x265-2.8.ebuild
47 @@ -31,6 +31,7 @@ PATCHES=(
48 "${FILESDIR}/arm.patch"
49 "${FILESDIR}/neon.patch"
50 "${FILESDIR}/ppc64.patch"
51 + "${FILESDIR}/non_x86.patch"
52 )
53
54 src_unpack() {