Mirrors/FFmpeg-Builds
1
0
Fork 0
mirror of https://github.com/BtbN/FFmpeg-Builds.git synced 2025-06-12 13:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
BtbN
2021-07-12 16:29:31 +02:00
parent dbd238fcde
commit 0631e027e9
34 changed files with 51 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/vulkan/0001-Fix-build-on-MinGW-cross-compiling-environment.patch
View File

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

35
patches/vulkan/0002-Fixes-for-MinGW-build.patch
View File

@ -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()

2
patches/vulkan/0003-Define-appropiate-minimum-Windows-Version.patch
View File

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

18
patches/vulkan/0004-Unlock-building-static-loader-on-any-OS.patch
View File

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