mesa: Changes to 'debian-experimental'
debian/changelog | 2 ++
debian/not-installed | 3 ---
debian/rules | 6 ++++++
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1816c2d319f24142a39c371a29f4c9fd9118e52e
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 18 11:33:08 2016 +0300
rules, not-installed: Handle removing unwanted vulkan headers in rules instead.
diff --git a/debian/changelog b/debian/changelog
index e27bf88..8444deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (12.0.1-2) UNRELEASED; urgency=medium
* rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
instead.
+ * rules, not-installed: Handle removing unwanted vulkan headers in
+ rules instead.
-- Timo Aaltonen <tjaalton@debian.org> Sun, 17 Jul 2016 06:11:25 +0300
diff --git a/debian/not-installed b/debian/not-installed
index da7f3ee..365fcd0 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,7 +3,4 @@
# Common list:
NOT_INSTALLED := \
usr/include/GL/wglext.h \
- usr/include/vulkan/vk_platform.h \
- usr/include/vulkan/vulkan.h \
- usr/include/vulkan/vulkan_intel.h \
usr/lib/*/libglapi.so
diff --git a/debian/rules b/debian/rules
index 258cffc..bbcbc5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,6 +173,12 @@ override_dh_install:
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+ #
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 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
+
ifneq ($(DEB_HOST_ARCH_OS), hurd)
# Copy the hardlinked vdpau drivers correctly.
install -m755 -d debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
Reply to: