| 1 |
commit: 1901df3ada63cbf0c450c31cff1d3dff5913d400 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 19 16:51:58 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 19 16:52:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1901df3a |
| 7 |
|
| 8 |
media-video/ffmpeg: Drop sofalizer useflag in live ebuild, fixes bug #621984. |
| 9 |
|
| 10 |
Rework CPU flags mapping to always force disabling those unwanted. Despite Carl saying it is useless, it is simpler and more useful for us to track configure changes and avoid things like bug #621728 to happen. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
|
| 14 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 43 ++++++++++------------------------- |
| 15 |
1 file changed, 12 insertions(+), 31 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 18 |
index dd48152fdd8..ac6852f0da6 100644 |
| 19 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 20 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 21 |
@@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=( |
| 22 |
# libavfilter options |
| 23 |
bs2b:libbs2b chromaprint flite:libflite frei0r |
| 24 |
fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype |
| 25 |
- rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg |
| 26 |
+ rubberband:librubberband zeromq:libzmq zimg:libzimg |
| 27 |
# libswresample options |
| 28 |
libsoxr |
| 29 |
# Threads; we only support pthread for now but ffmpeg supports more |
| 30 |
@@ -120,7 +120,7 @@ ARM_CPU_REQUIRED_USE=" |
| 31 |
cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) |
| 32 |
cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) |
| 33 |
" |
| 34 |
-MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu ) |
| 35 |
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) |
| 36 |
PPC_CPU_FEATURES=( altivec ) |
| 37 |
X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) |
| 38 |
X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) |
| 39 |
@@ -142,30 +142,20 @@ X86_CPU_REQUIRED_USE=" |
| 40 |
cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) |
| 41 |
" |
| 42 |
|
| 43 |
+CPU_FEATURES_MAP=( |
| 44 |
+ ${ARM_CPU_FEATURES[@]} |
| 45 |
+ ${MIPS_CPU_FEATURES[@]} |
| 46 |
+ ${PPC_CPU_FEATURES[@]} |
| 47 |
+ ${X86_CPU_FEATURES[@]} |
| 48 |
+) |
| 49 |
IUSE="${IUSE} |
| 50 |
- ${ARM_CPU_FEATURES[@]%:*} |
| 51 |
- ${MIPS_CPU_FEATURES[@]%:*} |
| 52 |
- ${PPC_CPU_FEATURES[@]%:*} |
| 53 |
- ${X86_CPU_FEATURES[@]%:*} |
| 54 |
-" |
| 55 |
+ ${CPU_FEATURES_MAP[@]%:*}" |
| 56 |
|
| 57 |
CPU_REQUIRED_USE=" |
| 58 |
${ARM_CPU_REQUIRED_USE} |
| 59 |
${X86_CPU_REQUIRED_USE} |
| 60 |
" |
| 61 |
|
| 62 |
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to |
| 63 |
-# $(tc-arch). |
| 64 |
-CPU_FEATURES_MAP=" |
| 65 |
- arm:ARM |
| 66 |
- arm64:ARM |
| 67 |
- mips:MIPS |
| 68 |
- ppc:PPC |
| 69 |
- ppc64:PPC |
| 70 |
- x86:X86 |
| 71 |
- amd64:X86 |
| 72 |
-" |
| 73 |
- |
| 74 |
FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) |
| 75 |
IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" |
| 76 |
|
| 77 |
@@ -235,10 +225,6 @@ RDEPEND=" |
| 78 |
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) |
| 79 |
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) |
| 80 |
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) |
| 81 |
- sofalizer? ( |
| 82 |
- >=sci-libs/netcdf-4.3.2-r1[hdf5] |
| 83 |
- >=sci-libs/hdf5-1.8.18[hl] |
| 84 |
- ) |
| 85 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
| 86 |
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) |
| 87 |
svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) |
| 88 |
@@ -355,19 +341,14 @@ multilib_src_configure() { |
| 89 |
|
| 90 |
# (temporarily) disable non-multilib deps |
| 91 |
if ! multilib_is_native_abi; then |
| 92 |
- for i in frei0r netcdf libzmq ; do |
| 93 |
+ for i in frei0r libzmq ; do |
| 94 |
myconf+=( --disable-${i} ) |
| 95 |
done |
| 96 |
fi |
| 97 |
|
| 98 |
# CPU features |
| 99 |
- for i in ${CPU_FEATURES_MAP} ; do |
| 100 |
- if [ "$(tc-arch)" = "${i%:*}" ] ; then |
| 101 |
- local var="${i#*:}_CPU_FEATURES[@]" |
| 102 |
- for j in ${!var} ; do |
| 103 |
- use ${j%:*} || myconf+=( --disable-${j#*:} ) |
| 104 |
- done |
| 105 |
- fi |
| 106 |
+ for i in "${CPU_FEATURES_MAP[@]}" ; do |
| 107 |
+ use ${i%:*} || myconf+=( --disable-${i#*:} ) |
| 108 |
done |
| 109 |
|
| 110 |
if use pic ; then |
Archives