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

[Git][xorg-team/vulkan/vulkan-loader][debian-unstable] Fix use of vulkan-headers in debian/rules



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / vulkan-loader

Commits:

  • 8e353af2
    by Dylan Aïssi at 2023-01-12T16:35:46+01:00
    Fix use of vulkan-headers in debian/rules
    

2 changed files:

Changes:

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

  • debian/rules
    ... ... @@ -21,12 +21,15 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
    21 21
     	ln -s /usr/src/googletest external
    
    22 22
     endif
    
    23 23
     
    
    24
    +	dh_auto_configure --sourcedirectory=vulkan-headers --builddirectory=build-vulkan-headers/
    
    25
    +	dh_auto_build --sourcedirectory=vulkan-headers --builddirectory=build-vulkan-headers/
    
    26
    +	dh_auto_install --sourcedirectory=vulkan-headers --builddirectory=build-vulkan-headers/ --destdir=debian/tmp-vulkan-headers
    
    27
    +
    
    24 28
     	dh_auto_configure -- \
    
    25 29
     	-DCMAKE_BUILD_TYPE=Release \
    
    26 30
     	-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
    
    27 31
     	-DBUILD_WSI_MIR_SUPPORT=OFF \
    
    28
    -	-DVulkanHeaders_INCLUDE_DIR=../vulkan-headers/include \
    
    29
    -	-DVulkanRegistry_DIR=../vulkan-headers/registry
    
    32
    +	-DVulkanHeaders_DIR=debian/tmp-vulkan-headers/usr/share/cmake/VulkanHeaders/
    
    30 33
     
    
    31 34
     override_dh_auto_build:
    
    32 35
     	dh_auto_build -- VulkanLoader_generated_source
    
    ... ... @@ -41,9 +44,7 @@ endif
    41 44
     override_dh_auto_install:
    
    42 45
     	dh_auto_install --destdir=debian/tmp
    
    43 46
     
    
    44
    -	mkdir -p debian/tmp/usr/share/vulkan
    
    45
    -	cp -rp vulkan-headers/include debian/tmp/usr
    
    46
    -	cp -rp vulkan-headers/registry debian/tmp/usr/share/vulkan
    
    47
    +	cp -rp debian/tmp-vulkan-headers/usr debian/tmp/
    
    47 48
     	rm -rf debian/tmp/usr/share/vulkan/registry/__pycache__
    
    48 49
     	rm -rf debian/tmp/usr/share/vulkan/registry/spec_tools/__pycache__
    
    49 50
     
    


  • Reply to: