Merge pull request #96 from phunkyfish/ffmpeg44

Update FFmpeg to 4.4

CMakeLists.txt

@@ -104,6 +104,12 @@ endif()
 addon_version(inputstream.ffmpegdirect FFMPEGDIRECT)
 add_definitions(-DFFMPEGDIRECT_VERSION=${FFMPEGDIRECT_VERSION})
 
+if(CORE_SYSTEM_NAME STREQUAL windowsstore)
+  # TODO: This is required so FFmpeg's av_init_packet() deprecation does not break windows store builds
+  #       Once this function is no longer used this can and should be removed.
+  add_compile_options(/wd4996)
+endif()
+
 build_addon(inputstream.ffmpegdirect FFMPEGDIRECT DEPLIBS)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

depends/common/ffmpeg/01-ffmpeg-detect-openssl-windows.patch

@@ -1,7 +1,8 @@
-diff -ur FFmpeg-n4.3/configure FFmpeg-n4.3-01/configure
---- FFmpeg-n4.3/configure	2020-06-15 19:41:15.000000000 +0100
-+++ FFmpeg-n4.3-01/configure	2020-06-18 09:00:30.000000000 +0100
-@@ -6468,6 +6468,8 @@
+diff --git a/configure b/configure
+index d7a3f507e8..c3ebef869c 100755
+--- a/configure
++++ b/configure
+@@ -6529,6 +6529,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 ||

depends/common/ffmpeg/02-ffmpeg-zlib-config-conflict-windows.patch

@@ -1,7 +1,8 @@
-diff -ur FFmpeg-n4.3-01/configure FFmpeg-n4.3-02/configure
---- FFmpeg-n4.3-01/configure	2020-06-18 09:00:30.000000000 +0100
-+++ FFmpeg-n4.3-02/configure	2020-06-18 09:05:33.000000000 +0100
-@@ -7555,6 +7555,9 @@
+diff --git a/configure b/configure
+index c3ebef869c..56aa5281e1 100755
+--- a/configure
++++ b/configure
+@@ -7627,6 +7627,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \
 

depends/common/ffmpeg/03-ffmpeg-static-windows.patch

@@ -1,7 +1,8 @@
-diff -ur FFmpeg-n4.3-02/configure FFmpeg-n4.3-03/configure
---- FFmpeg-n4.3-02/configure	2020-06-18 09:05:33.000000000 +0100
-+++ FFmpeg-n4.3-03/configure	2020-06-18 09:12:22.000000000 +0100
-@@ -5401,6 +5401,8 @@
+diff --git a/configure b/configure
+index 56aa5281e1..ff0f47aaa1 100755
+--- a/configure
++++ b/configure
+@@ -5439,6 +5439,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"
@@ -10,7 +11,7 @@ diff -ur FFmpeg-n4.3-02/configure FFmpeg-n4.3-03/configure
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-@@ -5450,6 +5452,8 @@
+@@ -5488,6 +5490,8 @@ case $target_os in
          fi
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"

depends/common/ffmpeg/ffmpeg.sha256

@@ -1 +1 @@
-d9b650a5aaaa6e2907a5578135b715ca532896fe9a6dc7a823c25f89790ff1ed
+bea6d9f91cdbe4c5ad98e0878955ad5077df3883ef321fd4668ee1076de793fe

depends/common/ffmpeg/ffmpeg.txt

@@ -1 +1 @@
-ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.3.2.tar.gz
+ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.4.tar.gz

depends/common/ffmpeg/readme

@@ -2,4 +2,4 @@ All patches are required for windows and allow both static building
 and openssl. Note there is no impact to applying these to other platforms
 as openssl is not used (gnutls is used for non-windows).
 
-Last update and patches refreshed for FFmpeg-n4.2.2
+Last update and patches refreshed for FFmpeg-n4.4

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

@@ -1 +1 @@
-eaf9cf05806750061f911c5f5fbe084a8cf1093420bba09af2a893c567a8f947
+7b02240c5373c8ad4fe239c7b4018d1305dd6c64aefd4533313f8315bea1e100

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

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

inputstream.ffmpegdirect/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="1.20.1"
+  version="1.21.0"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>
@@ -26,6 +26,11 @@
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v1.21.0
+- Update: FFmpeg to 4.4
+- Update: Update gas preprocessor for ffmpeg4.4
+- Fixed: Ignore deprecation warning as errors for ffmpegs av_init_packet() for windowsstore
+
 v1.20.1
 - Fixed: release version fix
 

inputstream.ffmpegdirect/changelog.txt

@@ -1,3 +1,8 @@
+v1.21.0
+- Update: FFmpeg to 4.4
+- Update: Update gas preprocessor for ffmpeg4.4
+- Fixed: Ignore deprecation warning as errors for ffmpeg's av_init_packet() for windowsstore
+
 v1.20.1
 - Fixed: release version fix