| 1 |
commit: fe5c3453d9b642af66fbbc09c9b0e844034bc21f |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 25 05:02:39 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 25 05:09:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5c3453 |
| 7 |
|
| 8 |
media-libs/x265: sync live ebuild |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/725134 |
| 11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/x265/x265-9999.ebuild | 20 ++++++++++++++++---- |
| 15 |
1 file changed, 16 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild |
| 18 |
index 96fa1f5e454..736bea15bb8 100644 |
| 19 |
--- a/media-libs/x265/x265-9999.ebuild |
| 20 |
+++ b/media-libs/x265/x265-9999.ebuild |
| 21 |
@@ -88,6 +88,8 @@ x265_variant_src_configure() { |
| 22 |
-DENABLE_CLI=OFF |
| 23 |
-DMAIN12=ON |
| 24 |
) |
| 25 |
+ # disable altivec for 12bit build #607802#c5 |
| 26 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 27 |
;; |
| 28 |
"main10") |
| 29 |
mycmakeargs+=( |
| 30 |
@@ -96,6 +98,8 @@ x265_variant_src_configure() { |
| 31 |
-DENABLE_SHARED=OFF |
| 32 |
-DENABLE_CLI=OFF |
| 33 |
) |
| 34 |
+ # disable altivec for 10bit build #607802#c5 |
| 35 |
+ [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) |
| 36 |
;; |
| 37 |
"main") |
| 38 |
if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then |
| 39 |
@@ -112,6 +116,14 @@ x265_variant_src_configure() { |
| 40 |
-DLINKED_10BIT=$(usex 10bit) |
| 41 |
-DLINKED_12BIT=$(usex 12bit) |
| 42 |
) |
| 43 |
+ # we have to handle ppc here and not in multilib_src_configure |
| 44 |
+ # because we want those flags apply ONLY to "main" variant |
| 45 |
+ if [[ ${ABI} = ppc* ]] ; then |
| 46 |
+ myabicmakeargs+=( |
| 47 |
+ -DCPU_POWER8=$(usex power8 ON OFF) |
| 48 |
+ -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) |
| 49 |
+ ) |
| 50 |
+ fi |
| 51 |
fi |
| 52 |
;; |
| 53 |
*) |
| 54 |
@@ -152,10 +164,10 @@ multilib_src_configure() { |
| 55 |
supports_asm=no |
| 56 |
fi |
| 57 |
elif [[ ${ABI} = ppc* ]] ; then |
| 58 |
- myabicmakeargs+=( |
| 59 |
- -DCPU_POWER8=$(usex power8 ON OFF) |
| 60 |
- -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) |
| 61 |
- ) |
| 62 |
+ if use asm ; then |
| 63 |
+ ewarn "ppc64 uses altivec instead of asm, disabling it." |
| 64 |
+ supports_asm=no |
| 65 |
+ fi |
| 66 |
fi |
| 67 |
|
| 68 |
if [[ "${supports_asm}" = yes ]] && use asm ; then |
Archives