diff options
Diffstat (limited to 'tools/buildsteps/windows')
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch b/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch index 62afbf5a8b..d5277ecc41 100644 --- a/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch +++ b/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch @@ -12,7 +12,7 @@ diff --git a/configure b/configure index a1818dc..1cf2a7c 100755 --- a/configure +++ b/configure -@@ -6125,6 +6125,8 @@ +@@ -6147,6 +6147,8 @@ 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-zlib-config-conflict.patch b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch index 563542fb3d..632cc55bfb 100644 --- a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch +++ b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -7145,6 +7145,9 @@ +@@ -7197,6 +7197,9 @@ $CONFIG_EXTRA \ $ALL_COMPONENTS \ diff --git a/tools/buildsteps/windows/patches/0003-ffmpeg-static.patch b/tools/buildsteps/windows/patches/0003-ffmpeg-static.patch index 48938d43f1..fb78864a7d 100644 --- a/tools/buildsteps/windows/patches/0003-ffmpeg-static.patch +++ b/tools/buildsteps/windows/patches/0003-ffmpeg-static.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -5109,6 +5109,8 @@ +@@ -5131,6 +5131,8 @@ enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -Wl,--large-address-aware shlibdir_default="$bindir_default" @@ -9,7 +9,7 @@ SLIBPREF="" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' -@@ -5158,6 +5160,8 @@ +@@ -5180,6 +5182,8 @@ fi enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" |