9 Commits

Author SHA256 Message Date
4f8fab8d8b Trim cmake.patch 2025-07-17 08:34:30 +02:00
aeba815071 vulkan-tools SDK-1.4.321.0 2025-07-17 08:15:05 +02:00
7381c1d02a Add cmake.patch 2025-07-06 17:42:17 +02:00
54496bc767 Remove unused dependency on vulkan-volk 2025-06-05 21:09:48 +02:00
76a7fb791b vulkan-tools SDK-1.4.313.0 2025-05-18 11:11:33 +02:00
9d34012fd0 vulkan-tools SDK-1.4.309.0 2025-03-13 17:42:07 +01:00
c52efca805 vulkan-tools 1.4.304 2024-12-24 02:33:39 +01:00
87d26be6c9 vulkan-tools 1.3.296 2024-10-08 19:14:31 +02:00
656e64931f vulkan-tools 1.3.290 2024-07-23 07:31:06 +02:00
5 changed files with 110 additions and 9 deletions

50
cmake.patch Normal file
View File

@@ -0,0 +1,50 @@
From 2cb1cd9899748daa5c30f822aaafdc4d2fcca464 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 6 Jul 2025 17:27:55 +0200
Subject: [PATCH] build: workaround FTBFS due to cmake
References: https://github.com/KhronosGroup/Vulkan-Tools/issues/1130
[6/19] Building C object cube/CMakeFiles/vkcube.dir/cube.c.o
FAILED: [code=2] cube/CMakeFiles/vkcube.dir/cube.c.o
/usr/bin/cc -D/usr/lib64/libm.so" -DVK_USE_PLATFORM_DISPLAY_KHR -DVK_USE_PLATFORM_WAYLAND_KHR -DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XLIB_KHR -DWAYLAND_LIBRARY=\"/usr/lib64/libwayland-client.so -DXCB_LIBRARY=\"/usr/lib64/libxcb.so\" -DXLIB_LIBRARY=\"/usr/lib64/libX11.so\" -I/usr/include/wayland -I/home/ej/obs_nosave/zu/X11/Wayland/vulkan-tools/Vulkan-Tools/cube -I/home/ej/obs_nosave/zu/X11/Wayland/vulkan-tools/Vulkan-Tools/cube/. -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -O2 -g -DNDEBUG -std=c99 -fPIE -fvisibility=hidden -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-stringop-truncation -MD -MT cube/CMakeFiles/vkcube.dir/cube.c.o -MF cube/CMakeFiles/vkcube.dir/cube.c.o.d -o cube/CMakeFiles/vkcube.dir/cube.c.o -c /home/ej/obs_nosave/zu/X11/Wayland/vulkan-tools/Vulkan-Tools/cube/cube.c
/bin/sh: -c: line 1: unexpected EOF while looking for matching `"'
ninja: build stopped: subcommand failed.
Effectively switch from cc -DXLIB_LIBRARY=... to -UXLIB_LIBRARY.
I found the C code already handles this approach appropriately.
---
cube/CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
Index: Vulkan-Tools-vulkan-sdk-1.4.321.0/cube/CMakeLists.txt
===================================================================
--- Vulkan-Tools-vulkan-sdk-1.4.321.0.orig/cube/CMakeLists.txt
+++ Vulkan-Tools-vulkan-sdk-1.4.321.0/cube/CMakeLists.txt
@@ -308,13 +308,10 @@ if (ANDROID)
endif()
if (XCB_LINK_LIBRARIES)
- target_compile_definitions(vkcube PRIVATE "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"")
endif()
if (X11_LINK_LIBRARIES)
- target_compile_definitions(vkcube PRIVATE "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"")
endif()
if (WAYLAND_CLIENT_LINK_LIBRARIES)
- target_compile_definitions(vkcube PRIVATE "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
endif()
# ----------------------------------------------------------------------------
@@ -361,13 +358,10 @@ target_compile_definitions(vkcubepp PRIV
target_link_libraries(vkcubepp ${CMAKE_DL_LIBS} Vulkan::Headers)
if (XCB_LINK_LIBRARIES )
- target_compile_definitions(vkcubepp PUBLIC "XCB_LIBRARY=\"${XCB_LINK_LIBRARIES}\"")
endif()
if (X11_LINK_LIBRARIES)
- target_compile_definitions(vkcubepp PUBLIC "XLIB_LIBRARY=\"${X11_LINK_LIBRARIES}\"")
endif()
if (WAYLAND_CLIENT_LINK_LIBRARIES)
- target_compile_definitions(vkcubepp PUBLIC "WAYLAND_LIBRARY=\"${WAYLAND_CLIENT_LINK_LIBRARIES}\"")
endif()
if(APPLE)

View File

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

BIN
vulkan-sdk-1.4.321.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +1,54 @@
-------------------------------------------------------------------
Thu Jul 17 06:13:32 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to tag SDK-1.4.321.0
* cube: prefer Wayland over X11 when available
-------------------------------------------------------------------
Sun Jul 6 15:30:16 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Add cmake.patch
-------------------------------------------------------------------
Thu Jun 5 19:09:31 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Remove unused dependency on vulkan-volk
-------------------------------------------------------------------
Sun May 18 04:29:18 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to tag SDK-1.4.313.0
* vkcubepp: Support protected output
* cube: Only count non-minimized frames
-------------------------------------------------------------------
Thu Mar 13 16:41:22 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to tag SDK-1.4.309.0
* vulkaninfo: Add video profiles support
* cube: Correctly apply sRGB OETF/EOTF
* icd: Add VkPhysicalDeviceMaintenance3Properties
-------------------------------------------------------------------
Tue Dec 24 01:33:04 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to tag 1.4.304
* icd: add support for AV1 encode and QP maps
-------------------------------------------------------------------
Tue Oct 8 17:13:46 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release SDK-1.3.296
* vulkaninfo: Add --show-promoted-structs option
* vulkaninfo: Only iterate 2-call idiom when needed
* vulkaninfo: Correctly query per-surface queue support
-------------------------------------------------------------------
Tue Jul 23 05:26:36 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release SDK-1.3.290
* cube: Fix incremental present on swapchain recreate
-------------------------------------------------------------------
Thu May 16 12:21:39 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package vulkan-tools
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,21 @@
Name: vulkan-tools
Version: 1.3.283.0
Version: 1.4.321
Release: 0
Summary: Diagnostic utilities for Vulkan
License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/KhronosGroup/Vulkan-Tools
Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-%version.tar.gz
Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-%version.0.tar.gz
Source9: baselibs.conf
Patch1: cmake.patch
BuildRequires: cmake >= 3.17
BuildRequires: gcc-c++ >= 4.8
BuildRequires: glslang-devel
BuildRequires: pkg-config
BuildRequires: python3-base
BuildRequires: vulkan-volk-devel >= 1.3.283
BuildRequires: pkgconfig(vulkan) >= 1.3.283
BuildRequires: pkgconfig(vulkan) >= %version
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
@@ -46,7 +46,7 @@ graphics applications such as games and interactive media.
This package contains the Khronos official Vulkan tools and utilities.
%prep
%autosetup -p1 -n Vulkan-Tools-vulkan-sdk-%version
%autosetup -n Vulkan-Tools-vulkan-sdk-%version.0 -p1
%build
mkdir -p glslang/bin