[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/vulkan/vulkan-loader][debian-unstable] 2 commits: Make -dev multiarch-friendly again by installing cmake files to libdir. (Closes: #1029194)

Title: GitLab

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:

Changes:

  • debian/changelog
    1 
    +vulkan-loader (1.3.236.0-2) unstable; urgency=medium
    2 
    +
    3 
    +  * Make -dev multiarch-friendly again by installing cmake files to
    4 
    +   libdir. (Closes: #1029194)
    5 
    +
    6 
    + -- Timo Aaltonen <tjaalton@debian.org>  Sat, 21 Jan 2023 18:39:02 +0200
    7 
    +
    1 8 
     vulkan-loader (1.3.236.0-1) unstable; urgency=medium
    2 9
    3 10 
       [ Timo Aaltonen ]

  • debian/libvulkan-dev.install
    1 1 
     usr/include
    2 
    +usr/lib/*/cmake/VulkanHeaders
    2 3 
     usr/lib/*/libvulkan.so
    3 4 
     usr/lib/*/pkgconfig/vulkan.pc
    4 5 
     usr/share/vulkan/registry
    5 
    -usr/share/cmake/VulkanHeaders

  • debian/patches/fix-headers-install.diff
    1 
    +--- a/vulkan-headers/cmake/install.cmake
    2 
    ++++ b/vulkan-headers/cmake/install.cmake
    3 
    +@@ -26,7 +26,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURC
    4 
    +
    5 
    + set(export_name "VulkanHeadersConfig")
    6 
    + set(namespace "Vulkan::")
    7 
    +-set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
    8 
    ++set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
    9 
    +
    10 
    + # Set EXPORT_NAME for consistency with established names. The CMake generated ones won't work.
    11 
    + set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")

  • debian/patches/series
    1 1 
     #placeholder
    2 
    +fix-headers-install.diff

  • debian/rules
    ... ... @@ -29,7 +29,7 @@ endif
    29 29 
     	-DCMAKE_BUILD_TYPE=Release \
    30 30 
     	-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
    31 31 
     	-DBUILD_WSI_MIR_SUPPORT=OFF \
    32 
    -	-DVulkanHeaders_DIR=debian/tmp-vulkan-headers/usr/share/cmake/VulkanHeaders/
    32 
    +	-DVulkanHeaders_DIR=debian/tmp-vulkan-headers/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/VulkanHeaders/
    33 33
    34 34 
     override_dh_auto_build:
    35 35 
     	dh_auto_build -- VulkanLoader_generated_source

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: