Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan /
vulkan-tools
Commits:
2ba84987 by Pino Toscano at 2025-01-19T08:55:14+01:00
Enable the build on all the architectures
this source is generally portable, and upstream accepts ports:
- switch the architecture of the binaries from linux-any to any
- Wayland is still Linux-specific, so:
- limit the libwayland-dev, and wayland-protocols build dependencies
as linux-any
- pass -DBUILD_WSI_WAYLAND_SUPPORT=OFF to cmake on non-Linux
architectures to explicitly disable the Wayland integration
- add the dh-exec build dependency for OS filtering in install files
- install vkcube-wayland only on Linux
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/rules
- debian/vulkan-tools.install
Changes:
=====================================
debian/changelog
=====================================
@@ -3,6 +3,18 @@ vulkan-tools (1.4.304.0+dfsg1-1) UNRELEASED; urgency=medium
* New upstream release.
* control: Bump build-deps.
+ [ Pino Toscano ]
+ * Enable the build on all the architectures, as this source is generally
+ portable, and upstream accepts ports:
+ - switch the architecture of the binaries from linux-any to any
+ - Wayland is still Linux-specific, so:
+ - limit the libwayland-dev, and wayland-protocols build dependencies
+ as linux-any
+ - pass -DBUILD_WSI_WAYLAND_SUPPORT=OFF to cmake on non-Linux
+ architectures to explicitly disable the Wayland integration
+ - add the dh-exec build dependency for OS filtering in install files
+ - install vkcube-wayland only on Linux
+
-- Timo Aaltonen <tjaal...@debian.org> Wed, 16 Oct 2024 13:56:56 +0300
vulkan-tools (1.3.290.0+dfsg1-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -3,16 +3,17 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends: debhelper-compat (= 13),
cmake,
+ dh-exec,
glslang-tools,
libvulkan-dev (>= 1.4.304.0),
libvulkan-volk-dev (>= 1.4.304.0),
- libwayland-dev,
+ libwayland-dev [linux-any],
libx11-dev,
libxcb1-dev,
libxrandr-dev,
pkgconf,
python3,
- wayland-protocols,
+ wayland-protocols [linux-any],
Standards-Version: 4.6.2
Section: libs
Homepage: https://github.com/KhronosGroup/Vulkan-Tools
@@ -20,7 +21,7 @@ Vcs-Git:
https://salsa.debian.org/xorg-team/vulkan/vulkan-tools.git
Vcs-Browser: https://salsa.debian.org/xorg-team/vulkan/vulkan-tools
Package: vulkan-tools
-Architecture: linux-any
+Architecture: any
Section: graphics
Depends: ${shlibs:Depends}, ${misc:Depends},
libvulkan1,
=====================================
debian/rules
=====================================
@@ -4,12 +4,17 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+EXTRA_CMAKE_ARGS += -DBUILD_WSI_WAYLAND_SUPPORT=OFF
+endif
+
%:
dh $@ --builddirectory=build/
override_dh_auto_configure:
dh_auto_configure -- \
- -DGLSLANG_INSTALL_DIR=/usr/bin
+ -DGLSLANG_INSTALL_DIR=/usr/bin \
+ $(EXTRA_CMAKE_ARGS)
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
=====================================
debian/vulkan-tools.install
=====================================
@@ -1,4 +1,5 @@
+#!/usr/bin/dh-exec
usr/bin/vulkaninfo
usr/bin/vkcube
-usr/bin/vkcube-wayland
+[linux-any] usr/bin/vkcube-wayland
usr/bin/vkcubepp
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-tools/-/commit/2ba849875a52df3e0002b7e5cd30323ce0dc41d0
--
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-tools/-/commit/2ba849875a52df3e0002b7e5cd30323ce0dc41d0
You're receiving this email because of your account on salsa.debian.org.
