summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-02-17 11:56:01 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-02-17 12:10:05 +0100
commitd206b9487177999c596a0d3a141df257923812fd (patch)
tree7de248bc1211eec2cd02ebdd8a80ce9fe9341481
parentdev-libs/libmoe: remove old (diff)
downloadgentoo-d206b9487177999c596a0d3a141df257923812fd.tar.gz
gentoo-d206b9487177999c596a0d3a141df257923812fd.tar.bz2
gentoo-d206b9487177999c596a0d3a141df257923812fd.zip
media-libs/x265: Use a more complete match for ppc64.
Might help wrt https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--media-libs/x265/files/ppc64.patch15
-rw-r--r--media-libs/x265/x265-2.2.ebuild2
-rw-r--r--media-libs/x265/x265-2.3.ebuild2
-rw-r--r--media-libs/x265/x265-9999.ebuild2
4 files changed, 18 insertions, 3 deletions
diff --git a/media-libs/x265/files/ppc64.patch b/media-libs/x265/files/ppc64.patch
new file mode 100644
index 000000000000..f453c0de0a57
--- /dev/null
+++ b/media-libs/x265/files/ppc64.patch
@@ -0,0 +1,15 @@
+More complete ppc64 matches.
+
+Index: x265_2.2/source/CMakeLists.txt
+===================================================================
+--- x265_2.2.orig/source/CMakeLists.txt
++++ x265_2.2/source/CMakeLists.txt
+@@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd
+ set(ARM_ALIASES armv6l armv6j armv7l armv7a)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+-set(POWER_ALIASES ppc64 ppc64le)
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+ if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
+ set(X86 1)
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index 18162f242fb9..c6ca8a680315 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" )
+PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
src_unpack() {
if [[ ${PV} = 9999* ]]; then
diff --git a/media-libs/x265/x265-2.3.ebuild b/media-libs/x265/x265-2.3.ebuild
index 49b07f692b3b..76189dc8583a 100644
--- a/media-libs/x265/x265-2.3.ebuild
+++ b/media-libs/x265/x265-2.3.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" )
+PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
src_unpack() {
if [[ ${PV} = 9999* ]]; then
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 69300360d517..05efee2ad987 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
-PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" )
+PATCHES=( "${FILESDIR}/arm.patch" "${FILESDIR}/neon.patch" "${FILESDIR}/ppc64.patch" )
src_unpack() {
if [[ ${PV} = 9999* ]]; then