diff --git a/.gitignore b/.gitignore index 29f5101..b1c0012 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Vulkan-Loader-1.1.82.0.tar.gz /Vulkan-Loader-1.1.97.0.tar.gz /Vulkan-Loader-1.1.101.0.tar.gz +/Vulkan-Loader-1.1.106.0.tar.gz diff --git a/mingw-vulkan-loader.spec b/mingw-vulkan-loader.spec index 1323b2a..7b2fa96 100644 --- a/mingw-vulkan-loader.spec +++ b/mingw-vulkan-loader.spec @@ -7,7 +7,7 @@ #global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: mingw-%{pkgname} -Version: 1.1.101.0 +Version: 1.1.106.0 Release: 1%{?commit:.git%{shortcommit}}%{?dist} Summary: MinGW Windows %{pkgname} library @@ -97,6 +97,9 @@ MinGW Windows %{pkgname} library. %changelog +* Sat Apr 20 2019 Sandro Mani - 1.1.106.0-1 +- Update to 1.1.106.0 + * Tue Apr 02 2019 Sandro Mani - 1.1.101.1-1 - Update to 1.1.101.1 diff --git a/sources b/sources index 986e945..e2c286b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-Loader-1.1.101.0.tar.gz) = da1fa7483bc7226fb6968f2c68ade476a3cd17c5e216cb4fce80dc43aba30ce29d776f5ae3228f440961aae93b1c72a04e76ed634d37e32600339a3539ba9c0d +SHA512 (Vulkan-Loader-1.1.106.0.tar.gz) = 0de32ffb4731d8efa6b86e972a36fad5856b390d2d07e9071d97d80e9d5ed5d2c3bbb32e07d0eccf02f6279b36e2a71097fb26ef7edac8347a85573100f54644 diff --git a/vulkan-mingw.patch b/vulkan-mingw.patch index 36b6863..bd978a7 100644 --- a/vulkan-mingw.patch +++ b/vulkan-mingw.patch @@ -1,7 +1,7 @@ -diff -rupN Vulkan-Loader-sdk-1.1.101.0/CMakeLists.txt Vulkan-Loader-sdk-1.1.101.0-new/CMakeLists.txt ---- Vulkan-Loader-sdk-1.1.101.0/CMakeLists.txt 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/CMakeLists.txt 2019-04-02 14:42:28.839397291 +0200 -@@ -104,6 +104,10 @@ if(WIN32) +diff -rupN Vulkan-Loader-sdk-1.1.106.0/CMakeLists.txt Vulkan-Loader-sdk-1.1.106.0-new/CMakeLists.txt +--- Vulkan-Loader-sdk-1.1.106.0/CMakeLists.txt 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/CMakeLists.txt 2019-04-20 11:42:21.605787270 +0200 +@@ -114,6 +114,10 @@ if(WIN32) option(ENABLE_STATIC_LOADER "Build the loader as a static library" OFF) endif() @@ -12,9 +12,9 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/CMakeLists.txt Vulkan-Loader-sdk-1.1.101. option(BUILD_LOADER "Build loader" ON) if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest) -diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1.1.101.0-new/loader/CMakeLists.txt ---- Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/loader/CMakeLists.txt 2019-04-02 14:42:28.839397291 +0200 +diff -rupN Vulkan-Loader-sdk-1.1.106.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1.1.106.0-new/loader/CMakeLists.txt +--- Vulkan-Loader-sdk-1.1.106.0/loader/CMakeLists.txt 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/loader/CMakeLists.txt 2019-04-20 11:42:21.605787270 +0200 @@ -56,7 +56,7 @@ endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") @@ -33,7 +33,7 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1 enable_language(ASM_MASM) if(CMAKE_ASM_MASM_COMPILER_WORKS) if(NOT CMAKE_CL_64) -@@ -179,7 +179,7 @@ GenerateFromVkXml(vk_loader_extensions.c +@@ -181,7 +181,7 @@ GenerateFromVkXml(vk_loader_extensions.c add_custom_target(loader_gen_files DEPENDS vk_loader_extensions.h vk_loader_extensions.c) set_target_properties(loader_gen_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER}) @@ -42,7 +42,7 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1 add_library(loader-norm OBJECT ${NORMAL_LOADER_SRCS} dirent_on_windows.c) add_dependencies(loader-norm generate_helper_files loader_gen_files) target_compile_options(loader-norm PUBLIC "$<$:${LOCAL_C_FLAGS_DBG}>") -@@ -219,7 +219,7 @@ if(WIN32) +@@ -224,7 +224,7 @@ if(WIN32) target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB) set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB") else() @@ -51,7 +51,7 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1 endif() add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files) -@@ -243,6 +243,10 @@ else() +@@ -248,6 +248,10 @@ else() VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}") target_link_libraries(vulkan -ldl -lpthread -lm) @@ -59,12 +59,12 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/CMakeLists.txt Vulkan-Loader-sdk-1 + target_link_libraries(vulkan cfgmgr32) + set_target_properties(vulkan PROPERTIES OUTPUT_NAME vulkan-1) + endif(WIN32) + target_link_libraries(vulkan Vulkan::Headers) if(APPLE) - find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation) -diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/loader.c Vulkan-Loader-sdk-1.1.101.0-new/loader/loader.c ---- Vulkan-Loader-sdk-1.1.101.0/loader/loader.c 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/loader/loader.c 2019-04-02 14:42:28.840397290 +0200 +diff -rupN Vulkan-Loader-sdk-1.1.106.0/loader/loader.c Vulkan-Loader-sdk-1.1.106.0-new/loader/loader.c +--- Vulkan-Loader-sdk-1.1.106.0/loader/loader.c 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/loader/loader.c 2019-04-20 11:42:21.606787214 +0200 @@ -60,9 +60,16 @@ #include "murmurhash.h" @@ -84,9 +84,9 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/loader.c Vulkan-Loader-sdk-1.1.101 #endif // This is a CMake generated file with #defines for any functions/includes -diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/loader.rc Vulkan-Loader-sdk-1.1.101.0-new/loader/loader.rc ---- Vulkan-Loader-sdk-1.1.101.0/loader/loader.rc 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/loader/loader.rc 2019-04-02 14:42:28.841397288 +0200 +diff -rupN Vulkan-Loader-sdk-1.1.106.0/loader/loader.rc Vulkan-Loader-sdk-1.1.106.0-new/loader/loader.rc +--- Vulkan-Loader-sdk-1.1.106.0/loader/loader.rc 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/loader/loader.rc 2019-04-20 11:42:21.606787214 +0200 @@ -43,7 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -96,9 +96,9 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/loader.rc Vulkan-Loader-sdk-1.1.10 #define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_BUILDNO -diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/vk_loader_platform.h Vulkan-Loader-sdk-1.1.101.0-new/loader/vk_loader_platform.h ---- Vulkan-Loader-sdk-1.1.101.0/loader/vk_loader_platform.h 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/loader/vk_loader_platform.h 2019-04-02 14:42:28.841397288 +0200 +diff -rupN Vulkan-Loader-sdk-1.1.106.0/loader/vk_loader_platform.h Vulkan-Loader-sdk-1.1.106.0-new/loader/vk_loader_platform.h +--- Vulkan-Loader-sdk-1.1.106.0/loader/vk_loader_platform.h 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/loader/vk_loader_platform.h 2019-04-20 11:42:21.606787214 +0200 @@ -25,7 +25,7 @@ #if defined(_WIN32) @@ -121,9 +121,9 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/loader/vk_loader_platform.h Vulkan-Loader // 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 -diff -rupN Vulkan-Loader-sdk-1.1.101.0/tests/CMakeLists.txt Vulkan-Loader-sdk-1.1.101.0-new/tests/CMakeLists.txt ---- Vulkan-Loader-sdk-1.1.101.0/tests/CMakeLists.txt 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/tests/CMakeLists.txt 2019-04-02 14:42:28.841397288 +0200 +diff -rupN Vulkan-Loader-sdk-1.1.106.0/tests/CMakeLists.txt Vulkan-Loader-sdk-1.1.106.0-new/tests/CMakeLists.txt +--- Vulkan-Loader-sdk-1.1.106.0/tests/CMakeLists.txt 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/tests/CMakeLists.txt 2019-04-20 11:42:21.606787214 +0200 @@ -122,8 +122,8 @@ if(WIN32) file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} GTEST_COPY_DEST) endif() @@ -135,10 +135,10 @@ diff -rupN Vulkan-Loader-sdk-1.1.101.0/tests/CMakeLists.txt Vulkan-Loader-sdk-1. # Copy the loader shared lib (if built) to the test application directory so the test app finds it. if((NOT ENABLE_STATIC_LOADER) AND TARGET vulkan) add_custom_command(TARGET vk_loader_validation_tests POST_BUILD -diff -rupN Vulkan-Loader-sdk-1.1.101.0/tests/layers/CMakeLists.txt Vulkan-Loader-sdk-1.1.101.0-new/tests/layers/CMakeLists.txt ---- Vulkan-Loader-sdk-1.1.101.0/tests/layers/CMakeLists.txt 2019-03-01 04:45:30.000000000 +0100 -+++ Vulkan-Loader-sdk-1.1.101.0-new/tests/layers/CMakeLists.txt 2019-04-02 14:42:28.841397288 +0200 -@@ -49,7 +49,7 @@ include_directories(${CMAKE_CURRENT_SOUR +diff -rupN Vulkan-Loader-sdk-1.1.106.0/tests/layers/CMakeLists.txt Vulkan-Loader-sdk-1.1.106.0-new/tests/layers/CMakeLists.txt +--- Vulkan-Loader-sdk-1.1.106.0/tests/layers/CMakeLists.txt 2019-04-15 23:36:29.000000000 +0200 ++++ Vulkan-Loader-sdk-1.1.106.0-new/tests/layers/CMakeLists.txt 2019-04-20 11:42:21.606787214 +0200 +@@ -51,7 +51,7 @@ include_directories(${CMAKE_CURRENT_SOUR ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR})