SHA256
1
0
forked from pool/vulkan-tools

- 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
This commit is contained in:
Jan Engelhardt 2019-01-24 10:38:30 +00:00 committed by Git OBS Bridge
parent 24a0788c7a
commit 3cea0b5f2a
6 changed files with 19 additions and 56 deletions

View File

@ -1,46 +0,0 @@
From 334a87efcefbdee39a4b383a0807102d4e78387d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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 <wayland-client.h>
---
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d08be1e1123d7f9e0735439fa6454da7174fb6795211167e5017d422b4114c4f
size 206956

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:036561f4976bb5c16dcbe4a23004c1a09f4ce61b0f033fecdcd25f7898314ba9
size 207620

View File

@ -2,9 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/Vulkan-Tools</param>
<param name="revision">5190ca9e4c8e6eae1bacbfc93eb6013a5ee1901e</param>
<param name="revision">sdk-1.1.97.0</param>
<param name="parent-tag">v1.1.96</param>
<param name="versionformat">1.1.96.g@TAG_OFFSET@</param>
<param name="versionformat">1.1.97.0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jan 24 10:35:39 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de>

View File

@ -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