Update dependencies

2021-05-30 18:30:44 +02:00 · 2021-05-30 18:30:44 +02:00 · 867c5ce14d
commit 867c5ce14d
parent 80c4d27a22
24 changed files with 51 additions and 51 deletions
--- 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,4 +1,4 @@
-From cc0b0633e19356c45caa66c5ac18f8f49ba3e214 Mon Sep 17 00:00:00 2001
+From 5cb3764fc555d685200f7f45a75e175ead1aea6c Mon Sep 17 00:00:00 2001
 From: Syoyo Fujita <syoyo@lighttransport.com>
 Date: Thu, 28 May 2020 21:38:16 +0900
 Subject: [PATCH 1/4] Fix build on MinGW cross compiling environment.
@ -10,10 +10,10 @@ Subject: [PATCH 1/4] Fix build on MinGW cross compiling environment.
 3 files changed, 20 insertions(+), 1 deletion(-)

 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index db1ad7807..04faf23cc 100644
+index e01c97375..219b99bd5 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -151,7 +151,7 @@ if(WIN32)
+@@ -158,7 +158,7 @@ if(WIN32)
     if (USE_MASM)
       enable_language(ASM_MASM)
     endif ()
@ -22,9 +22,9 @@ index db1ad7807..04faf23cc 100644
         if(MINGW)
             set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
         elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND)
-@@ -171,6 +171,8 @@ if(WIN32)
+@@ -178,6 +178,8 @@ if(WIN32)
         add_library(loader-unknown-chain OBJECT unknown_ext_chain.c)
-         target_compile_options(loader-unknown-chain PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_REL}>")
+         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})
 +
 +        target_include_directories(loader-unknown-chain PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>")
@ -32,10 +32,10 @@ index db1ad7807..04faf23cc 100644
 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 6a60ee7bc..20790c12c 100644
+index c3f482b41..4fe42de73 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
-@@ -79,6 +79,19 @@
+@@ -83,6 +83,19 @@
 
 typedef HRESULT (APIENTRY *PFN_CreateDXGIFactory1)(REFIID riid, void **ppFactory);
 static PFN_CreateDXGIFactory1 fpCreateDXGIFactory1;
--- a/patches/vulkan/0002-Fixes-for-MinGW-build.patch
+++ b/patches/vulkan/0002-Fixes-for-MinGW-build.patch
@ -1,4 +1,4 @@
-From 1733181194d4f356e599a748c6d8c5009541604f Mon Sep 17 00:00:00 2001
+From 4b2019bf934227e526f72df5b045b3bbfb646b63 Mon Sep 17 00:00:00 2001
 From: BtbN <btbn@btbn.de>
 Date: Mon, 7 Sep 2020 20:07:39 +0200
 Subject: [PATCH 2/4] Fixes for MinGW build
@ -11,10 +11,10 @@ Adapted from https://github.com/msys2/MINGW-packages/blob/348f1d46d9d273a2cc928d
 3 files changed, 10 insertions(+), 4 deletions(-)

 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 04faf23cc..b5f90393d 100644
+index 219b99bd5..ab0a49c55 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -67,6 +67,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+@@ -71,6 +71,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 if(WIN32)
     # Use static MSVCRT libraries
@ -22,7 +22,7 @@ index 04faf23cc..b5f90393d 100644
     foreach(configuration
             in
             CMAKE_C_FLAGS_DEBUG
-@@ -85,6 +86,7 @@ if(WIN32)
+@@ -89,6 +90,7 @@ if(WIN32)
                            "${${configuration}}")
         endif()
     endforeach()
@ -30,7 +30,7 @@ index 04faf23cc..b5f90393d 100644
 
     if(ENABLE_WIN10_ONECORE)
         # Note: When linking your app or driver to OneCore.lib, be sure to remove any links to non-umbrella libs (such as
-@@ -231,7 +233,7 @@ if(WIN32)
+@@ -238,7 +240,7 @@ if(WIN32)
                                      "")
     target_link_libraries(vulkan Vulkan::Headers)
 
@ -39,7 +39,7 @@ index 04faf23cc..b5f90393d 100644
         target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB)
         set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB")
     else()
-@@ -318,11 +320,11 @@ else()
+@@ -326,11 +328,11 @@ else()
         )
 # cmake-format: on
     endif()
@ -53,7 +53,7 @@ index 04faf23cc..b5f90393d 100644
 # Generate pkg-config file.
 include(FindPkgConfig QUIET)
 diff --git a/loader/loader.h b/loader/loader.h
-index ea0c976b5..64ad08693 100644
+index 2182f187c..d0570cb97 100644
 --- a/loader/loader.h
 +++ b/loader/loader.h
@@ -38,7 +38,9 @@
--- 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 b42b70be453766f56b9ac21c11190b1b5fd74179 Mon Sep 17 00:00:00 2001
+From fb3cd101efc847efaa95dc0cccfa64f9cd37e7e0 Mon Sep 17 00:00:00 2001
 From: BtbN <btbn@btbn.de>
 Date: Mon, 7 Sep 2020 20:33:23 +0200
 Subject: [PATCH 3/4] Define appropiate minimum Windows-Version
@ -8,7 +8,7 @@ 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 abf078c28..40c532a95 100644
+index 437b3c320..badcbc816 100644
 --- a/loader/vk_loader_platform.h
 +++ b/loader/vk_loader_platform.h
@@ -24,6 +24,11 @@
--- 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 62ff1c9f106a70257cff2fead1bdf1a3c3590239 Mon Sep 17 00:00:00 2001
+From 4aa6517c8e68b5f507cdcd3e8badbe7dd4369d5a Mon Sep 17 00:00:00 2001
 From: BtbN <btbn@btbn.de>
 Date: Sun, 4 Apr 2021 23:29:53 +0200
 Subject: [PATCH 4/4] Unlock building static loader on any OS
@ -13,11 +13,11 @@ Based in parts on https://github.com/shinchiro/mpv-winbuild-cmake/blob/master/pa
 5 files changed, 42 insertions(+), 4 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a26e38408..1c3bab61f 100644
+index bd01fa016..91e5652f3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -38,9 +38,7 @@ else()
-     option(BUILD_TESTS "Build Tests" OFF)
+@@ -40,9 +40,7 @@ if(BUILD_TESTS)
+     enable_testing()
 endif()
 
 -if(APPLE)
@ -27,10 +27,10 @@ index a26e38408..1c3bab61f 100644
 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 "
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index b5f90393d..8fa4b01c5 100644
+index ab0a49c55..dd9d47183 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -217,6 +217,22 @@ if(WIN32)
+@@ -224,6 +224,22 @@ if(WIN32)
     target_compile_options(loader-opt PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
     target_include_directories(loader-opt PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>")
 
@ -53,7 +53,7 @@ index b5f90393d..8fa4b01c5 100644
     add_library(vulkan
                 SHARED
                 $<TARGET_OBJECTS:loader-opt>
-@@ -231,6 +247,8 @@ if(WIN32)
+@@ -238,6 +254,8 @@ if(WIN32)
                                      vulkan-1
                                      PREFIX
                                      "")
@ -62,7 +62,7 @@ index b5f90393d..8fa4b01c5 100644
     target_link_libraries(vulkan Vulkan::Headers)
 
     if(ENABLE_WIN10_ONECORE AND MSVC)
-@@ -252,17 +270,19 @@ else()
+@@ -259,17 +277,19 @@ else()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-typedef-redefinition")
     endif()
 
@ -83,7 +83,7 @@ index b5f90393d..8fa4b01c5 100644
     target_link_libraries(vulkan ${CMAKE_DL_LIBS} m)
     if (NOT ANDROID)
         target_link_libraries(vulkan pthread)
-@@ -333,6 +353,7 @@ if(PKG_CONFIG_FOUND)
+@@ -341,6 +361,7 @@ if(PKG_CONFIG_FOUND)
     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
     endforeach()
@ -92,10 +92,10 @@ index b5f90393d..8fa4b01c5 100644
         set(VULKAN_LIB_SUFFIX "-1")
     endif ()
 diff --git a/loader/loader.c b/loader/loader.c
-index 20790c12c..582808e99 100644
+index 4fe42de73..1eb88ed86 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
-@@ -7887,7 +7887,7 @@ out:
+@@ -7914,7 +7914,7 @@ out:
     return result;
 }
 
@ -105,10 +105,10 @@ index 20790c12c..582808e99 100644
     switch (reason) {
         case DLL_PROCESS_ATTACH:
 diff --git a/loader/loader.h b/loader/loader.h
-index 64ad08693..0ee906734 100644
+index d0570cb97..a3bfdc53a 100644
 --- a/loader/loader.h
 +++ b/loader/loader.h
-@@ -436,6 +436,9 @@ static inline void loader_init_dispatch(void *obj, const void *data) {
+@@ -439,6 +439,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;
@ -119,10 +119,10 @@ index 64ad08693..0ee906734 100644
 extern loader_platform_thread_mutex loader_json_lock;
 extern loader_platform_thread_mutex loader_preload_icd_lock;
 diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
-index 40c532a95..d55193766 100644
+index badcbc816..38900b913 100644
 --- a/loader/vk_loader_platform.h
 +++ b/loader/vk_loader_platform.h
-@@ -397,9 +397,25 @@ typedef HANDLE loader_platform_thread;
+@@ -421,9 +421,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.
--- 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="a528542c803bc027e1c0a1c772a4ad575c2c9018"
+MINGW_COMMIT="f95546461fa7edfb2856c92f2c48f958ff0a9de4"

 ffbuild_enabled() {
    [[ $TARGET == win* ]] || return -1
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-LIBXML2_COMMIT="b48e77cf4f6fa0792c5f4b639707a2b0675e461b"
+LIBXML2_COMMIT="13ad8736d294536da4cbcd70a96b0a2fbf47070c"

 ffbuild_enabled() {
    return 0
--- 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="3585a81e625e5b35962bed11fdc99d54485048e0"
+FRIBIDI_COMMIT="3ccfb68d2ce9ace5e83fb96b6da45de637522804"

 ffbuild_enabled() {
    return 0
--- 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="5e0ec33b3d9379b78084cd59a9ebed3fc583eed6"
+HARFBUZZ_COMMIT="cb5a6b5a27cfe616113bafe7f23ad33f1b0d0a1e"

 ffbuild_enabled() {
    return 0
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 LIBSR_REPO="https://github.com/libsndfile/libsamplerate.git"
-LIBSR_COMMIT="70423ce8c77b8cb32c5ee18dd30e866ebafd22f3"
+LIBSR_COMMIT="eda3c5e3d878314a944ade93bdb073ab20d5bab6"

 ffbuild_enabled() {
    # Dependency of GPL-Only librubberband
--- 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="b6e5932881609e87a38168a804276bc8690eac4b"
+VMAF_COMMIT="e86a6801195f47de9e630564a795013678f0b9f7"

 ffbuild_enabled() {
    return 0
--- 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="a132dee142c0d6bf54d09d50ed7fff28f4b491ef"
+LOADER_COMMIT="b83102e3d5b8929c09989e0b879fe6ac5077e013"

 ffbuild_enabled() {
    # The various graphics systems(xcb, xlib, wayland, ...) need figured out first
--- 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="a862e205850b10e859434b59000abc1eb9bf51a2"
+AOM_COMMIT="42a875ffe3721d5e90232cac7579086c68abe3b5"

 ffbuild_enabled() {
    return 0
--- 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="8636b4f2bb79ec7c2f711218ff6bcdd02a2f3f1a"
+DAV1D_COMMIT="41be890ddd8e58f938aa74a689e4a457da3a87b0"

 ffbuild_enabled() {
    return 0
--- 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="202c8abae0a3cb1ae725b3c97e3be3b24d1dadb0"
+GLSLANG_COMMIT="6bdcb4be344d7903bd92fd464e496c3199b91484"

 ffbuild_enabled() {
    # Pointless without Vulkan
--- 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="b9f34688f6ef1988136ba5e90a91ae8ac9b8a55f"
+ASS_COMMIT="96a920a76b9d16572329547c29f728b4436f741c"

 ffbuild_enabled() {
    return 0
--- 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="4808d831dbc4e9ff83fa0efe11207bc135c6d6f5"
+LIBVPX_COMMIT="b8273e8ae5c14bccefde96170507336a4f15c98c"

 ffbuild_enabled() {
    return 0
--- 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="6fb4cddc93f2b9daf85a313b81303eca5519ac51"
+WEBP_COMMIT="315abbd60b2bec12a7ef620cebc41b3e283ef768"

 ffbuild_enabled() {
    return 0
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SERD_REPO="https://github.com/drobilla/serd.git"
-SERD_COMMIT="652371c2f3700e0ec9927fd93e80fa21338a7b29"
+SERD_COMMIT="10c6dcff8d28ca2a05d2ebcfa9bb47e24e5a9d64"

 ffbuild_enabled() {
    return 0
--- 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="df8b712b068826ee7fec04bb0b5829289fd4c6fa"
+RAV1E_COMMIT="245f0d39b2d83773b7be9d7385fa48ac94895f4f"

 ffbuild_enabled() {
    [[ $TARGET == win32 ]] && return -1
--- 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="0921da6cfd6e7c0f88e0a0400f05ded660af1e07"
+SRT_COMMIT="e2a00aa03a36e153ab8cfe2c0790f7bf43747d8d"

 ffbuild_enabled() {
    return 0
--- 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="99b647b1284b812bc36fbb17606f6fce8a48874b"
+SVTAV1_COMMIT="4e38710079d278495b64228ea890b83a746275e1"

 ffbuild_enabled() {
    [[ $TARGET == win32 ]] && return -1
--- 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="b86ae3c66f51ac9eab5ab7ad09a9d62e67961b8a"
+X264_COMMIT="b684ebe04a6f80f8207a57940a1fa00e25274f81"

 ffbuild_enabled() {
    [[ $VARIANT == gpl* ]] || return -1
--- 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="bf91444e034831141e0ce02b1200e51996f8b6c6"
+X265_COMMIT="82786fccce10379be439243b6a776dc2f5918cb4"

 ffbuild_enabled() {
    [[ $VARIANT == gpl* ]] || return -1
--- 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="c8153de9aa33bf4a8b47678986e34662a532c05e"
+ZIMG_COMMIT="6eb9d322531e2b4c2e19aa4b1e785593fb28d859"

 ffbuild_enabled() {
    return 0