vulkan-loader: rebase patches

Signed-off-by: Christopher Degawa <[email protected]>

vulkan-loader/0001-pc-remove-CMAKE_CXX_IMPLICIT_LINK_LIBRARIES.patch

@@ -1,4 +1,4 @@
-From cfd4c8026938ed6689445403a462e05548abc4d0 Mon Sep 17 00:00:00 2001
+From 99ac91114d719c942346620fe1fa143d014f604f Mon Sep 17 00:00:00 2001
 From: Christopher Degawa <[email protected]>
 Date: Wed, 18 Aug 2021 11:02:41 -0500
 Subject: [PATCH 1/4] pc: remove CMAKE_CXX_IMPLICIT_LINK_LIBRARIES
@@ -12,10 +12,10 @@ Signed-off-by: Christopher Degawa <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 2a4737cb0..76c2150a5 100644
+index 99b6a393a..ed48d051f 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -553,6 +553,7 @@ install(FILES "${version_config}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
+@@ -538,6 +538,7 @@ install(FILES "${version_config}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
  # https://gitlab.kitware.com/cmake/cmake/-/issues/22621
  find_package(PkgConfig)
  if (PKG_CONFIG_FOUND)

vulkan-loader/0002-loader-CMake-related-static-hacks.patch

@@ -1,4 +1,4 @@
-From bb4a160248d99d635b2d83eab41393b9ca20261e Mon Sep 17 00:00:00 2001
+From 6a0a3777c6ee706fa476958e682fff4de91e43b4 Mon Sep 17 00:00:00 2001
 From: Christopher Degawa <[email protected]>
 Date: Mon, 2 Oct 2023 01:16:49 -0500
 Subject: [PATCH 2/4] loader: CMake related static hacks
@@ -8,26 +8,14 @@ with shinchiro's patch yet.
 
 Signed-off-by: Christopher Degawa <[email protected]>
 ---
- loader/CMakeLists.txt | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
+ loader/CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 76c2150a5..36b957788 100644
+index ed48d051f..9b437060e 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -236,9 +236,9 @@ end
-         set_target_properties(loader_asm_gen_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
-
-         if(SYSTEM_PROCESSOR MATCHES "arm")
--            add_library(loader-unknown-chain STATIC unknown_ext_chain_marmasm.asm)
-+            add_library(loader-unknown-chain OBJECT unknown_ext_chain_marmasm.asm)
-         else()
--            add_library(loader-unknown-chain STATIC unknown_ext_chain_masm.asm)
-+            add_library(loader-unknown-chain OBJECT unknown_ext_chain_masm.asm)
-         endif()
-         target_include_directories(loader-unknown-chain PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-         add_dependencies(loader-unknown-chain loader_asm_gen_files)
-@@ -383,17 +383,18 @@ if(WIN32)
+@@ -372,8 +372,14 @@ if(WIN32)
          set(RC_FILE_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/loader.rc)
      endif()
 
@@ -42,19 +30,8 @@ index 76c2150a5..36b957788 100644
 +                ${VULKAN_LIBRARY_TYPE}
                  ${NORMAL_LOADER_SRCS}
                  ${CMAKE_CURRENT_SOURCE_DIR}/${API_TYPE}-1.def
--                ${RC_FILE_LOCATION})
--
--    target_link_libraries(vulkan PRIVATE loader_specific_options)
--
--    if(UNKNOWN_FUNCTIONS_SUPPORTED AND TARGET loader-unknown-chain)
--        target_link_libraries(vulkan PRIVATE loader-unknown-chain)
--    endif()
-+                ${RC_FILE_LOCATION}
-+                $<$<TARGET_EXISTS:loader-unknown-chain>:$<TARGET_OBJECTS:loader-unknown-chain>>)
-
-     # when adding the suffix the import and runtime library names must be consistent
-     # mingw: libvulkan-1.dll.a / vulkan-1.dll
-@@ -520,7 +521,7 @@ if (LOADER_USE_UNSAFE_FILE_SEARCH)
+                 ${RC_FILE_LOCATION})
+@@ -505,7 +511,7 @@ if (LOADER_USE_UNSAFE_FILE_SEARCH)
  endif()
 
  # common attributes of the vulkan library

vulkan-loader/0003-loader-Re-add-private-libs-to-pc-file.patch

@@ -1,4 +1,4 @@
-From 0b69ad1e89bc7c85f078b8004e82d26edd14a805 Mon Sep 17 00:00:00 2001
+From 1921eaf74268f34e4ef049e99755e57a57d1d81d Mon Sep 17 00:00:00 2001
 From: Christopher Degawa <[email protected]>
 Date: Mon, 2 Oct 2023 01:35:10 -0500
 Subject: [PATCH 3/4] loader: Re-add private libs to pc file
@@ -12,10 +12,10 @@ Signed-off-by: Christopher Degawa <[email protected]>
  2 files changed, 13 insertions(+)
 
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 36b957788..6573fa8fc 100644
+index 9b437060e..075779d45 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -555,6 +555,18 @@ install(FILES "${version_config}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
+@@ -545,6 +545,18 @@ install(FILES "${version_config}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
  find_package(PkgConfig)
  if (PKG_CONFIG_FOUND)
      set(PRIVATE_LIBS "")

vulkan-loader/0004-loader-Static-library-name-related-hacks.patch

@@ -1,4 +1,4 @@
-From 3dfe79c81e703436d12b243b4e3f46f8b6976d1e Mon Sep 17 00:00:00 2001
+From fc17c4cbd6b94f9243352bb41d704a9589cbd7a0 Mon Sep 17 00:00:00 2001
 From: Christopher Degawa <[email protected]>
 Date: Mon, 2 Oct 2023 01:38:44 -0500
 Subject: [PATCH 4/4] loader: Static library name related hacks
@@ -11,10 +11,10 @@ Signed-off-by: Christopher Degawa <[email protected]>
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 6573fa8fc..02c7cd669 100644
+index 075779d45..adb6f0cd4 100644
 --- a/loader/CMakeLists.txt
 +++ b/loader/CMakeLists.txt
-@@ -399,14 +399,16 @@ if(WIN32)
+@@ -389,14 +389,16 @@ if(WIN32)
      # when adding the suffix the import and runtime library names must be consistent
      # mingw: libvulkan-1.dll.a / vulkan-1.dll
      # msvc: vulkan-1.lib / vulkan-1.dll
@@ -37,7 +37,7 @@ index 6573fa8fc..02c7cd669 100644
      endif()
 
      if(MSVC AND ENABLE_WIN10_ONECORE)
-@@ -567,7 +569,7 @@ if (PKG_CONFIG_FOUND)
+@@ -557,7 +559,7 @@ if (PKG_CONFIG_FOUND)
          set(PRIVATE_LIBS "Libs.private: ${PRIVATE_LIBS}")
      endif()