diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-07-04 14:05:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-07-04 14:05:23 +0100 |
commit | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (patch) | |
tree | 43b0410e62aba677b4b256bc3ffe3fd333d28dbe /media-video/ffmpeg/ffmpeg-9999.ebuild | |
parent | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (diff) |
gentoo resync : 04.07.2020
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-9999.ebuild')
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 7bd989acf33e..88bedca9d52d 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -67,7 +67,7 @@ fi # or $(use_enable foo foo) if no :bar is set. # foo is added to IUSE. FFMPEG_FLAG_MAP=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib @@ -77,7 +77,7 @@ FFMPEG_FLAG_MAP=( # indevs libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec @@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=( FFMPEG_ENCODER_FLAG_MAP=( amrenc:libvo-amrwbenc mp3:libmp3lame kvazaar:libkvazaar libaom - openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame + openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid ) @@ -185,6 +185,7 @@ RDEPEND=" kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) + rav1e? ( media-video/rav1e:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] @@ -344,7 +345,7 @@ src_prepare() { } multilib_src_configure() { - local myconf=( ${EXTRA_FFMPEG_CONF} ) + local myconf=( ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) @@ -392,7 +393,7 @@ multilib_src_configure() { # (temporarily) disable non-multilib deps if ! multilib_is_native_abi; then - for i in frei0r libzmq ; do + for i in frei0r librav1e libzmq ; do myconf+=( --disable-${i} ) done fi @@ -474,7 +475,8 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --optflags="${CFLAGS}" \ $(use_enable static-libs static) \ - "${myconf[@]}" + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die |