From 6a3324e258347e2c6960555aa9520c1e09aa9699 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 28 Oct 2021 20:47:11 +0200 Subject: [PATCH] Update dependencies --- ...on-MinGW-cross-compiling-environment.patch | 65 ++++++++-------- .../vulkan/0002-Fixes-for-MinGW-build.patch | 34 ++++----- ...e-appropiate-minimum-Windows-Version.patch | 8 +- ...ock-building-static-loader-on-any-OS.patch | 75 +++++++++++-------- scripts.d/10-mingw.sh | 2 +- scripts.d/25-fftw3.sh | 2 +- scripts.d/25-fribidi.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-libudfread.sh | 2 +- scripts.d/45-opencl.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-vulkan.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-glslang.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libbluray.sh | 2 +- scripts.d/50-libopus.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-mbedtls.sh | 2 +- scripts.d/50-mfx.sh | 2 +- scripts.d/50-openjpeg.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 11 +-- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-x264.sh | 2 +- scripts.d/50-x265.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 38 files changed, 131 insertions(+), 128 deletions(-) diff --git a/patches/vulkan/0001-Fix-build-on-MinGW-cross-compiling-environment.patch b/patches/vulkan/0001-Fix-build-on-MinGW-cross-compiling-environment.patch index 166444e..2f3989b 100644 --- a/patches/vulkan/0001-Fix-build-on-MinGW-cross-compiling-environment.patch +++ b/patches/vulkan/0001-Fix-build-on-MinGW-cross-compiling-environment.patch @@ -1,19 +1,19 @@ -From 4037e82a4a6e46bd1133755683ad62f32e5af76e Mon Sep 17 00:00:00 2001 +From 45fd7a314a2dc4b39bacbd91369128e04adc0699 Mon Sep 17 00:00:00 2001 From: Syoyo Fujita Date: Thu, 28 May 2020 21:38:16 +0900 Subject: [PATCH 1/4] Fix build on MinGW cross compiling environment. --- - loader/CMakeLists.txt | 4 +++- - loader/loader.c | 13 +++++++++++++ - loader/loader.rc | 4 ++++ - 3 files changed, 20 insertions(+), 1 deletion(-) + loader/CMakeLists.txt | 4 +++- + loader/loader.rc | 4 ++++ + loader/loader_windows.c | 12 ++++++++++++ + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index 4f54c3298..50cced309 100644 +index 56aece671..6e7971845 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt -@@ -160,7 +160,7 @@ if(WIN32) +@@ -187,7 +187,7 @@ if(WIN32) if (USE_MASM) enable_language(ASM_MASM) endif () @@ -22,7 +22,7 @@ index 4f54c3298..50cced309 100644 if(MINGW) set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS}) elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND) -@@ -180,6 +180,8 @@ if(WIN32) +@@ -207,6 +207,8 @@ if(WIN32) add_library(loader-unknown-chain OBJECT unknown_ext_chain.c) set_target_properties(loader-unknown-chain PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}") target_compile_options(loader-unknown-chain PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS}) @@ -31,15 +31,30 @@ index 4f54c3298..50cced309 100644 endif() elseif(APPLE) # For MacOS, use the C code and force the compiler's tail-call optimization instead of using assembly code. -diff --git a/loader/loader.c b/loader/loader.c -index 6db4e9245..d76f7dbe7 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -83,6 +83,19 @@ +diff --git a/loader/loader.rc b/loader/loader.rc +index 44193ea33..456ac70a2 100644 +--- a/loader/loader.rc ++++ b/loader/loader.rc +@@ -19,7 +19,11 @@ + // Author: Charles Giessen + // ++#if defined(__MINGW32__) ++#include ++#else + #include "winres.h" ++#endif + + // All set through CMake + #define VER_FILE_VERSION 1, 0, 1111, 2222 +diff --git a/loader/loader_windows.c b/loader/loader_windows.c +index aff3b276e..e1579bf3a 100644 +--- a/loader/loader_windows.c ++++ b/loader/loader_windows.c +@@ -58,6 +58,18 @@ typedef HRESULT(APIENTRY *PFN_CreateDXGIFactory1)(REFIID riid, void **ppFactory); static PFN_CreateDXGIFactory1 fpCreateDXGIFactory1; -+ + +#if defined(__MINGW32__) +// MinGW header may not have some definitions(cfgmgr32.h). +#if !defined(CM_GETIDLIST_FILTER_CLASS) @@ -52,25 +67,9 @@ index 6db4e9245..d76f7dbe7 100644 + +#endif // __MINGW32__ + - #endif - - // This is a CMake generated file with #defines for any functions/includes -diff --git a/loader/loader.rc b/loader/loader.rc -index a29c507de..6ed444bfe 100755 ---- a/loader/loader.rc -+++ b/loader/loader.rc -@@ -43,7 +43,11 @@ - /////////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// - -+#if defined(__MINGW32__) -+#include -+#else - #include "winres.h" -+#endif - - #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_BUILDNO - + void windows_initialization(void) { + char dll_location[MAX_PATH]; + HMODULE module_handle = NULL; -- 2.25.1 diff --git a/patches/vulkan/0002-Fixes-for-MinGW-build.patch b/patches/vulkan/0002-Fixes-for-MinGW-build.patch index f473dae..daa3eae 100644 --- a/patches/vulkan/0002-Fixes-for-MinGW-build.patch +++ b/patches/vulkan/0002-Fixes-for-MinGW-build.patch @@ -1,20 +1,20 @@ -From f712c42a36bf39592abb2c7f8d2d891287f14c3f Mon Sep 17 00:00:00 2001 +From 8f83fc25f149a53566e0367d185c2a10d2b5b50e Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 7 Sep 2020 20:07:39 +0200 Subject: [PATCH 2/4] Fixes for MinGW build Adapted from https://github.com/msys2/MINGW-packages/blob/348f1d46d9d273a2cc928deadf9d9114f7a69c2f/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch --- - loader/CMakeLists.txt | 2 +- - loader/loader.h | 4 +++- - tests/layers/vk_format_utils.h | 4 +++- + loader/CMakeLists.txt | 2 +- + loader/vk_loader_platform.h | 4 +++- + tests/framework/layer/wrap_objects.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index 50cced309..d35d37220 100644 +index 6e7971845..b5bc0a98a 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt -@@ -326,11 +326,11 @@ else() +@@ -364,11 +364,11 @@ else() ) # cmake-format: on endif() @@ -27,11 +27,11 @@ index 50cced309..d35d37220 100644 # Generate pkg-config file. include(FindPkgConfig QUIET) -diff --git a/loader/loader.h b/loader/loader.h -index 6cc0f8388..fc26fcde6 100644 ---- a/loader/loader.h -+++ b/loader/loader.h -@@ -38,7 +38,9 @@ +diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h +index ecb8e1006..2e138aeaa 100644 +--- a/loader/vk_loader_platform.h ++++ b/loader/vk_loader_platform.h +@@ -76,7 +76,9 @@ #include "vk_layer_dispatch_table.h" #include "vk_loader_extensions.h" @@ -42,12 +42,12 @@ index 6cc0f8388..fc26fcde6 100644 #define LOADER_EXPORT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) #define LOADER_EXPORT __attribute__((visibility("default"))) -diff --git a/tests/layers/vk_format_utils.h b/tests/layers/vk_format_utils.h -index e76f9ec2f..ef06e12af 100644 ---- a/tests/layers/vk_format_utils.h -+++ b/tests/layers/vk_format_utils.h -@@ -25,7 +25,9 @@ - #include "vulkan/vulkan.h" +diff --git a/tests/framework/layer/wrap_objects.cpp b/tests/framework/layer/wrap_objects.cpp +index 8f617a6d3..e7b1996f6 100644 +--- a/tests/framework/layer/wrap_objects.cpp ++++ b/tests/framework/layer/wrap_objects.cpp +@@ -29,7 +29,9 @@ + #include "loader/vk_loader_layer.h" #if !defined(VK_LAYER_EXPORT) -#if defined(__GNUC__) && __GNUC__ >= 4 diff --git a/patches/vulkan/0003-Define-appropiate-minimum-Windows-Version.patch b/patches/vulkan/0003-Define-appropiate-minimum-Windows-Version.patch index d5a20c7..aed70ca 100644 --- a/patches/vulkan/0003-Define-appropiate-minimum-Windows-Version.patch +++ b/patches/vulkan/0003-Define-appropiate-minimum-Windows-Version.patch @@ -1,4 +1,4 @@ -From 9ed35d2d8395553d90e65867946c4df9c7bfaf63 Mon Sep 17 00:00:00 2001 +From 6c963fb60da75e53214579507d7717acadb08c0f Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 7 Sep 2020 20:33:23 +0200 Subject: [PATCH 3/4] Define appropiate minimum Windows-Version @@ -8,11 +8,11 @@ Subject: [PATCH 3/4] Define appropiate minimum Windows-Version 1 file changed, 5 insertions(+) diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index d9381c239..c1e47e4c3 100644 +index 2e138aeaa..d956e803a 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h -@@ -24,6 +24,11 @@ - #pragma once +@@ -30,6 +30,11 @@ + #endif #if defined(_WIN32) + diff --git a/patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch b/patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch index bd84a3a..936ef55 100644 --- a/patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch +++ b/patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch @@ -1,4 +1,4 @@ -From b6b9abf90b6f71abf9d5405745748dd991099247 Mon Sep 17 00:00:00 2001 +From 73d8fb89c6897648ef9e0340793cb2487695488f Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 4 Apr 2021 23:29:53 +0200 Subject: [PATCH 4/4] Unlock building static loader on any OS @@ -7,16 +7,16 @@ Based in parts on https://github.com/shinchiro/mpv-winbuild-cmake/blob/master/pa --- CMakeLists.txt | 2 -- loader/CMakeLists.txt | 23 ++++++++++++++++++++++- - loader/loader.c | 2 +- loader/loader.h | 3 +++ + loader/loader_windows.c | 2 ++ loader/vk_loader_platform.h | 16 ++++++++++++++++ - 5 files changed, 42 insertions(+), 4 deletions(-) + 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd01fa016..91e5652f3 100644 +index 703bcb1ba..43a25d8aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,9 +40,7 @@ if(BUILD_TESTS) +@@ -95,9 +95,7 @@ if(BUILD_TESTS) enable_testing() endif() @@ -24,13 +24,13 @@ index bd01fa016..91e5652f3 100644 option(BUILD_STATIC_LOADER "Build a loader that can be statically linked" OFF) -endif() - if(BUILD_STATIC_LOADER) - message(WARNING "The BUILD_STATIC_LOADER option has been set. Note that this will only work on MacOS and is not supported " + if(WIN32) + # Optional: Allow specify the exact version used in the loader dll diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index d35d37220..cf6c57b5e 100644 +index b5bc0a98a..f74079954 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt -@@ -224,6 +224,22 @@ if(WIN32) +@@ -251,6 +251,22 @@ if(WIN32) target_compile_options(loader-opt PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS}) target_include_directories(loader-opt PRIVATE "$") @@ -53,7 +53,7 @@ index d35d37220..cf6c57b5e 100644 add_library(vulkan SHARED $ -@@ -238,6 +254,8 @@ if(WIN32) +@@ -269,6 +285,8 @@ if(WIN32) set_target_properties(vulkan PROPERTIES OUTPUT_NAME vulkan-1) @@ -62,7 +62,7 @@ index d35d37220..cf6c57b5e 100644 target_link_libraries(vulkan Vulkan::Headers) -@@ -260,14 +278,16 @@ else() +@@ -291,16 +309,18 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-typedef-redefinition") endif() @@ -74,52 +74,61 @@ index d35d37220..cf6c57b5e 100644 endif() add_dependencies(vulkan loader_asm_gen_files) + if (NOT BUILD_STATIC_LOADER) - # set version based on VK_HEADER_VERSION used to generate the code - include(generated/loader_generated_header_version.cmake) + # set version based on LOADER_GENERATED_HEADER_VERSION used to generate the code + set_target_properties(vulkan + PROPERTIES SOVERSION "1" + VERSION ${LOADER_GENERATED_HEADER_VERSION}) + endif() target_link_libraries(vulkan ${CMAKE_DL_LIBS} m) if (NOT ANDROID) target_link_libraries(vulkan pthread) -@@ -339,6 +359,7 @@ if(PKG_CONFIG_FOUND) +@@ -377,6 +397,7 @@ if(PKG_CONFIG_FOUND) foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") endforeach() + set(PRIVATE_LIBS "${PRIVATE_LIBS} -lshlwapi -lcfgmgr32") if(WIN32) set(VULKAN_LIB_SUFFIX "-1") - endif () -diff --git a/loader/loader.c b/loader/loader.c -index d76f7dbe7..73e93fff1 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -7889,7 +7889,7 @@ out: - return result; - } - --#if defined(_WIN32) -+#if defined(_WIN32) && defined(LOADER_DYNAMIC_LIB) - BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { - switch (reason) { - case DLL_PROCESS_ATTACH: + # Set libdir path as in cmake's FindVulkan.cmake diff --git a/loader/loader.h b/loader/loader.h -index fc26fcde6..43fa875e5 100644 +index cfebfba67..62dcaeb81 100644 --- a/loader/loader.h +++ b/loader/loader.h -@@ -449,6 +449,9 @@ static inline void loader_init_dispatch(void *obj, const void *data) { +@@ -66,6 +66,9 @@ static inline void loader_init_dispatch(void *obj, const void *data) { + // Global variables used across files extern struct loader_struct loader; - extern THREAD_LOCAL_DECL struct loader_instance *tls_instance; +#if defined(_WIN32) && !defined(LOADER_DYNAMIC_LIB) +extern LOADER_PLATFORM_THREAD_ONCE_DEFINITION(once_init); +#endif extern loader_platform_thread_mutex loader_lock; extern loader_platform_thread_mutex loader_json_lock; extern loader_platform_thread_mutex loader_preload_icd_lock; +diff --git a/loader/loader_windows.c b/loader/loader_windows.c +index e1579bf3a..8a7daef04 100644 +--- a/loader/loader_windows.c ++++ b/loader/loader_windows.c +@@ -98,6 +98,7 @@ void windows_initialization(void) { + #endif + } + ++#if defined(LOADER_DYNAMIC_LIB) + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { + switch (reason) { + case DLL_PROCESS_ATTACH: +@@ -114,6 +115,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { + } + return TRUE; + } ++#endif + + bool windows_add_json_entry(const struct loader_instance *inst, + char **reg_data, // list of JSON files diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index c1e47e4c3..2cc1d2e7c 100644 +index d956e803a..fab7b44f5 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h -@@ -421,9 +421,25 @@ typedef HANDLE loader_platform_thread; +@@ -456,9 +456,25 @@ typedef HANDLE loader_platform_thread; // The once init functionality is not used when building a DLL on Windows. This is because there is no way to clean up the // resources allocated by anything allocated by once init. This isn't a problem for static libraries, but it is for dynamic // ones. When building a DLL, we use DllMain() instead to allow properly cleaning up resources. diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index d09688b..c7d5821 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash MINGW_REPO="https://github.com/mirror/mingw-w64.git" -MINGW_COMMIT="586baa17bb41dd78addd8cbb6415cfd24d24e925" +MINGW_COMMIT="a2eb3ea3aaa7c780c4b4ab30d71169f442788864" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index 28fee0d..87b3366 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash # http://fftw.org/download.html -FFTW3_SRC="http://fftw.org/fftw-3.3.10.tar.gz" +FFTW3_SRC="https://fftw.org/fftw-3.3.10.tar.gz" FFTW3_SHA512="2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40" ffbuild_enabled() { diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index c338748..d4c715b 100755 --- a/scripts.d/25-fribidi.sh +++ b/scripts.d/25-fribidi.sh @@ -1,7 +1,7 @@ #!/bin/bash FRIBIDI_REPO="https://github.com/fribidi/fribidi.git" -FRIBIDI_COMMIT="da0d0643b2114d457a88f9142ef0af8d32ac8f1e" +FRIBIDI_COMMIT="9ca69d112678832f3b734cc8e399583bb12de02d" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 33d19df..7c640b8 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git" -HARFBUZZ_COMMIT="3b2929e8a9da349fbd8437fd0b5cf0c8ce92cf32" +HARFBUZZ_COMMIT="85deddb16ee6b00b0c921998e1d93c84002f5a42" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh index fc5821e..346a4b0 100755 --- a/scripts.d/45-libudfread.sh +++ b/scripts.d/45-libudfread.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBUDFREAD_REPO="https://code.videolan.org/videolan/libudfread.git" -LIBUDFREAD_COMMIT="b8ada6557b5336f4d3f144d8604ddc0ccf51f0c2" +LIBUDFREAD_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index fb21995..e02c267 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,7 +1,7 @@ #!/bin/bash HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -HEADERS_COMMIT="835558e45c41df1345ee514e94a839c31923c1b2" +HEADERS_COMMIT="447efd3be3169fa0ef37fa481241d7b261a02412" LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" LOADER_COMMIT="4e65bd5db0a0a87637fddc081a70d537fc2a9e70" diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 701b14f..95d2f28 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash VMAF_REPO="https://github.com/Netflix/vmaf.git" -VMAF_COMMIT="9451ff498402e8f0a912161e5f8dea4de6b54ae2" +VMAF_COMMIT="8f24c9ec82f9bb82d7f4eff22b290ab48f3e210f" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh index b3b32ef..9d1f8f8 100755 --- a/scripts.d/45-vulkan.sh +++ b/scripts.d/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash LOADER_REPO="https://github.com/KhronosGroup/Vulkan-Loader.git" -LOADER_COMMIT="90fd66f60fa7de10c91030f8c88b2a5c7c377784" +LOADER_COMMIT="830a0724aa281d7cad98eda59b850871f024bb41" ffbuild_enabled() { # The various graphics systems(xcb, xlib, wayland, ...) need figured out first diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 6e8ae64..4e3c1a3 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/scripts.d/45-x11/10-xcbproto.sh @@ -1,7 +1,7 @@ #!/bin/bash XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -XCBPROTO_COMMIT="f0db8b7d31a379fe26f6cc592be997c8ce5f0b2d" +XCBPROTO_COMMIT="c9be9015959f3d3830d847db44d39c5d21ba55b6" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index a4f1e89..917693c 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBXCB_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -LIBXCB_COMMIT="a503167f751ba77e6819df568b7f5042d2baa9c9" +LIBXCB_COMMIT="233d7b7f1f03ef18bf3955eb1f20421e745d22f0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 8cb22f5..20e89bb 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" -LIBX11_COMMIT="e92efc63acd7b377faa9e534f4bf52aaa86be2a9" +LIBX11_COMMIT="2356e59ff24f8d1b25cdc4dffc5171c65dc2b86e" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index cae7616..30c5db3 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -AMF_COMMIT="3ee61d73b5599dcadbf86621a9f9c2d7e9c05811" +AMF_COMMIT="5359f7dba51107da19b7650e5d8a40a0f04ea6d9" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index c04683c..87c5db4 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash AOM_REPO="https://aomedia.googlesource.com/aom" -AOM_COMMIT="c9f674a396f230d79337b2852ea3b00e5eec2967" +AOM_COMMIT="feb75d0bb2df222b9e23b8012e3f193aff7e1377" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index b1ee58b..ed8418d 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -1,7 +1,7 @@ #!/bin/bash AVISYNTH_REPO="https://github.com/AviSynth/AviSynthPlus.git" -AVISYNTH_COMMIT="47b6141ac27fc5c33cb4186695cca88b6961b3c8" +AVISYNTH_COMMIT="babdbc0d7b39d775e5a847c74c345dfae9844338" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 7a7db4f..58c9ada 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git" -DAV1D_COMMIT="d174e6f0fa8a8dcbd5eacd6d0227b1924edf80be" +DAV1D_COMMIT="a55ff11da2430ae7057862f6565ce3b5a222afdc" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 2d8b36e..832be9e 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -1,7 +1,7 @@ #!/bin/bash FREI0R_REPO="https://github.com/dyne/frei0r.git" -FREI0R_COMMIT="86475d3e11e1061bf161e6ed3830fe2cf3d172ac" +FREI0R_COMMIT="700564265acdb94497c22d5c703dc38ed9d1b649" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh index d557f98..653e88b 100755 --- a/scripts.d/50-glslang.sh +++ b/scripts.d/50-glslang.sh @@ -1,7 +1,7 @@ #!/bin/bash GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git" -GLSLANG_COMMIT="c2604615f4820be63d9ea205be9a796bfc309e4b" +GLSLANG_COMMIT="d1608ab1ef17f1488bdcbfe11f2c3c96ac482fce" ffbuild_enabled() { # Pointless without Vulkan diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index df3d766..8907444 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash ASS_REPO="https://github.com/libass/libass.git" -ASS_COMMIT="0915955733bd236ecc44645ee968fb7a55ad5079" +ASS_COMMIT="ac2ddef8841aa2ff37ca9b83f19f15092d0cacc6" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index abca1c7..eff4446 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git" -LIBBLURAY_COMMIT="06d7ce99531eb643a6f165424373d1ab72178a51" +LIBBLURAY_COMMIT="060d8f055f2ed1b4752340be5d16403bad5ccdc0" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 5590842..a046a30 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash OPUS_REPO="https://github.com/xiph/opus.git" -OPUS_COMMIT="6b6035ae4a29abbd237463d84a45fbeb0d92bc18" +OPUS_COMMIT="a8e6a77c5fe0c37aa6788f939f24f8cd22ae2652" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 25c2591..3aeef12 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx" -LIBVPX_COMMIT="7366195e5a7098de0b7c131f40dd5238b9065a56" +LIBVPX_COMMIT="c56ab7d0c6f3fb215d571db3dacc0cc908c1b53c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 671f3b7..f9ad283 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash WEBP_REPO="https://chromium.googlesource.com/webm/libwebp" -WEBP_COMMIT="e23cd5481c4d90229e967bc01034fdc355e8978d" +WEBP_COMMIT="35b7436a216857eabf4773681fecd8fd52bcc3e7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-mbedtls.sh b/scripts.d/50-mbedtls.sh index 2bec9c8..2a04125 100755 --- a/scripts.d/50-mbedtls.sh +++ b/scripts.d/50-mbedtls.sh @@ -2,7 +2,7 @@ MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git" # HEAD of development_2.x -MBEDTLS_COMMIT="02e17c0aa59f1146b9a566e672940ffdca75a2a2" +MBEDTLS_COMMIT="d599dc7f1bd26889d85092b9774cdef37e62e3c0" ffbuild_enabled() { [[ $TARGET == win* ]] && return -1 diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh index 053b70e..04cdf4d 100755 --- a/scripts.d/50-mfx.sh +++ b/scripts.d/50-mfx.sh @@ -1,7 +1,7 @@ #!/bin/bash MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git" -MFX_COMMIT="0349e3bc5bcdb268e94a334bf8a2bdeb6a369840" +MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index f4a1651..e45a69b 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git" -OPENJPEG_COMMIT="ec651740191dc765c8a1fc5cc3c5348cd0cd2ccc" +OPENJPEG_COMMIT="90481203a28d4d18052a07711d6d890ed1ab8c8a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 2ebfe01..1aaddc4 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,7 +1,7 @@ #!/bin/bash RAV1E_REPO="https://github.com/xiph/rav1e.git" -RAV1E_COMMIT="a82c2cd9fa6165670ee8d6c189ccbf1189d6f5a3" +RAV1E_COMMIT="9417a4df1069cc066d499e04b9130ffd32019ed1" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 93a8439..d6c677c 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -1,7 +1,7 @@ #!/bin/bash -# https://breakfastquay.com/rubberband/ -RUBBERBAND_SRC="https://breakfastquay.com/files/releases/rubberband-1.9.2.tar.bz2" +RUBBERBAND_REPO="https://github.com/breakfastquay/rubberband.git" +RUBBERBAND_COMMIT="b3c920a35ed1ea4da37ddd62a12d3a81278097d1" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 @@ -9,14 +9,9 @@ ffbuild_enabled() { } ffbuild_dockerbuild() { - mkdir rubberband + git-mini-clone "$RUBBERBAND_REPO" "$RUBBERBAND_COMMIT" rubberband cd rubberband - wget "$RUBBERBAND_SRC" -O rubberband.tar.gz - tar xaf rubberband.tar.gz - rm rubberband.tar.gz - cd rubberband* - mkdir build && cd build local myconf=( diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 9344348..f9b4f9f 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SRT_REPO="https://github.com/Haivision/srt.git" -SRT_COMMIT="add40584757636ec99eef41ea3ea4687a43feb3f" +SRT_COMMIT="d9b7988347fdbd4c9e1ae7fdc3b0bb3080aa8ae1" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index e075af2..6f90b06 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SVTAV1_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SVTAV1_COMMIT="685afb2da953a4539bbcd155a29adfdc6827e0cf" +SVTAV1_COMMIT="dd68d3992622006ee1a57739001970e29966e68d" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index ec716e4..4fa6d07 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -LIBDRM_COMMIT="a97f265c7dc1924a38a899082caf97519f8c532e" +LIBDRM_COMMIT="d77ccdf3ba6f5a396049241bff18a7a9c8329659" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 968eba0..5bea7f6 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBVA_REPO="https://github.com/intel/libva.git" -LIBVA_COMMIT="bc5c4b0e30ff426d7b9d6611098d02fc5c7d45d1" +LIBVA_COMMIT="453002ce69779c713f6f8315bedce140d34ba805" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index 6225ee2..8fb680b 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash X264_REPO="https://github.com/mirror/x264.git" -X264_COMMIT="ae03d92b52bb7581df2e75d571989cb1ecd19cbd" +X264_COMMIT="66a5bc1bd1563d8227d5d18440b525a09bcf17ca" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 46ba806..9c0085e 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash X265_REPO="https://bitbucket.org/multicoreware/x265_git.git" -X265_COMMIT="4bf31dc15fb6d1f93d12ecf21fad5e695f0db5c0" +X265_COMMIT="8003e43825ee83b8ef346c8c3562c508ab23f117" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 19ce23a..b42fc6d 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash ZIMG_REPO="https://github.com/sekrit-twc/zimg.git" -ZIMG_COMMIT="42b0d409e14e1b765e9ac6abdd9c14fc85d4ee81" +ZIMG_COMMIT="d2495cab859570112102ef40269a900b81009667" ffbuild_enabled() { return 0