diff --git a/mingw-w64-vulkan-loader/001-build-fix.patch b/mingw-w64-vulkan-loader/001-build-fix.patch deleted file mode 100644 index 0b860aa861..0000000000 --- a/mingw-w64-vulkan-loader/001-build-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/loader/loader.c 2018-05-16 14:03:52.750814700 +0300 -+++ b/loader/loader.c 2018-05-16 14:04:08.631642600 +0300 -@@ -672,6 +672,10 @@ - // - // *reg_data contains a string list of filenames as pointer. - // When done using the returned string list, the caller should free the pointer. -+#ifdef __MINGW32__ -+#define CM_GETIDLIST_FILTER_PRESENT 0x00000100 -+#define CM_GETIDLIST_FILTER_CLASS 0x00000200 -+#endif - VkResult loaderGetDeviceRegistryFiles(const struct loader_instance *inst, char **reg_data, PDWORD reg_data_size, - LPCSTR value_name) { - static const wchar_t *softwareComponentGUID = L"{5c4c3332-344d-483c-8739-259e934c9cc8}"; ---- a/loader/loader.rc -+++ b/loader/loader.rc -@@ -43,8 +43,6 @@ - /////////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// - --#include "winres.h" -- - #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_BUILDNO - - #define STRINGIZE2(s) #s -@@ -77,7 +75,6 @@ - #endif - - FILEOS 0x00000L -- FILETYPE VFT_DLL - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" diff --git a/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch b/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch index 46c7b05906..9cd3b0f857 100644 --- a/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch +++ b/mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch @@ -1,43 +1,6 @@ ---- Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/loader/vulkan-1.def.orig 2018-05-16 11:55:36.673944400 +0300 -+++ Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/loader/vulkan-1.def 2018-05-16 11:55:41.307152500 +0300 -@@ -21,7 +21,7 @@ - ; - ;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - --LIBRARY vulkan-1.dll -+LIBRARY libvulkan-1.dll - EXPORTS - vkCreateInstance - vkDestroyInstance ---- Vulkan-Loader-1.2.133/loader/loader.h.orig 2020-02-28 11:47:43.202842000 +0300 -+++ Vulkan-Loader-1.2.133/loader/loader.h 2020-02-28 11:49:39.745519200 +0300 -@@ -38,7 +38,9 @@ - #include "vk_layer_dispatch_table.h" - #include "vk_loader_extensions.h" - --#if defined(__GNUC__) && __GNUC__ >= 4 -+#if defined(_WIN32) -+#define LOADER_EXPORT __declspec(dllexport) -+#elif defined(__GNUC__) && __GNUC__ >= 4 - #define LOADER_EXPORT __attribute__((visibility("default"))) - #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) - #define LOADER_EXPORT __attribute__((visibility("default"))) ---- Vulkan-Loader-1.2.133/tests/layers/vk_format_utils.h.orig 2020-02-28 11:50:38.167672800 +0300 -+++ Vulkan-Loader-1.2.133/tests/layers/vk_format_utils.h 2020-02-28 11:51:10.078172600 +0300 -@@ -25,7 +25,9 @@ - #include "vulkan/vulkan.h" - - #if !defined(VK_LAYER_EXPORT) --#if defined(__GNUC__) && __GNUC__ >= 4 -+#if defined(_WIN32) -+#define VK_LAYER_EXPORT __declspec(dllexport) -+#elif defined(__GNUC__) && __GNUC__ >= 4 - #define VK_LAYER_EXPORT __attribute__((visibility("default"))) - #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) - #define VK_LAYER_EXPORT __attribute__((visibility("default"))) ---- Vulkan-Loader-1.2.133/loader/CMakeLists.txt.orig 2020-02-18 00:49:43.000000000 +0300 -+++ Vulkan-Loader-1.2.133/loader/CMakeLists.txt 2020-02-28 12:03:23.323634600 +0300 -@@ -62,6 +62,7 @@ +--- Vulkan-Loader-1.2.158.orig/loader/CMakeLists.txt ++++ Vulkan-Loader-1.2.158/loader/CMakeLists.txt +@@ -66,6 +66,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") if(WIN32) @@ -45,7 +8,7 @@ # Use static MSVCRT libraries foreach(configuration in -@@ -81,6 +82,7 @@ +@@ -85,6 +86,7 @@ "${${configuration}}") endif() endforeach() @@ -53,16 +16,25 @@ 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 -@@ -86,7 +86,7 @@ +@@ -133,7 +135,7 @@ + set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} the stack frame for certain calls. If the compiler does not do this, then unknown device") set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted stack.") if(WIN32) - enable_language(ASM_MASM) -- if(CMAKE_ASM_MASM_COMPILER_WORKS) -+ if (MSVC AND CMAKE_ASM_MASM_COMPILER_WORKS) - if(NOT CMAKE_CL_64) - set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} /safeseh) +- if(MINGW) ++ if(NOT MINGW) + find_program(JWASM_FOUND jwasm) + if (JWASM_FOUND) + set(CMAKE_ASM_MASM_COMPILER ${JWASM_FOUND}) +@@ -148,7 +150,7 @@ endif() -@@ -189,14 +191,22 @@ + endif() + enable_language(ASM_MASM) +- if(CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND) ++ if(MSVC AND CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND) + if(MINGW) + set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS}) + elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND) +@@ -217,14 +219,22 @@ $ ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc) @@ -86,3 +58,40 @@ target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB) set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB") else() +--- Vulkan-Loader-1.2.158.orig/loader/loader.h ++++ Vulkan-Loader-1.2.158/loader/loader.h +@@ -38,7 +38,9 @@ + #include "vk_layer_dispatch_table.h" + #include "vk_loader_extensions.h" + +-#if defined(__GNUC__) && __GNUC__ >= 4 ++#if defined(_WIN32) ++#define LOADER_EXPORT __declspec(dllexport) ++#elif defined(__GNUC__) && __GNUC__ >= 4 + #define LOADER_EXPORT __attribute__((visibility("default"))) + #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) + #define LOADER_EXPORT __attribute__((visibility("default"))) +--- Vulkan-Loader-1.2.158.orig/loader/vulkan-1.def ++++ Vulkan-Loader-1.2.158/loader/vulkan-1.def +@@ -21,7 +21,7 @@ + ; + ;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +-LIBRARY vulkan-1.dll ++LIBRARY libvulkan-1.dll + EXPORTS + vkCreateInstance + vkDestroyInstance +--- Vulkan-Loader-1.2.158.orig/tests/layers/vk_format_utils.h ++++ Vulkan-Loader-1.2.158/tests/layers/vk_format_utils.h +@@ -25,7 +25,9 @@ + #include "vulkan/vulkan.h" + + #if !defined(VK_LAYER_EXPORT) +-#if defined(__GNUC__) && __GNUC__ >= 4 ++#if defined(_WIN32) ++#define VK_LAYER_EXPORT __declspec(dllexport) ++#elif defined(__GNUC__) && __GNUC__ >= 4 + #define VK_LAYER_EXPORT __attribute__((visibility("default"))) + #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) + #define VK_LAYER_EXPORT __attribute__((visibility("default"))) diff --git a/mingw-w64-vulkan-loader/003-generate-pkgconfig-files.patch b/mingw-w64-vulkan-loader/003-generate-pkgconfig-files.patch index 770079b3de..33302558ce 100644 --- a/mingw-w64-vulkan-loader/003-generate-pkgconfig-files.patch +++ b/mingw-w64-vulkan-loader/003-generate-pkgconfig-files.patch @@ -1,18 +1,18 @@ -diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt ---- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt 2017-06-29 08:19:36.448133100 +0300 -+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt 2017-06-29 08:42:41.322355600 +0300 -@@ -286,6 +286,7 @@ - if(INSTALL_LVL_FILES) - install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +--- Vulkan-Loader-1.2.158.orig/loader/CMakeLists.txt ++++ Vulkan-Loader-1.2.158/loader/CMakeLists.txt +@@ -308,6 +318,7 @@ + ) + # cmake-format: on endif() +endif() if(NOT APPLE) - # Generate pkg-config file. -@@ -302,6 +302,5 @@ - endif() + target_compile_definitions(vulkan PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink +@@ -323,7 +334,6 @@ + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endif() endif() -endif() - + target_link_libraries(vulkan Vulkan::Headers) + add_library(Vulkan::Vulkan ALIAS vulkan) diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD index 7eb1b19eed..3c9c2d502a 100644 --- a/mingw-w64-vulkan-loader/PKGBUILD +++ b/mingw-w64-vulkan-loader/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-vulkan-loader pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-loader") provides=("${MINGW_PACKAGE_PREFIX}-vulkan") replaces=("${MINGW_PACKAGE_PREFIX}-vulkan") -pkgver=1.2.148 +pkgver=1.2.158 pkgrel=1 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)' arch=('any') @@ -18,17 +18,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-vulkan-headers" "${MINGW_PACKAGE_PREFIX}-python") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" - 001-build-fix.patch 002-proper-def-files-for-32bit.patch 003-generate-pkgconfig-files.patch) -sha256sums=('8f4dca3d125965dcb4c4f19ff9dddae893b5f071d63cfd9e47658ccae2414843' - 'd0be58fb70d1d0ba66ddfca8c7fe693d1ae5f77e9e2f8341e9a62934e0e94556' - 'd101e9718b5dc974641ab63084b2f55c48633b4f1fc713d386df34960995e73b' - '5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad') +sha256sums=('dc9e6a0b5296edb962d3dc168a257cbc1759e1d28afb8b4061a1bc5cb0fa7ede' + '1ba7c0a5e5c37e2c11936c92f2da19b201e63765e9d1ab9e0640d8ff5627692f' + 'd97fbcc042eb303812df7bc5f714ffacaf36381a77ced0991004df5dac9e975b') prepare() { cd ${srcdir}/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-build-fix.patch + #patch -p1 -i ${srcdir}/001-build-fix.patch patch -p1 -i ${srcdir}/002-proper-def-files-for-32bit.patch patch -p1 -i ${srcdir}/003-generate-pkgconfig-files.patch }