commit: d206b9487177999c596a0d3a141df257923812fd Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Feb 17 10:56:01 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Feb 17 11:10:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d206b948
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 media-libs/x265/files/ppc64.patch | 15 +++++++++++++++ media-libs/x265/x265-2.2.ebuild | 2 +- media-libs/x265/x265-2.3.ebuild | 2 +- media-libs/x265/x265-9999.ebuild | 2 +- 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 0000000000..f453c0de0a --- /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 18162f242f..c6ca8a6803 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 49b07f692b..76189dc858 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 69300360d5..05efee2ad9 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
