Commits:
-
395d0d6a
by Pino Toscano at 2024-04-15T20:12:39+02:00
Enable the build on all the architectures (#907152)
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 build dependency as linux-any
- pass -DBUILD_WSI_WAYLAND_SUPPORT=OFF to cmake on non-Linux
architectures to explicitly disable the Wayland integration
- mark two Wayland-related symbols as linux-any
4 changed files:
Changes:
debian/changelog
|
|
1
|
+vulkan-loader (1.3.280.0-2) UNRELEASED; urgency=medium
|
|
|
2
|
+
|
|
|
3
|
+ [ Pino Toscano ]
|
|
|
4
|
+ * Enable the build on all the architectures, as this source is generally
|
|
|
5
|
+ portable, and upstream accepts ports: (Closes: #907152)
|
|
|
6
|
+ - switch the architecture of the binaries from linux-any to any
|
|
|
7
|
+ - Wayland is still Linux-specific, so:
|
|
|
8
|
+ - limit the libwayland-dev build dependency as linux-any
|
|
|
9
|
+ - pass -DBUILD_WSI_WAYLAND_SUPPORT=OFF to cmake on non-Linux
|
|
|
10
|
+ architectures to explicitly disable the Wayland integration
|
|
|
11
|
+ - mark two Wayland-related symbols as linux-any
|
|
|
12
|
+
|
|
|
13
|
+ -- Debian X Strike Force <debian-x@lists.debian.org> Mon, 15 Apr 2024 20:11:57 +0200
|
|
|
14
|
+
|
|
1
|
15
|
vulkan-loader (1.3.280.0-1) unstable; urgency=medium
|
|
2
|
16
|
|
|
3
|
17
|
* New upstream release.
|
debian/control
| ... |
... |
@@ -5,7 +5,7 @@ Uploaders: Timo Aaltonen <tjaalton@debian.org> |
|
5
|
5
|
Build-Depends: debhelper-compat (= 12),
|
|
6
|
6
|
cmake,
|
|
7
|
7
|
googletest <!nocheck>,
|
|
8
|
|
- libwayland-dev,
|
|
|
8
|
+ libwayland-dev [linux-any],
|
|
9
|
9
|
libx11-dev,
|
|
10
|
10
|
libxcb1-dev,
|
|
11
|
11
|
libxrandr-dev,
|
| ... |
... |
@@ -18,7 +18,7 @@ Vcs-Git: https://salsa.debian.org/xorg-team/vulkan/vulkan-loader.git |
|
18
|
18
|
Vcs-Browser: https://salsa.debian.org/xorg-team/vulkan/vulkan-loader
|
|
19
|
19
|
|
|
20
|
20
|
Package: libvulkan1
|
|
21
|
|
-Architecture: linux-any
|
|
|
21
|
+Architecture: any
|
|
22
|
22
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
|
23
|
23
|
Breaks: vulkan-loader,
|
|
24
|
24
|
libvulkan-dev (<< 1.1.70+dfsg1-2),
|
| ... |
... |
@@ -36,7 +36,7 @@ Description: Vulkan loader library |
|
36
|
36
|
|
|
37
|
37
|
Package: libvulkan-dev
|
|
38
|
38
|
Section: libdevel
|
|
39
|
|
-Architecture: linux-any
|
|
|
39
|
+Architecture: any
|
|
40
|
40
|
Depends:
|
|
41
|
41
|
libvulkan1 (= ${binary:Version}),
|
|
42
|
42
|
python3:any,
|
debian/libvulkan1.symbols
| ... |
... |
@@ -119,7 +119,7 @@ libvulkan.so.1 libvulkan1 #MINVER# |
|
119
|
119
|
vkCreateShaderModule@Base 1.2.131.2
|
|
120
|
120
|
vkCreateSharedSwapchainsKHR@Base 1.2.131.2
|
|
121
|
121
|
vkCreateSwapchainKHR@Base 1.2.131.2
|
|
122
|
|
- vkCreateWaylandSurfaceKHR@Base 1.2.131.2
|
|
|
122
|
+ (arch=linux-any)vkCreateWaylandSurfaceKHR@Base 1.2.131.2
|
|
123
|
123
|
vkCreateXcbSurfaceKHR@Base 1.2.131.2
|
|
124
|
124
|
vkCreateXlibSurfaceKHR@Base 1.2.131.2
|
|
125
|
125
|
vkDestroyBuffer@Base 1.2.131.2
|
| ... |
... |
@@ -218,7 +218,7 @@ libvulkan.so.1 libvulkan1 #MINVER# |
|
218
|
218
|
vkGetPhysicalDeviceSurfacePresentModesKHR@Base 1.2.131.2
|
|
219
|
219
|
vkGetPhysicalDeviceSurfaceSupportKHR@Base 1.2.131.2
|
|
220
|
220
|
vkGetPhysicalDeviceToolProperties@Base 1.3.204.0
|
|
221
|
|
- vkGetPhysicalDeviceWaylandPresentationSupportKHR@Base 1.2.131.2
|
|
|
221
|
+ (arch=linux-any)vkGetPhysicalDeviceWaylandPresentationSupportKHR@Base 1.2.131.2
|
|
222
|
222
|
vkGetPhysicalDeviceXcbPresentationSupportKHR@Base 1.2.131.2
|
|
223
|
223
|
vkGetPhysicalDeviceXlibPresentationSupportKHR@Base 1.2.131.2
|
|
224
|
224
|
vkGetPipelineCacheData@Base 1.2.131.2
|
debian/rules
| ... |
... |
@@ -5,6 +5,10 @@ DPKG_EXPORT_BUILDFLAGS = 1 |
|
5
|
5
|
include /usr/share/dpkg/default.mk
|
|
6
|
6
|
include /usr/share/dpkg/pkg-info.mk
|
|
7
|
7
|
|
|
|
8
|
+ifneq (linux,$(DEB_HOST_ARCH_OS))
|
|
|
9
|
+EXTRA_CMAKE_ARGS += -DBUILD_WSI_WAYLAND_SUPPORT=OFF
|
|
|
10
|
+endif
|
|
|
11
|
+
|
|
8
|
12
|
%:
|
|
9
|
13
|
dh $@ --builddirectory=build/
|
|
10
|
14
|
|
| ... |
... |
@@ -33,7 +37,8 @@ endif |
|
33
|
37
|
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
|
|
34
|
38
|
-DBUILD_WSI_MIR_SUPPORT=OFF \
|
|
35
|
39
|
-DLOADER_CODEGEN=ON \
|
|
36
|
|
- -DVULKAN_HEADERS_INSTALL_DIR=$(CURDIR)/debian/tmp-vulkan-headers/usr
|
|
|
40
|
+ -DVULKAN_HEADERS_INSTALL_DIR=$(CURDIR)/debian/tmp-vulkan-headers/usr \
|
|
|
41
|
+ $(EXTRA_CMAKE_ARGS)
|
|
37
|
42
|
|
|
38
|
43
|
override_dh_auto_build:
|
|
39
|
44
|
mkdir -p loader/generated
|
|