diff options
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-4.2.4.ebuild')
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.2.4.ebuild | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild index 6ef88dd7e711..a45e5850e1f7 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild @@ -71,7 +71,7 @@ fi # foo is added to IUSE. FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib # libavdevice options @@ -271,17 +271,9 @@ RDEPEND=" postproc? ( !media-libs/libpostproc ) " -# Crypto & co provider magic -# - libressl is a useflag meaning it should always favor libressl over openssl -# - libressl and openssl provide more features to ffmpeg than gnutls -# -# The ordering is thus: libressl > openssl > gnutls RDEPEND="${RDEPEND} - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) - ) " DEPEND="${RDEPEND} @@ -319,7 +311,7 @@ REQUIRED_USE=" ${CPU_REQUIRED_USE}" RESTRICT=" !test? ( test ) - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) " S=${WORKDIR}/${P/_/-} @@ -351,7 +343,7 @@ multilib_src_configure() { local myconf=( ${EXTRA_FFMPEG_CONF} ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) + use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) # Encoders @@ -387,10 +379,7 @@ multilib_src_configure() { myconf+=( $(use_enable ${i%:*} ${i#*:}) ) done - # Incompatible features: openssl or libressl and gnutls - if use libressl ; then - myconf+=( --disable-gnutls --disable-openssl ) - elif use openssl ; then + if use openssl ; then myconf+=( --disable-gnutls ) fi |