| 1 |
commit: f4b9781a286d6d12811fc3dd8329492bba49b988 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 5 15:03:05 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 5 15:19:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b9781a |
| 7 |
|
| 8 |
media-libs/x265: forward port ppc changes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/x265/x265-3.4.ebuild | 22 +++++++++++----------- |
| 14 |
media-libs/x265/x265-9999.ebuild | 22 +++++++++++----------- |
| 15 |
2 files changed, 22 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild |
| 18 |
index f973a0196a7..e40ca0e0876 100644 |
| 19 |
--- a/media-libs/x265/x265-3.4.ebuild |
| 20 |
+++ b/media-libs/x265/x265-3.4.ebuild |
| 21 |
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home" |
| 22 |
LICENSE="GPL-2" |
| 23 |
# subslot = libx265 soname |
| 24 |
SLOT="0/192" |
| 25 |
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" |
| 26 |
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" |
| 27 |
RESTRICT="!test? ( test )" |
| 28 |
|
| 29 |
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" |
| 30 |
@@ -90,10 +90,8 @@ x265_variant_src_configure() { |
| 31 |
# 589674 |
| 32 |
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 33 |
fi |
| 34 |
- if [[ ${ABI} = ppc64 ]] ; then |
| 35 |
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 |
| 36 |
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) |
| 37 |
- fi |
| 38 |
+ # disable altivec for 12bit build #607802#c5 |
| 39 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 40 |
;; |
| 41 |
"main10") |
| 42 |
mycmakeargs+=( |
| 43 |
@@ -109,10 +107,8 @@ x265_variant_src_configure() { |
| 44 |
# 589674 |
| 45 |
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 46 |
fi |
| 47 |
- if [[ ${ABI} = ppc64 ]] ; then |
| 48 |
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 |
| 49 |
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) |
| 50 |
- fi |
| 51 |
+ # disable altivec for 10bit build #607802#c5 |
| 52 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 53 |
;; |
| 54 |
"main") |
| 55 |
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then |
| 56 |
@@ -129,6 +125,12 @@ x265_variant_src_configure() { |
| 57 |
-DLINKED_10BIT=$(usex 10bit) |
| 58 |
-DLINKED_12BIT=$(usex 12bit) |
| 59 |
) |
| 60 |
+ if [[ ${ABI} = ppc* ]] ; then |
| 61 |
+ myabicmakeargs+=( |
| 62 |
+ -DCPU_POWER8=$(usex power8 ON OFF) |
| 63 |
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) |
| 64 |
+ ) |
| 65 |
+ fi |
| 66 |
fi |
| 67 |
;; |
| 68 |
*) |
| 69 |
@@ -144,8 +146,6 @@ multilib_src_configure() { |
| 70 |
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") |
| 71 |
-DENABLE_PIC=ON |
| 72 |
-DENABLE_LIBNUMA=$(usex numa ON OFF) |
| 73 |
- -DCPU_POWER8=$(usex power8 ON OFF) |
| 74 |
- -DENABLE_ALTIVEC=$(usex power8 ON OFF) |
| 75 |
-DLIB_INSTALL_DIR="$(get_libdir)" |
| 76 |
) |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild |
| 80 |
index f973a0196a7..e40ca0e0876 100644 |
| 81 |
--- a/media-libs/x265/x265-9999.ebuild |
| 82 |
+++ b/media-libs/x265/x265-9999.ebuild |
| 83 |
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home" |
| 84 |
LICENSE="GPL-2" |
| 85 |
# subslot = libx265 soname |
| 86 |
SLOT="0/192" |
| 87 |
-IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" |
| 88 |
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" |
| 89 |
RESTRICT="!test? ( test )" |
| 90 |
|
| 91 |
RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" |
| 92 |
@@ -90,10 +90,8 @@ x265_variant_src_configure() { |
| 93 |
# 589674 |
| 94 |
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 95 |
fi |
| 96 |
- if [[ ${ABI} = ppc64 ]] ; then |
| 97 |
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 |
| 98 |
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) |
| 99 |
- fi |
| 100 |
+ # disable altivec for 12bit build #607802#c5 |
| 101 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 102 |
;; |
| 103 |
"main10") |
| 104 |
mycmakeargs+=( |
| 105 |
@@ -109,10 +107,8 @@ x265_variant_src_configure() { |
| 106 |
# 589674 |
| 107 |
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 108 |
fi |
| 109 |
- if [[ ${ABI} = ppc64 ]] ; then |
| 110 |
- # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 |
| 111 |
- mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) |
| 112 |
- fi |
| 113 |
+ # disable altivec for 10bit build #607802#c5 |
| 114 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 115 |
;; |
| 116 |
"main") |
| 117 |
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then |
| 118 |
@@ -129,6 +125,12 @@ x265_variant_src_configure() { |
| 119 |
-DLINKED_10BIT=$(usex 10bit) |
| 120 |
-DLINKED_12BIT=$(usex 12bit) |
| 121 |
) |
| 122 |
+ if [[ ${ABI} = ppc* ]] ; then |
| 123 |
+ myabicmakeargs+=( |
| 124 |
+ -DCPU_POWER8=$(usex power8 ON OFF) |
| 125 |
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) |
| 126 |
+ ) |
| 127 |
+ fi |
| 128 |
fi |
| 129 |
;; |
| 130 |
*) |
| 131 |
@@ -144,8 +146,6 @@ multilib_src_configure() { |
| 132 |
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") |
| 133 |
-DENABLE_PIC=ON |
| 134 |
-DENABLE_LIBNUMA=$(usex numa ON OFF) |
| 135 |
- -DCPU_POWER8=$(usex power8 ON OFF) |
| 136 |
- -DENABLE_ALTIVEC=$(usex power8 ON OFF) |
| 137 |
-DLIB_INSTALL_DIR="$(get_libdir)" |
| 138 |
) |
Archives