debian/libvulkan-dev.install | 1 + debian/libvulkan1.install | 2 ++ debian/rules | 24 +++++++++++++----------- 3 files changed, 16 insertions(+), 11 deletions(-)
New commits: commit b4892fd8d5fb7afb43a4d687b76670bcc2371ae9 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 11:29:58 2017 +0300 parallel build. FIXME: does not support having multiple options in DEB_BUILD_OPTIONS diff --git a/debian/rules b/debian/rules index f911926..d939626 100755 --- a/debian/rules +++ b/debian/rules @@ -4,9 +4,14 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + PMAKE += make $(if $(NUMJOBS),-j$(NUMJOBS)) +endif + # main packaging script based on dh7 syntax %: - dh $@ --with quilt --builddirectory=build/ + dh $@ --parallel --with quilt --builddirectory=build/ override_dh_clean: dh_clean @@ -19,9 +24,9 @@ build_spirv: mkdir -p external/glslang/build \ external/spirv-tools/build cd external/glslang/build && \ - (cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ..; make ; make install) + (cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ..; $(PMAKE); make install) cd external/spirv-tools/build/ && \ - (cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ..; make) + (cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ..; $(PMAKE)) override_dh_auto_configure: build_spirv dh_auto_configure -- \ commit dc3b5bafeb06fcb117e74cd8b63b146036527360 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 10:45:48 2017 +0300 install layer files again diff --git a/debian/libvulkan-dev.install b/debian/libvulkan-dev.install index c7a5d5d..dfdc4da 100644 --- a/debian/libvulkan-dev.install +++ b/debian/libvulkan-dev.install @@ -1,2 +1,3 @@ usr/include/vulkan usr/lib/*/libvulkan.so +usr/lib/*/libVkLayer*.so diff --git a/debian/libvulkan1.install b/debian/libvulkan1.install index 3ddde58..f55d4cf 100644 --- a/debian/libvulkan1.install +++ b/debian/libvulkan1.install @@ -1 +1,3 @@ usr/lib/*/lib*.so.* +usr/share/vulkan/explicit_layer.d +usr/share/vulkan/implicit_layer.d diff --git a/debian/rules b/debian/rules index 3e7f5c6..f911926 100755 --- a/debian/rules +++ b/debian/rules @@ -39,12 +39,9 @@ override_dh_auto_install: mkdir -p debian/tmp/usr/include cp -rp include/vulkan debian/tmp/usr/include -# mkdir -p debian/tmp/usr/share/vulkan/explicit_layer.d \ -# debian/tmp/usr/share/vulkan/implicit_layer.d -# for i in $(shell cd layers/linux/; ls *.json) ; do \ -# sed 's@./@@' layers/linux/$$i > \ -# debian/tmp/usr/share/vulkan/explicit_layer.d/$$i \ -# ; done + mkdir -p debian/tmp/usr/share/vulkan/implicit_layer.d + mv debian/tmp/etc/vulkan/explicit_layer.d \ + debian/tmp/usr/share/vulkan override_dh_install: dh_install --fail-missing commit 18b802c25d8bef11f8331ec74ae8e31edde41874 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 08:17:18 2017 +0300 rules: fix include paths diff --git a/debian/rules b/debian/rules index b0c5d21..3e7f5c6 100755 --- a/debian/rules +++ b/debian/rules @@ -27,8 +27,8 @@ override_dh_auto_configure: build_spirv dh_auto_configure -- \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DSPIRV_TOOLS_INCLUDE_DIR=external/spirv-tools/external/spirv-headers/include \ - -DSPIRV_TOOLS_LIB=external/spirv-tools \ + -DSPIRV_TOOLS_INCLUDE_DIR=../external/spirv-tools/external/spirv-headers/include \ + -DSPIRV_TOOLS_LIB=../external/spirv-tools \ -DBUILD_TESTS=OFF \ -DBUILD_VKJSON=OFF \ -DBUILD_WSI_MIR_SUPPORT=OFF
