Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan /
vulkan-loader
Commits:
7ff3d4bd by Timo Aaltonen at 2023-01-21T18:39:01+02:00
Make -dev multiarch-friendly again by installing cmake files to libdir.
(Closes: #1029194)
- - - - -
7947e5cb by Timo Aaltonen at 2023-01-21T18:39:19+02:00
release to sid
- - - - -
5 changed files:
- debian/changelog
- debian/libvulkan-dev.install
- + debian/patches/fix-headers-install.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+vulkan-loader (1.3.236.0-2) unstable; urgency=medium
+
+ * Make -dev multiarch-friendly again by installing cmake files to
+ libdir. (Closes: #1029194)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Sat, 21 Jan 2023 18:39:02 +0200
+
vulkan-loader (1.3.236.0-1) unstable; urgency=medium
[ Timo Aaltonen ]
=====================================
debian/libvulkan-dev.install
=====================================
@@ -1,5 +1,5 @@
usr/include
+usr/lib/*/cmake/VulkanHeaders
usr/lib/*/libvulkan.so
usr/lib/*/pkgconfig/vulkan.pc
usr/share/vulkan/registry
-usr/share/cmake/VulkanHeaders
=====================================
debian/patches/fix-headers-install.diff
=====================================
@@ -0,0 +1,11 @@
+--- a/vulkan-headers/cmake/install.cmake
++++ b/vulkan-headers/cmake/install.cmake
+@@ -26,7 +26,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURC
+
+ set(export_name "VulkanHeadersConfig")
+ set(namespace "Vulkan::")
+-set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
++set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
+
+ # Set EXPORT_NAME for consistency with established names. The CMake generated
ones won't work.
+ set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
#placeholder
+fix-headers-install.diff
=====================================
debian/rules
=====================================
@@ -29,7 +29,7 @@ endif
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-DBUILD_WSI_MIR_SUPPORT=OFF \
-
-DVulkanHeaders_DIR=debian/tmp-vulkan-headers/usr/share/cmake/VulkanHeaders/
+
-DVulkanHeaders_DIR=debian/tmp-vulkan-headers/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/VulkanHeaders/
override_dh_auto_build:
dh_auto_build -- VulkanLoader_generated_source
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/-/compare/d9ec85ae789d6e81e443f220bfbc11bc734d8739...7947e5cb8662bf9215ed0277ac7bd12b70c8f579
--
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/-/compare/d9ec85ae789d6e81e443f220bfbc11bc734d8739...7947e5cb8662bf9215ed0277ac7bd12b70c8f579
You're receiving this email because of your account on salsa.debian.org.
