debian/changelog | 10 ++++++++++ debian/mesa-vulkan-drivers.install | 3 +-- debian/rules | 9 +++++---- 3 files changed, 16 insertions(+), 6 deletions(-)
New commits: commit ebb1205389f08d9f7fe9f7edc4cc001817f20df6 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Oct 25 17:01:40 2016 +0200 rules: Remove vulkan_intel.h only where it get installed in tmp. Should fix FTBFS on some more arches. diff --git a/debian/changelog b/debian/changelog index d9ad7f8..ec67c7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ mesa (13.0.0~rc2-2) UNRELEASED; urgency=medium * Make mesa-vulkan-drivers.install more generic. Should fix FTBFS on some arches. * rules: Remove superfluous linux check. + * rules: Remove vulkan_intel.h only where it get installed in tmp. + Should fix FTBFS on some more arches. -- Andreas Boll <andreas.boll....@gmail.com> Tue, 25 Oct 2016 16:53:57 +0200 diff --git a/debian/rules b/debian/rules index 3ad23ea..35eb4db 100755 --- a/debian/rules +++ b/debian/rules @@ -184,7 +184,10 @@ override_dh_install: # Remove vulkan headers only where they get installed in tmp # We ship those headers via src:vulkan / libvulkan-dev ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 arm64 armhf ppc64el x32)) - set -e; for file in vk_platform.h vulkan.h vulkan_intel.h; do rm debian/tmp/usr/include/vulkan/$$file; done + set -e; for file in vk_platform.h vulkan.h; do rm debian/tmp/usr/include/vulkan/$$file; done + ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32)) + rm debian/tmp/usr/include/vulkan/vulkan_intel.h + endif rmdir debian/tmp/usr/include/vulkan endif commit 41f6a8cfc42c4c1702227947a6a764dca7f752a7 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Oct 25 16:56:45 2016 +0200 rules: Remove superfluous linux check. diff --git a/debian/changelog b/debian/changelog index 2afdb47..d9ad7f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mesa (13.0.0~rc2-2) UNRELEASED; urgency=medium * Make mesa-vulkan-drivers.install more generic. Should fix FTBFS on some arches. + * rules: Remove superfluous linux check. -- Andreas Boll <andreas.boll....@gmail.com> Tue, 25 Oct 2016 16:53:57 +0200 diff --git a/debian/rules b/debian/rules index f0bde72..3ad23ea 100755 --- a/debian/rules +++ b/debian/rules @@ -183,11 +183,9 @@ override_dh_install: # Remove vulkan headers only where they get installed in tmp # We ship those headers via src:vulkan / libvulkan-dev - ifeq ($(DEB_HOST_ARCH_OS), linux) - ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 arm64 armhf ppc64el x32)) + ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 arm64 armhf ppc64el x32)) set -e; for file in vk_platform.h vulkan.h vulkan_intel.h; do rm debian/tmp/usr/include/vulkan/$$file; done rmdir debian/tmp/usr/include/vulkan - endif endif ifneq ($(DEB_HOST_ARCH_OS), hurd) commit d9d1f7ba50139fd7db08a200bbd9cba746995c13 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Tue Oct 25 16:54:29 2016 +0200 Make mesa-vulkan-drivers.install more generic. Should fix FTBFS on some arches. diff --git a/debian/changelog b/debian/changelog index d5f6157..2afdb47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (13.0.0~rc2-2) UNRELEASED; urgency=medium + + * Make mesa-vulkan-drivers.install more generic. Should fix FTBFS on + some arches. + + -- Andreas Boll <andreas.boll....@gmail.com> Tue, 25 Oct 2016 16:53:57 +0200 + mesa (13.0.0~rc2-1) experimental; urgency=medium * New upstream release candidate. diff --git a/debian/mesa-vulkan-drivers.install b/debian/mesa-vulkan-drivers.install index 4608a24..e5c66be 100644 --- a/debian/mesa-vulkan-drivers.install +++ b/debian/mesa-vulkan-drivers.install @@ -1,3 +1,2 @@ usr/share/vulkan/icd.d/*.json -usr/lib/*/libvulkan_intel.so -usr/lib/*/libvulkan_radeon.so +usr/lib/*/libvulkan_*.so