commit: b203a349df422c1d4393bb37a73e29209b2c9101
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 3 10:06:11 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 3 10:06:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b203a349
media-video/ffmpeg: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-4.2.4.ebuild | 19 ++++---------------
media-video/ffmpeg/ffmpeg-4.3.1.ebuild | 19 ++++---------------
media-video/ffmpeg/ffmpeg-4.3.2.ebuild | 19 ++++---------------
media-video/ffmpeg/ffmpeg-4.4.ebuild | 19 ++++---------------
media-video/ffmpeg/ffmpeg-9999.ebuild | 19 ++++---------------
5 files changed, 20 insertions(+), 75 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
index 6ef88dd7e71..a45e5850e1f 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
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index aa4da5b2e28..ca7abdf9244 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -68,7 +68,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 vulkan
X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
# libavdevice options
@@ -270,17 +270,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=( )
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
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
index 65751052985..f2ad8797302 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
@@ -68,7 +68,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 vulkan
X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
# libavdevice options
@@ -270,17 +270,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/_/-}
@@ -350,7 +342,7 @@ multilib_src_configure() {
local myconf=( )
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
@@ -386,10 +378,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
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild
b/media-video/ffmpeg/ffmpeg-4.4.ebuild
index 7ab4dcdeb81..f1e2939f625 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -68,7 +68,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 vulkan
X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
# libavdevice options
@@ -270,17 +270,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/_/-}
@@ -348,7 +340,7 @@ multilib_src_configure() {
local myconf=( )
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
@@ -384,10 +376,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
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 2dab02943ba..65f9e0ca8ae 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -68,7 +68,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 vulkan
X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
# libavdevice options
@@ -270,17 +270,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/_/-}
@@ -348,7 +340,7 @@ multilib_src_configure() {
local myconf=( )
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
@@ -384,10 +376,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
