diff options
| author | thexai <58434170+thexai@users.noreply.github.com> | 2022-10-30 19:32:14 +0100 |
|---|---|---|
| committer | Vasyl Gello <vasek.gello@gmail.com> | 2023-01-06 10:40:12 +0200 |
| commit | ddd8da9aae81a803aa3ada80d5e131ad034f369a (patch) | |
| tree | 4a38ec043fba3e1a6eade4941d3229b2ee043ebc /tools/buildsteps | |
| parent | 85e1c52ec2edad81f44f19da00c97cd69f6bbabc (diff) | |
Updates FFmpeg Windows patches
Diffstat (limited to 'tools/buildsteps')
4 files changed, 7 insertions, 7 deletions
diff --git a/tools/buildsteps/windows/patches/0001-ffmpeg-windows-configure-detect-openssl.patch b/tools/buildsteps/windows/patches/0001-ffmpeg-windows-configure-detect-openssl.patch index b8e5b2f7e1..29f5a83e16 100644 --- a/tools/buildsteps/windows/patches/0001-ffmpeg-windows-configure-detect-openssl.patch +++ b/tools/buildsteps/windows/patches/0001-ffmpeg-windows-configure-detect-openssl.patch @@ -11,7 +11,7 @@ diff --git a/configure b/configure index d7a3f507e8..4b85e881b1 100755 --- a/configure +++ b/configure -@@ -6530,6 +6530,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 || diff --git a/tools/buildsteps/windows/patches/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch b/tools/buildsteps/windows/patches/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch index 064be1ddd3..2a7c8f6897 100644 --- a/tools/buildsteps/windows/patches/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch +++ b/tools/buildsteps/windows/patches/0002-ffmpeg-windows-configure-fix-zlib-conflict.patch @@ -11,16 +11,16 @@ diff --git a/configure b/configure index 4b85e881b1..da457705d1 100755 --- a/configure +++ b/configure -@@ -7627,6 +7627,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ +@@ -7825,6 +7825,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ + print_config CONFIG_ "$config_files" $CONFIG_LIST \ $CONFIG_EXTRA \ - $ALL_COMPONENTS \ +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 - echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak + # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. -- 2.29.2 diff --git a/tools/buildsteps/windows/patches/0003-ffmpeg-windows-configure-allow-building-static.patch b/tools/buildsteps/windows/patches/0003-ffmpeg-windows-configure-allow-building-static.patch index bbb3e0a9f6..0dee8c9d04 100644 --- a/tools/buildsteps/windows/patches/0003-ffmpeg-windows-configure-allow-building-static.patch +++ b/tools/buildsteps/windows/patches/0003-ffmpeg-windows-configure-allow-building-static.patch @@ -11,7 +11,7 @@ diff --git a/configure b/configure index da457705d1..e3a8f45ff4 100755 --- a/configure +++ b/configure -@@ -5440,6 +5440,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" @@ -20,7 +20,7 @@ index da457705d1..e3a8f45ff4 100755 SLIBPREF="" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' -@@ -5489,6 +5491,8 @@ case $target_os in +@@ -5615,6 +5617,8 @@ case $target_os in fi enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" diff --git a/tools/buildsteps/windows/patches/0004-ffmpeg-windows-configure-detect-libdav1d.patch b/tools/buildsteps/windows/patches/0004-ffmpeg-windows-configure-detect-libdav1d.patch index 617c87a8b0..e5a90d090a 100644 --- a/tools/buildsteps/windows/patches/0004-ffmpeg-windows-configure-detect-libdav1d.patch +++ b/tools/buildsteps/windows/patches/0004-ffmpeg-windows-configure-detect-libdav1d.patch @@ -11,7 +11,7 @@ diff --git a/configure b/configure index e3a8f45ff4..983d7e1078 100755 --- a/configure +++ b/configure -@@ -6358,7 +6358,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && +@@ -6541,7 +6541,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 |