From dcc9b79fbe2feca8ad94ad6aec7a72e0d0ccd7bd Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 8 Nov 2019 09:40:40 +0300 Subject: [PATCH] vulkan-loader: Update to 1.1.127 --- mingw-w64-vulkan-loader/001-build-fix.patch | 6 +++--- .../002-proper-def-files-for-32bit.patch | 8 ++++---- mingw-w64-vulkan-loader/PKGBUILD | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mingw-w64-vulkan-loader/001-build-fix.patch b/mingw-w64-vulkan-loader/001-build-fix.patch index 4d185e5cbc..944e7500cb 100644 --- a/mingw-w64-vulkan-loader/001-build-fix.patch +++ b/mingw-w64-vulkan-loader/001-build-fix.patch @@ -11,7 +11,7 @@ endif() --- a/loader/loader.c 2018-05-16 14:03:52.750814700 +0300 +++ b/loader/loader.c 2018-05-16 14:04:08.631642600 +0300 -@@ -613,6 +613,10 @@ +@@ -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. @@ -19,9 +19,9 @@ +#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, LPCTSTR value_name) { + 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}"; - static const wchar_t *displayGUID = L"{4d36e968-e325-11ce-bfc1-08002be10318}"; --- a/loader/loader.rc +++ b/loader/loader.rc @@ -43,8 +43,6 @@ 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 e78bafa551..1f722974f4 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,7 +1,7 @@ diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt --- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt 2017-04-05 00:36:39.000000000 +0300 +++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt 2017-06-29 08:34:52.393725000 +0300 -@@ -61,6 +61,16 @@ +@@ -153,6 +153,16 @@ endif() endif() @@ -15,9 +15,9 @@ diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vul + endif() +endif() + - if(WIN32) - # Treat warnings as errors - add_compile_options("$<$:/WX>") + if(MSVC) + # /WX: Treat warnings as errors + # /GR-: Disable RTTI 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 diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD index a94b554aa5..60ccbd1bfb 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.1.112 +pkgver=1.1.127 pkgrel=1 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)' arch=('any') @@ -21,9 +21,9 @@ source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KhronosGroup/${_realn 001-build-fix.patch 002-proper-def-files-for-32bit.patch 003-generate-pkgconfig-files.patch) -sha256sums=('26f8166d8bc1c4619309905263511b59c1ad1aa4177d0d3c511f46c46557b72d' - '64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295' - '1d43c03869b77de65a96abd19d82e58b5a528a05fa35c837023fb17f460fa588' +sha256sums=('5fcdf81c7adde3610f94197dfb1cb78ed740627810b72481a0bafa4f7d67f6be' + 'e1d765334a6582e2df41986d876a578e1c978a73a741f204332f073ce20f23a7' + '9dab5dbf0059599a96112c57d508644a718f237fd7358e6a94431da230a9196a' '5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad') prepare() {