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

diff --git a/media-libs/x265/files/ppc64.patch b/media-libs/x265/files/ppc64.patch
new file mode 100644 (file)
index 0000000..f453c0d
--- /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 18162f242fb93e3f36c4b1b113011822960caf92..c6ca8a680315a855f5b3e8f32b426a0944f0296f 100644 (file)
--- 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 49b07f692b3bfb72cec05dc9d5d549218be8ca24..76189dc8583a719bd8b938c3e67c5a88179a47bb 100644 (file)
--- 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 69300360d517ba5c0136599f5b6726968ba55c50..05efee2ad987d630783b860238f717cbce1f8d08 100644 (file)
--- 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