Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
Date: Mon, 03 May 2021 10:07:04
Message-Id: 1620036371.b203a349df422c1d4393bb37a73e29209b2c9101.zlogene@gentoo
1 commit: b203a349df422c1d4393bb37a73e29209b2c9101
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 10:06:11 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 10:06:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b203a349
7
8 media-video/ffmpeg: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 media-video/ffmpeg/ffmpeg-4.2.4.ebuild | 19 ++++---------------
14 media-video/ffmpeg/ffmpeg-4.3.1.ebuild | 19 ++++---------------
15 media-video/ffmpeg/ffmpeg-4.3.2.ebuild | 19 ++++---------------
16 media-video/ffmpeg/ffmpeg-4.4.ebuild | 19 ++++---------------
17 media-video/ffmpeg/ffmpeg-9999.ebuild | 19 ++++---------------
18 5 files changed, 20 insertions(+), 75 deletions(-)
19
20 diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
21 index 6ef88dd7e71..a45e5850e1f 100644
22 --- a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
23 +++ b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
24 @@ -71,7 +71,7 @@ fi
25 # foo is added to IUSE.
26 FFMPEG_FLAG_MAP=(
27 +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
28 - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
29 + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
30 openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
31 X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
32 # libavdevice options
33 @@ -271,17 +271,9 @@ RDEPEND="
34 postproc? ( !media-libs/libpostproc )
35 "
36
37 -# Crypto & co provider magic
38 -# - libressl is a useflag meaning it should always favor libressl over openssl
39 -# - libressl and openssl provide more features to ffmpeg than gnutls
40 -#
41 -# The ordering is thus: libressl > openssl > gnutls
42 RDEPEND="${RDEPEND}
43 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
44 - !libressl? (
45 openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
46 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
47 - )
48 "
49
50 DEPEND="${RDEPEND}
51 @@ -319,7 +311,7 @@ REQUIRED_USE="
52 ${CPU_REQUIRED_USE}"
53 RESTRICT="
54 !test? ( test )
55 - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
56 + gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
57 "
58
59 S=${WORKDIR}/${P/_/-}
60 @@ -351,7 +343,7 @@ multilib_src_configure() {
61 local myconf=( ${EXTRA_FFMPEG_CONF} )
62
63 local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
64 - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
65 + use openssl && myconf+=( --enable-nonfree )
66 use samba && myconf+=( --enable-version3 )
67
68 # Encoders
69 @@ -387,10 +379,7 @@ multilib_src_configure() {
70 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
71 done
72
73 - # Incompatible features: openssl or libressl and gnutls
74 - if use libressl ; then
75 - myconf+=( --disable-gnutls --disable-openssl )
76 - elif use openssl ; then
77 + if use openssl ; then
78 myconf+=( --disable-gnutls )
79 fi
80
81
82 diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
83 index aa4da5b2e28..ca7abdf9244 100644
84 --- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
85 +++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
86 @@ -68,7 +68,7 @@ fi
87 # foo is added to IUSE.
88 FFMPEG_FLAG_MAP=(
89 +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
90 - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
91 + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
92 openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
93 X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
94 # libavdevice options
95 @@ -270,17 +270,9 @@ RDEPEND="
96 postproc? ( !media-libs/libpostproc )
97 "
98
99 -# Crypto & co provider magic
100 -# - libressl is a useflag meaning it should always favor libressl over openssl
101 -# - libressl and openssl provide more features to ffmpeg than gnutls
102 -#
103 -# The ordering is thus: libressl > openssl > gnutls
104 RDEPEND="${RDEPEND}
105 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
106 - !libressl? (
107 openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
108 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
109 - )
110 "
111
112 DEPEND="${RDEPEND}
113 @@ -319,7 +311,7 @@ REQUIRED_USE="
114 ${CPU_REQUIRED_USE}"
115 RESTRICT="
116 !test? ( test )
117 - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
118 + gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
119 "
120
121 S=${WORKDIR}/${P/_/-}
122 @@ -351,7 +343,7 @@ multilib_src_configure() {
123 local myconf=( )
124
125 local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
126 - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
127 + use openssl && myconf+=( --enable-nonfree )
128 use samba && myconf+=( --enable-version3 )
129
130 # Encoders
131 @@ -387,10 +379,7 @@ multilib_src_configure() {
132 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
133 done
134
135 - # Incompatible features: openssl or libressl and gnutls
136 - if use libressl ; then
137 - myconf+=( --disable-gnutls --disable-openssl )
138 - elif use openssl ; then
139 + if use openssl ; then
140 myconf+=( --disable-gnutls )
141 fi
142
143
144 diff --git a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
145 index 65751052985..f2ad8797302 100644
146 --- a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
147 +++ b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
148 @@ -68,7 +68,7 @@ fi
149 # foo is added to IUSE.
150 FFMPEG_FLAG_MAP=(
151 +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
152 - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
153 + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
154 openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
155 X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
156 # libavdevice options
157 @@ -270,17 +270,9 @@ RDEPEND="
158 postproc? ( !media-libs/libpostproc )
159 "
160
161 -# Crypto & co provider magic
162 -# - libressl is a useflag meaning it should always favor libressl over openssl
163 -# - libressl and openssl provide more features to ffmpeg than gnutls
164 -#
165 -# The ordering is thus: libressl > openssl > gnutls
166 RDEPEND="${RDEPEND}
167 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
168 - !libressl? (
169 openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
170 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
171 - )
172 "
173
174 DEPEND="${RDEPEND}
175 @@ -319,7 +311,7 @@ REQUIRED_USE="
176 ${CPU_REQUIRED_USE}"
177 RESTRICT="
178 !test? ( test )
179 - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
180 + gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
181 "
182
183 S=${WORKDIR}/${P/_/-}
184 @@ -350,7 +342,7 @@ multilib_src_configure() {
185 local myconf=( )
186
187 local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
188 - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
189 + use openssl && myconf+=( --enable-nonfree )
190 use samba && myconf+=( --enable-version3 )
191
192 # Encoders
193 @@ -386,10 +378,7 @@ multilib_src_configure() {
194 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
195 done
196
197 - # Incompatible features: openssl or libressl and gnutls
198 - if use libressl ; then
199 - myconf+=( --disable-gnutls --disable-openssl )
200 - elif use openssl ; then
201 + if use openssl ; then
202 myconf+=( --disable-gnutls )
203 fi
204
205
206 diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
207 index 7ab4dcdeb81..f1e2939f625 100644
208 --- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
209 +++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
210 @@ -68,7 +68,7 @@ fi
211 # foo is added to IUSE.
212 FFMPEG_FLAG_MAP=(
213 +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
214 - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
215 + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
216 openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
217 X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
218 # libavdevice options
219 @@ -270,17 +270,9 @@ RDEPEND="
220 postproc? ( !media-libs/libpostproc )
221 "
222
223 -# Crypto & co provider magic
224 -# - libressl is a useflag meaning it should always favor libressl over openssl
225 -# - libressl and openssl provide more features to ffmpeg than gnutls
226 -#
227 -# The ordering is thus: libressl > openssl > gnutls
228 RDEPEND="${RDEPEND}
229 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
230 - !libressl? (
231 openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
232 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
233 - )
234 "
235
236 DEPEND="${RDEPEND}
237 @@ -319,7 +311,7 @@ REQUIRED_USE="
238 ${CPU_REQUIRED_USE}"
239 RESTRICT="
240 !test? ( test )
241 - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
242 + gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
243 "
244
245 S=${WORKDIR}/${P/_/-}
246 @@ -348,7 +340,7 @@ multilib_src_configure() {
247 local myconf=( )
248
249 local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
250 - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
251 + use openssl && myconf+=( --enable-nonfree )
252 use samba && myconf+=( --enable-version3 )
253
254 # Encoders
255 @@ -384,10 +376,7 @@ multilib_src_configure() {
256 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
257 done
258
259 - # Incompatible features: openssl or libressl and gnutls
260 - if use libressl ; then
261 - myconf+=( --disable-gnutls --disable-openssl )
262 - elif use openssl ; then
263 + if use openssl ; then
264 myconf+=( --disable-gnutls )
265 fi
266
267
268 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
269 index 2dab02943ba..65f9e0ca8ae 100644
270 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild
271 +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
272 @@ -68,7 +68,7 @@ fi
273 # foo is added to IUSE.
274 FFMPEG_FLAG_MAP=(
275 +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
276 - +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
277 + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
278 openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
279 X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
280 # libavdevice options
281 @@ -270,17 +270,9 @@ RDEPEND="
282 postproc? ( !media-libs/libpostproc )
283 "
284
285 -# Crypto & co provider magic
286 -# - libressl is a useflag meaning it should always favor libressl over openssl
287 -# - libressl and openssl provide more features to ffmpeg than gnutls
288 -#
289 -# The ordering is thus: libressl > openssl > gnutls
290 RDEPEND="${RDEPEND}
291 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
292 - !libressl? (
293 openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
294 !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
295 - )
296 "
297
298 DEPEND="${RDEPEND}
299 @@ -319,7 +311,7 @@ REQUIRED_USE="
300 ${CPU_REQUIRED_USE}"
301 RESTRICT="
302 !test? ( test )
303 - gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
304 + gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
305 "
306
307 S=${WORKDIR}/${P/_/-}
308 @@ -348,7 +340,7 @@ multilib_src_configure() {
309 local myconf=( )
310
311 local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
312 - use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
313 + use openssl && myconf+=( --enable-nonfree )
314 use samba && myconf+=( --enable-version3 )
315
316 # Encoders
317 @@ -384,10 +376,7 @@ multilib_src_configure() {
318 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
319 done
320
321 - # Incompatible features: openssl or libressl and gnutls
322 - if use libressl ; then
323 - myconf+=( --disable-gnutls --disable-openssl )
324 - elif use openssl ; then
325 + if use openssl ; then
326 myconf+=( --disable-gnutls )
327 fi
Report Message
Find on MARC Find on Google Groups