Merge pull request #240 from AlwinEsch/ffmpeg6-updatessl

Update to FFmpeg 6.0 including OpenSSL versions for Windows builds

depends/common/ffmpeg/01-ffmpeg-detect-openssl-windows.patch → depends/common/ffmpeg/0001-ffmpeg-windows-configure-detect-openssl.patch

@@ -1,13 +1,25 @@
+From 08ae41e824e04ab48eafde763c72d1ff3e878a41 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <[email protected]>
+Date: Sat, 10 Apr 2021 08:16:11 -0700
+Subject: [PATCH 1/4] ffmpeg: windows: configure: detect openssl
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
 diff --git a/configure b/configure
-index d7a3f507e8..c3ebef869c 100755
+index d7a3f507e8..4b85e881b1 100755
 --- a/configure
 +++ b/configure
-@@ -6529,6 +6529,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+@@ -6728,6 +6728,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-+                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lz -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
++                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
 +                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
                                 die "ERROR: openssl not found"; }
  enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
  enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
+-- 
+2.29.2
+

depends/common/ffmpeg/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch

@@ -0,0 +1,26 @@
+From 1e57e7f49f1a74ee11d3c8dd5d407f35eecd5167 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <[email protected]>
+Date: Sat, 10 Apr 2021 08:16:48 -0700
+Subject: [PATCH 2/4] ffmpeg: windows: configure: fix zlib conflict
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 4b85e881b1..da457705d1 100755
+--- a/configure
++++ b/configure
+@@ -7825,6 +7825,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
+ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
+                                      $CONFIG_EXTRA      \
+
++echo "#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H == 0" >> $TMPH
++echo "#undef HAVE_UNISTD_H" >> $TMPH
++echo "#endif" >> $TMPH
+ echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
+
+ # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
+-- 
+2.29.2
+

depends/common/ffmpeg/03-ffmpeg-static-windows.patch → depends/common/ffmpeg/0003-ffmpeg-windows-configure-allow-building-static.patch

@@ -1,8 +1,17 @@
+From efb771d944e96bcbb24635bcae99a43dffab262e Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <[email protected]>
+Date: Sat, 10 Apr 2021 08:17:11 -0700
+Subject: [PATCH 3/4] ffmpeg: windows: configure: allow building static
+
+---
+ configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
 diff --git a/configure b/configure
-index 56aa5281e1..ff0f47aaa1 100755
+index da457705d1..e3a8f45ff4 100755
 --- a/configure
 +++ b/configure
-@@ -5439,6 +5439,8 @@ case $target_os in
+@@ -5566,6 +5566,8 @@ case $target_os in
          enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"
@@ -11,7 +20,7 @@ index 56aa5281e1..ff0f47aaa1 100755
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-@@ -5488,6 +5490,8 @@ case $target_os in
+@@ -5615,6 +5617,8 @@ case $target_os in
          fi
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"
@@ -20,3 +29,6 @@ index 56aa5281e1..ff0f47aaa1 100755
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
+-- 
+2.29.2
+

depends/common/ffmpeg/ffmpeg.sha256

@@ -1 +1 @@
-ea84f1f7f72d0d7c4c2cbb6b4f2170b908a090448fc1834353a9f5fbf7c31fb4
+9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e

depends/common/ffmpeg/ffmpeg.txt

@@ -1 +1 @@
-ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n5.1.2.tar.gz
+ffmpeg https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n6.0.tar.gz

depends/common/gas-preprocessor/gas-preprocessor.sha256

@@ -1 +1 @@
-7b02240c5373c8ad4fe239c7b4018d1305dd6c64aefd4533313f8315bea1e100
+4800c17dd529815ea73aee9658c3682f69bf45518d24408b5a58d678fdc94b94

depends/common/gas-preprocessor/gas-preprocessor.txt

@@ -1 +1 @@
-gas-preprocessor https://github.com/FFmpeg/gas-preprocessor/archive/4daa611556a0558dfe537b4f7ad80f7e50a079c1.tar.gz
+gas-preprocessor https://github.com/FFmpeg/gas-preprocessor/archive/9309c67acb535ca6248f092e96131d8eb07eefc1.tar.gz