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