dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dependencies

Browse source
This commit is contained in:
BtbN 2021-05-30 18:30:44 +02:00
parent 80c4d27a22
commit 867c5ce14d
24 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

30
patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch
View file

@ -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.