Accepting request 668285 from X11:Wayland
- Update to new upstream release 1.1.97.0 OBS-URL: https://build.opensuse.org/request/show/668285 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vulkan-tools?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c0afe655ed
@ -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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e12b9b6b32350cb87447f7b3bb92fef485d35b0ea0ebff8338ee882ea99a4dcf
|
||||
size 203492
|
||||
3
Vulkan-Tools-1.1.97.0.tar.xz
Normal file
3
Vulkan-Tools-1.1.97.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:036561f4976bb5c16dcbe4a23004c1a09f4ce61b0f033fecdcd25f7898314ba9
|
||||
size 207620
|
||||
6
_service
6
_service
@ -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">sdk-1.1.92.0</param>
|
||||
<param name="parent-tag">sdk-1.1.92.0</param>
|
||||
<param name="versionformat">1.1.92</param>
|
||||
<param name="revision">sdk-1.1.97.0</param>
|
||||
<param name="parent-tag">v1.1.96</param>
|
||||
<param name="versionformat">1.1.97.0</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Update to new upstream release+snapshot 1.1.96+git6
|
||||
* vulkaninfo: Add VK_EXT_pci_bus_info
|
||||
* vulkaninfo: Update enums to 1.1.89 headers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 2 15:12:52 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package vulkan-tools
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,10 +16,10 @@
|
||||
#
|
||||
|
||||
|
||||
%define version_unconverted 1.1.92
|
||||
%define version_unconverted 1.1.97.0
|
||||
|
||||
Name: vulkan-tools
|
||||
Version: 1.1.92
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user