From 3cea0b5f2a3be65344811022a419659451208c4ba40ab10c4f3749fe2efa33d5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 24 Jan 2019 10:38:30 +0000 Subject: [PATCH] - Update to new upstream release 1.1.97.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-tools?expand=0&rev=10 --- ...g-wayland-client-search-path-for-moc.patch | 46 ------------------- Vulkan-Tools-1.1.96.g6.tar.xz | 3 -- Vulkan-Tools-1.1.97.0.tar.xz | 3 ++ _service | 4 +- vulkan-tools.changes | 11 +++++ vulkan-tools.spec | 8 ++-- 6 files changed, 19 insertions(+), 56 deletions(-) delete mode 100644 0001-build-add-missing-wayland-client-search-path-for-moc.patch delete mode 100644 Vulkan-Tools-1.1.96.g6.tar.xz create mode 100644 Vulkan-Tools-1.1.97.0.tar.xz diff --git a/0001-build-add-missing-wayland-client-search-path-for-moc.patch b/0001-build-add-missing-wayland-client-search-path-for-moc.patch deleted file mode 100644 index b92b241..0000000 --- a/0001-build-add-missing-wayland-client-search-path-for-moc.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 334a87efcefbdee39a4b383a0807102d4e78387d Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 12 Nov 2018 18:32:06 +0100 -Subject: [PATCH] build: add missing wayland-client search path for mock_icd - build -References: https://github.com/KhronosGroup/Vulkan-Tools/pull/94 - -Fix issues #1444 and #1989 of Vulkan-LoaderAndValidationLayers **again**. - - [ 82%] Building CXX object icd/CMakeFiles/VkICD_mock_icd.dir/mock_icd.cpp.o - cd $HOME/Vulkan-Tools/icd && /usr/bin/c++ - -DVK_USE_PLATFORM_WAYLAND_KHR -DVK_USE_PLATFORM_WAYLAND_KHX - -DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX - -DVK_USE_PLATFORM_XLIB_KHR -DVK_USE_PLATFORM_XLIB_KHX - -DVK_USE_PLATFORM_XLIB_XRANDR_EXT -DVkICD_mock_icd_EXPORTS - -I$HOME/Vulkan-Tools/icd -I$HOME/Vulkan-Tools -Wall -Wextra - -Wno-unused-parameter -Wno-missing-field-initializers - -fno-strict-aliasing -fno-builtin-memcmp -Wimplicit-fallthrough=0 - -std=c++11 -fno-rtti -fvisibility=hidden -Wpointer-arith - -Wno-unused-function -Wno-sign-compare -fPIC -o - CMakeFiles/VkICD_mock_icd.dir/mock_icd.cpp.o -c - $HOME/Vulkan-Tools/icd/mock_icd.cpp - In file included from /usr/include/vulkan/vk_icd.h:26, - from $HOME/Vulkan-Tools/icd/mock_icd.h:29, - from $HOME/Vulkan-Tools/icd/mock_icd.cpp:22: - /usr/include/vulkan/vulkan.h:48:10: fatal error: wayland-client.h: No such file or directory - #include ---- - icd/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt -index 21abf1c3..b569ab35 100644 ---- a/icd/CMakeLists.txt -+++ b/icd/CMakeLists.txt -@@ -158,6 +158,7 @@ endif() - - include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${VulkanHeaders_INCLUDE_DIR} -+ ${WAYLAND_CLIENT_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${PROJECT_BINARY_DIR} - ${CMAKE_BINARY_DIR}) --- -2.19.1 - diff --git a/Vulkan-Tools-1.1.96.g6.tar.xz b/Vulkan-Tools-1.1.96.g6.tar.xz deleted file mode 100644 index bfc39fc..0000000 --- a/Vulkan-Tools-1.1.96.g6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d08be1e1123d7f9e0735439fa6454da7174fb6795211167e5017d422b4114c4f -size 206956 diff --git a/Vulkan-Tools-1.1.97.0.tar.xz b/Vulkan-Tools-1.1.97.0.tar.xz new file mode 100644 index 0000000..6d35d5a --- /dev/null +++ b/Vulkan-Tools-1.1.97.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:036561f4976bb5c16dcbe4a23004c1a09f4ce61b0f033fecdcd25f7898314ba9 +size 207620 diff --git a/_service b/_service index e280c3c..96831c4 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ git https://github.com/KhronosGroup/Vulkan-Tools - 5190ca9e4c8e6eae1bacbfc93eb6013a5ee1901e + sdk-1.1.97.0 v1.1.96 - 1.1.96.g@TAG_OFFSET@ + 1.1.97.0 *.tar diff --git a/vulkan-tools.changes b/vulkan-tools.changes index be51b55..7716e51 100644 --- a/vulkan-tools.changes +++ b/vulkan-tools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 24 10:35:39 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 1.1.97.0 + * vulkaninfo: Update enums to 1.1.89 headers + * vulkaninfo: Add VK_KHR_shader_atomic_int64, + VK_EXT_transform_feedback, VK_EXT_scalar_block_layout, + VK_EXT_fragment_density_map + * Fix vulkaninfo segfault on 1.0 devices +- Remove 0001-build-add-missing-wayland-client-search-path-for-moc.patch + ------------------------------------------------------------------- Mon Jan 7 22:04:20 UTC 2019 - Jan Engelhardt diff --git a/vulkan-tools.spec b/vulkan-tools.spec index c00e158..14a5e24 100644 --- a/vulkan-tools.spec +++ b/vulkan-tools.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 1.1.96.g6 +%define version_unconverted 1.1.97.0 Name: vulkan-tools -Version: 1.1.96.g6 +Version: 1.1.97.0 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 @@ -27,7 +27,6 @@ Group: Development/Libraries/C and C++ URL: http://www.khronos.org/ #Git-URL: https://github.com/KhronosGroup/Vulkan-Tools Source: Vulkan-Tools-%version.tar.xz -Patch1: 0001-build-add-missing-wayland-client-search-path-for-moc.patch BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel @@ -47,8 +46,7 @@ graphics applications such as games and interactive media. This package contains the Khronos official Vulkan tools and utilities. %prep -%setup -qn Vulkan-Tools-%version -%patch -P 1 -p1 +%autosetup -p1 -n Vulkan-Tools-%version %build mkdir -p glslang/bin