jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: switch to openssl

Browse Source 
include upstream openssl3 patch from ffmpeg/master to fix
the incompatible license check

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2022-08-28 13:02:52 +02:00
parent 4364bf5555
commit 347b78fd36
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/multimedia/ffmpeg/package.mk
View File

@ -5,7 +5,7 @@
PKG_NAME="ffmpeg" PKG_NAME="ffmpeg"
PKG_LICENSE="LGPLv2.1+" PKG_LICENSE="LGPLv2.1+"
PKG_SITE="https://ffmpeg.org" PKG_SITE="https://ffmpeg.org"
PKG_DEPENDS_TARGET="toolchain zlib bzip2 gnutls speex" PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex"
PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
PKG_BUILD_FLAGS="-gold" PKG_BUILD_FLAGS="-gold"
@ -147,7 +147,7 @@ configure_target() {
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--enable-gpl \ --enable-gpl \
--disable-version3 \ --enable-version3 \
--enable-logging \ --enable-logging \
--disable-doc \ --disable-doc \
${PKG_FFMPEG_DEBUG} \ ${PKG_FFMPEG_DEBUG} \
@ -164,7 +164,7 @@ configure_target() {
--disable-devices \ --disable-devices \
--enable-pthreads \ --enable-pthreads \
--enable-network \ --enable-network \
--enable-gnutls --disable-openssl \ --disable-gnutls --enable-openssl \
--disable-gray \ --disable-gray \
--enable-swscale-alpha \ --enable-swscale-alpha \
--disable-small \ --disable-small \

44
packages/multimedia/ffmpeg/patches/ffmpeg-openssl3.patch Normal file
View File

@ -0,0 +1,44 @@
From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001
From: Timo Rothenpieler <timo@rothenpieler.org>
Date: Tue, 7 Sep 2021 19:35:31 +0200
Subject: [PATCH] configure: account for openssl3 license change
---
configure | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c87a010387..ed7345b2c1 100755
--- a/configure
+++ b/configure
@@ -1765,7 +1765,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
EXTERNAL_LIBRARY_NONFREE_LIST="
decklink
libfdk_aac
- openssl
libtls
"
@@ -1857,6 +1856,7 @@ EXTERNAL_LIBRARY_LIST="
mediacodec
openal
opengl
+ openssl
pocketsphinx
vapoursynth
"
@@ -6572,7 +6572,10 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR
die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
enable omx
enabled omx && require_headers OMX_Core.h
-enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
+enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
+ { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
+ { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
+ check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
--
2.34.1