[Buildroot] [PATCH 1/1] package/ffmpeg: needs libopenssl, not libressl

[Buildroot] [PATCH 1/1] package/ffmpeg: needs libopenssl, not libressl

[Bernd Kuhls]

Buildroot bumped the package from 7.0.3 to 9.0.2 with commit
acda85c85827c123a5238f3628009d8ae3ec0735.

The bump includes upstream commit
https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/0486ad61ceb71b7a45976e6e45a4d2a2813aef75
which was first released in version 8.1 and forces the usage of
libopenssl due to missing APIs in openssl forks like libressl.

Fixes:
https://autobuild.buildroot.org/results/31b7a6c2f1296edd0ff23657f92dd6e8854c32c2/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/ffmpeg/Config.in | 3 +++
 package/ffmpeg/ffmpeg.mk | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index fce2fef993..f4b5368cd3 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -17,6 +17,9 @@ menuconfig BR2_PACKAGE_FFMPEG
 	bool "ffmpeg"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if \
+		BR2_PACKAGE_OPENSSL && \
+		(!BR2_PACKAGE_FFMPEG_GPL || BR2_PACKAGE_FFMPEG_NONFREE)
 	help
 	  FFmpeg is a complete, cross-platform solution to record,
 	  convert and stream audio and video.
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index cda7236eb4..953c733961 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -244,7 +244,7 @@ FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
 FFMPEG_DEPENDENCIES += gnutls
 else
 FFMPEG_CONF_OPTS += --disable-gnutls
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 # openssl isn't license compatible with GPL
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
 FFMPEG_CONF_OPTS += --disable-openssl
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/ffmpeg: needs libopenssl, not libressl

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Buildroot bumped the package from 7.0.3 to 9.0.2 with commit
 > acda85c85827c123a5238f3628009d8ae3ec0735.

 > The bump includes upstream commit
 > https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/0486ad61ceb71b7a45976e6e45a4d2a2813aef75
 > which was first released in version 8.1 and forces the usage of
 > libopenssl due to missing APIs in openssl forks like libressl.

 > Fixes:
 > https://autobuild.buildroot.org/results/31b7a6c2f1296edd0ff23657f92dd6e8854c32c2/

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 > ---
 >  package/ffmpeg/Config.in | 3 +++
 >  package/ffmpeg/ffmpeg.mk | 2 +-
 >  2 files changed, 4 insertions(+), 1 deletion(-)

 > diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
 > index fce2fef993..f4b5368cd3 100644
 > --- a/package/ffmpeg/Config.in
 > +++ b/package/ffmpeg/Config.in
 > @@ -17,6 +17,9 @@ menuconfig BR2_PACKAGE_FFMPEG
 >  	bool "ffmpeg"
 >  	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 >  	depends on BR2_TOOLCHAIN_HAS_THREADS
 > +	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if \
 > +		BR2_PACKAGE_OPENSSL && \
 > +		(!BR2_PACKAGE_FFMPEG_GPL || BR2_PACKAGE_FFMPEG_NONFREE)

This is not really needed (E.G. we do not do it for gnutls), so I've
dropped the select and applied, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot