Update dependencies

2021-07-12 16:29:31 +02:00 · 2021-07-12 16:29:31 +02:00 · 0631e027e9
commit 0631e027e9
parent dbd238fcde
34 changed files with 51 additions and 76 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 5cb3764fc555d685200f7f45a75e175ead1aea6c Mon Sep 17 00:00:00 2001
+From 3144d063916caf6271d5af2b5edb58b95b49ef3f 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 e01c97375..219b99bd5 100644
+index d56f948cf..4e6c14ff8 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -158,7 +158,7 @@ if(WIN32)
+@@ -160,7 +160,7 @@ if(WIN32)
     if (USE_MASM)
       enable_language(ASM_MASM)
     endif ()
@ -22,7 +22,7 @@ index e01c97375..219b99bd5 100644
         if(MINGW)
             set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
         elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND)
-@@ -178,6 +178,8 @@ if(WIN32)
+@@ -180,6 +180,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})
@ -32,7 +32,7 @@ index e01c97375..219b99bd5 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 c3f482b41..4fe42de73 100644
+index 7776ff5f4..dc26a9c4f 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
@@ -83,6 +83,19 @@
--- a/patches/vulkan/0002-Fixes-for-MinGW-build.patch
+++ b/patches/vulkan/0002-Fixes-for-MinGW-build.patch
@ -1,45 +1,20 @@
-From 4b2019bf934227e526f72df5b045b3bbfb646b63 Mon Sep 17 00:00:00 2001
+From d3a86d11426c8d148a554f67654fb0a048d0c98d 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

 Adapted from https://github.com/msys2/MINGW-packages/blob/348f1d46d9d273a2cc928deadf9d9114f7a69c2f/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch
 ---
- loader/CMakeLists.txt          | 6 ++++--
+ loader/CMakeLists.txt          | 2 +-
 loader/loader.h                | 4 +++-
 tests/layers/vk_format_utils.h | 4 +++-
- 3 files changed, 10 insertions(+), 4 deletions(-)
+ 3 files changed, 7 insertions(+), 3 deletions(-)

 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 219b99bd5..ab0a49c55 100644
+index 4e6c14ff8..ca768223f 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -71,6 +71,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(WIN32)
-     # Use static MSVCRT libraries
-+    if(MSVC)
-     foreach(configuration
-             in
-             CMAKE_C_FLAGS_DEBUG
-@@ -89,6 +90,7 @@ if(WIN32)
-                            "${${configuration}}")
-         endif()
-     endforeach()
-+    endif()
- 
-     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
-@@ -238,7 +240,7 @@ if(WIN32)
-                                      "")
-     target_link_libraries(vulkan Vulkan::Headers)
- 
-    if(ENABLE_WIN10_ONECORE)
-+    if(ENABLE_WIN10_ONECORE AND MSVC)
-         target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB)
-         set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB")
-     else()
-@@ -326,11 +328,11 @@ else()
+@@ -329,11 +329,11 @@ else()
         )
 # cmake-format: on
     endif()
--- 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 fb3cd101efc847efaa95dc0cccfa64f9cd37e7e0 Mon Sep 17 00:00:00 2001
+From 9e735ac1e3d15cc75185c988e954979c83521881 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
--- 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 4aa6517c8e68b5f507cdcd3e8badbe7dd4369d5a Mon Sep 17 00:00:00 2001
+From 6e1f9e7ce670b295bf5d24564b1ec0a179a0ee34 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
@ -27,7 +27,7 @@ index bd01fa016..91e5652f3 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 ab0a49c55..dd9d47183 100644
+index ca768223f..f37b18908 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
@@ -224,6 +224,22 @@ if(WIN32)
@ -54,15 +54,15 @@ index ab0a49c55..dd9d47183 100644
                 SHARED
                 $<TARGET_OBJECTS:loader-opt>
@@ -238,6 +254,8 @@ if(WIN32)
-                                      vulkan-1
-                                      PREFIX
-                                      "")
+     set_target_properties(vulkan
+                           PROPERTIES
+                           OUTPUT_NAME vulkan-1)
 +    set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS LOADER_DYNAMIC_LIB)
 +    endif()
+ 
     target_link_libraries(vulkan Vulkan::Headers)
 
-     if(ENABLE_WIN10_ONECORE AND MSVC)
-@@ -259,17 +277,19 @@ else()
+@@ -260,17 +278,19 @@ else()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-typedef-redefinition")
     endif()
 
@ -83,7 +83,7 @@ index ab0a49c55..dd9d47183 100644
     target_link_libraries(vulkan ${CMAKE_DL_LIBS} m)
     if (NOT ANDROID)
         target_link_libraries(vulkan pthread)
-@@ -341,6 +361,7 @@ if(PKG_CONFIG_FOUND)
+@@ -342,6 +362,7 @@ if(PKG_CONFIG_FOUND)
     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
     endforeach()
@ -92,7 +92,7 @@ index ab0a49c55..dd9d47183 100644
         set(VULKAN_LIB_SUFFIX "-1")
     endif ()
 diff --git a/loader/loader.c b/loader/loader.c
-index 4fe42de73..1eb88ed86 100644
+index dc26a9c4f..4bafed2ed 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
@@ -7914,7 +7914,7 @@ out:
--- 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="f95546461fa7edfb2856c92f2c48f958ff0a9de4"
+MINGW_COMMIT="7fb7c9f6e401e2bc4393e61a27a68ebccffa1195"

 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="13ad8736d294536da4cbcd70a96b0a2fbf47070c"
+LIBXML2_COMMIT="ec6e3efb06d7b15cf5a2328fabd3845acea4c815"

 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="3ccfb68d2ce9ace5e83fb96b6da45de637522804"
+FRIBIDI_COMMIT="da0d0643b2114d457a88f9142ef0af8d32ac8f1e"

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

 OGG_REPO="https://github.com/xiph/ogg.git"
-OGG_COMMIT="369657ca2eb36131cbd53359b4d365e2b48054de"
+OGG_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"

 ffbuild_enabled() {
    return 0
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.93.tar.xz"
+FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz"

 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="cb5a6b5a27cfe616113bafe7f23ad33f1b0d0a1e"
+HARFBUZZ_COMMIT="69310f14a6b79399041a1d9d70c246722b58829f"

 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="eda3c5e3d878314a944ade93bdb073ab20d5bab6"
+LIBSR_COMMIT="02391651ff8e4d2fbab22dc7daaacc793ab0704a"

 ffbuild_enabled() {
    # Dependency of GPL-Only librubberband
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@ -1,10 +1,10 @@
 #!/bin/bash

 HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-HEADERS_COMMIT="1d3dc4e7562ac56ee8ab00607af7bd55fb091f22"
+HEADERS_COMMIT="1bb9ec797d14abed6167e3a3d66ede25a702a5c7"

 LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-LOADER_COMMIT="9b5e3849b49a1448996c8b96ba086cd774d987db"
+LOADER_COMMIT="4e65bd5db0a0a87637fddc081a70d537fc2a9e70"

 ffbuild_enabled() {
    return 0
--- 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="e86a6801195f47de9e630564a795013678f0b9f7"
+VMAF_COMMIT="0511e05320d67238cf514104566b9d3f969963b7"

 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="b83102e3d5b8929c09989e0b879fe6ac5077e013"
+LOADER_COMMIT="8daad81803f5ed9b36a172c299140dde7a8c4494"

 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="42a875ffe3721d5e90232cac7579086c68abe3b5"
+AOM_COMMIT="d7700191dc78cfe3675fcd6afb19fe5b72c0f310"

 ffbuild_enabled() {
    return 0
--- 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="e18e487c8374f645330ef30c0a613601fe22f9d4"
+AVISYNTH_COMMIT="5c050fdc9bd2aff5af300c44fb0f7591d89f96d0"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && return -1
--- 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="41be890ddd8e58f938aa74a689e4a457da3a87b0"
+DAV1D_COMMIT="7e6fc8b040274157254218acf3e49fde2054bed3"

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

 FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-FFNVCODEC_COMMIT="7adf160d25b7f311e6aa5b8c56ef0f57061801c0"
+FFNVCODEC_COMMIT="9939a5b7f49420c408b7a40f26c500c7ccfb6757"

 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="6bdcb4be344d7903bd92fd464e496c3199b91484"
+GLSLANG_COMMIT="4b7b86d568b40f4b076259dc2fc4cdd006340f34"

 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="96a920a76b9d16572329547c29f728b4436f741c"
+ASS_COMMIT="5733e1c28b92ebbf090bea8f25e252aa40e0b9c4"

 ffbuild_enabled() {
    return 0
--- 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="dfd6c88aaa54a03a61434c413e30c217eb98f1d5"
+OPUS_COMMIT="6b6035ae4a29abbd237463d84a45fbeb0d92bc18"

 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="b8273e8ae5c14bccefde96170507336a4f15c98c"
+LIBVPX_COMMIT="69fc604636f740a57482f3898c2527d29663ee6d"

 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="315abbd60b2bec12a7ef620cebc41b3e283ef768"
+WEBP_COMMIT="46d844e6cf0f5895e96be619d637e11b9077128d"

 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="10c6dcff8d28ca2a05d2ebcfa9bb47e24e5a9d64"
+SERD_COMMIT="c05fdaa19be53ef618435d3629122a4ebdc7cb63"

 ffbuild_enabled() {
    return 0
--- 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="766edb847696c6e0755b0e07b7161ccb9a33c948"
+MBEDTLS_COMMIT="8de3633c658dbbdfe70b6f13149e975c2c6bf88f"

 ffbuild_enabled() {
    [[ $TARGET == win* ]] && return -1
--- 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="2cd279f1e8a277c843025c8713c6ed3b4c42b032"
+MFX_COMMIT="0349e3bc5bcdb268e94a334bf8a2bdeb6a369840"

 ffbuild_enabled() {
    return 0
--- 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="b6b8d28b3a85b74ff5415565cff2c20c019ca3c5"
+OPENJPEG_COMMIT="08ba6a1638242e7ddd884c6c9777a232c0ef82fd"

 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="245f0d39b2d83773b7be9d7385fa48ac94895f4f"
+RAV1E_COMMIT="8c064f492985ab9f6c1a5be0fa3fc72e9b83d132"

 ffbuild_enabled() {
    [[ $TARGET == win32 ]] && return -1
--- 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.1.tar.bz2"
+RUBBERBAND_SRC="https://breakfastquay.com/files/releases/rubberband-1.9.2.tar.bz2"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && 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="e2a00aa03a36e153ab8cfe2c0790f7bf43747d8d"
+SRT_COMMIT="3c1c490715a6a6025bdda85a8ef1acf64616d8e8"

 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="4e38710079d278495b64228ea890b83a746275e1"
+SVTAV1_COMMIT="2a5935299669dc633a5d0265bf63281b3bfc5180"

 ffbuild_enabled() {
    [[ $TARGET == win32 ]] && return -1
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
-UAVS3D_COMMIT="26b088ed51a8c3f7ed73e2a70321777c8aff5a8a"
+UAVS3D_COMMIT="73ab6f3d74bf15a6252ef486b04b2f2ca89cc17f"

 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="b684ebe04a6f80f8207a57940a1fa00e25274f81"
+X264_COMMIT="ae03d92b52bb7581df2e75d571989cb1ecd19cbd"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && 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="6eb9d322531e2b4c2e19aa4b1e785593fb28d859"
+ZIMG_COMMIT="b8ff478eef0cc3789e3c9eb4924cb497fc37654f"

 ffbuild_enabled() {
    return 0