Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan /
vulkan-loader
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:
- debian/changelog
- debian/control
- debian/libvulkan1.symbols
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+vulkan-loader (1.3.280.0-2) UNRELEASED; urgency=medium
+
+ [ Pino Toscano ]
+ * Enable the build on all the architectures, as this source is generally
+ portable, and upstream accepts ports: (Closes: #907152)
+ - 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
+
+ -- Debian X Strike Force <debian-x@lists.debian.org> Mon, 15 Apr 2024
20:11:57 +0200
+
vulkan-loader (1.3.280.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Timo Aaltonen <tjaal...@debian.org>
Build-Depends: debhelper-compat (= 12),
cmake,
googletest <!nocheck>,
- libwayland-dev,
+ libwayland-dev [linux-any],
libx11-dev,
libxcb1-dev,
libxrandr-dev,
@@ -18,7 +18,7 @@ Vcs-Git:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader.git
Vcs-Browser: https://salsa.debian.org/xorg-team/vulkan/vulkan-loader
Package: libvulkan1
-Architecture: linux-any
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: vulkan-loader,
libvulkan-dev (<< 1.1.70+dfsg1-2),
@@ -36,7 +36,7 @@ Description: Vulkan loader library
Package: libvulkan-dev
Section: libdevel
-Architecture: linux-any
+Architecture: any
Depends:
libvulkan1 (= ${binary:Version}),
python3:any,
=====================================
debian/libvulkan1.symbols
=====================================
@@ -119,7 +119,7 @@ libvulkan.so.1 libvulkan1 #MINVER#
vkCreateShaderModule@Base 1.2.131.2
vkCreateSharedSwapchainsKHR@Base 1.2.131.2
vkCreateSwapchainKHR@Base 1.2.131.2
- vkCreateWaylandSurfaceKHR@Base 1.2.131.2
+ (arch=linux-any)vkCreateWaylandSurfaceKHR@Base 1.2.131.2
vkCreateXcbSurfaceKHR@Base 1.2.131.2
vkCreateXlibSurfaceKHR@Base 1.2.131.2
vkDestroyBuffer@Base 1.2.131.2
@@ -218,7 +218,7 @@ libvulkan.so.1 libvulkan1 #MINVER#
vkGetPhysicalDeviceSurfacePresentModesKHR@Base 1.2.131.2
vkGetPhysicalDeviceSurfaceSupportKHR@Base 1.2.131.2
vkGetPhysicalDeviceToolProperties@Base 1.3.204.0
- vkGetPhysicalDeviceWaylandPresentationSupportKHR@Base 1.2.131.2
+ (arch=linux-any)vkGetPhysicalDeviceWaylandPresentationSupportKHR@Base
1.2.131.2
vkGetPhysicalDeviceXcbPresentationSupportKHR@Base 1.2.131.2
vkGetPhysicalDeviceXlibPresentationSupportKHR@Base 1.2.131.2
vkGetPipelineCacheData@Base 1.2.131.2
=====================================
debian/rules
=====================================
@@ -5,6 +5,10 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
include /usr/share/dpkg/pkg-info.mk
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+EXTRA_CMAKE_ARGS += -DBUILD_WSI_WAYLAND_SUPPORT=OFF
+endif
+
%:
dh $@ --builddirectory=build/
@@ -33,7 +37,8 @@ endif
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-DBUILD_WSI_MIR_SUPPORT=OFF \
-DLOADER_CODEGEN=ON \
- -DVULKAN_HEADERS_INSTALL_DIR=$(CURDIR)/debian/tmp-vulkan-headers/usr
+ -DVULKAN_HEADERS_INSTALL_DIR=$(CURDIR)/debian/tmp-vulkan-headers/usr \
+ $(EXTRA_CMAKE_ARGS)
override_dh_auto_build:
mkdir -p loader/generated
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/-/commit/395d0d6aac358dc3927104bca4258611f451214e
--
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/-/commit/395d0d6aac358dc3927104bca4258611f451214e
You're receiving this email because of your account on salsa.debian.org.
