mesa: Changes to 'debian-experimental'
debian/changelog | 7 +++++++
debian/control | 4 ++--
debian/rules | 10 +++++++---
3 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 098bc5bb1c0fa6de7263e6d28198801d68c4e6eb
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jul 18 13:53:39 2016 +0300
rules, control: Build mesa-vulkan-drivers only on linux- {amd64,i386,x32}.
diff --git a/debian/changelog b/debian/changelog
index a071fcc..01452c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-3) UNRELEASED; urgency=medium
+
+ * rules, control: Build mesa-vulkan-drivers only on linux-
+ {amd64,i386,x32}.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 18 Jul 2016 13:53:28 +0300
+
mesa (12.0.1-2) experimental; urgency=medium
* rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
diff --git a/debian/control b/debian/control
index ad62cf5..06cce61 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
libxext-dev,
libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
- libvulkan-dev [!hurd-any],
+ libvulkan-dev [linux-amd64 linux-i386 linux-x32],
autoconf,
automake,
libtool,
@@ -467,7 +467,7 @@ Description: Mesa VDPAU video acceleration drivers
Package: mesa-vulkan-drivers
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: linux-amd64 linux-i386 linux-x32
Pre-Depends: ${misc:Pre-Depends}
Depends:
libvulkan1,
diff --git a/debian/rules b/debian/rules
index bbcbc5d..f6bf0e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,9 @@ else
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
endif
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
+ VULKAN_DRIVERS += intel
+ endif
endif
EGL_DISPLAYS += drm
@@ -72,7 +75,6 @@ else
# Build intel drivers on archs where libdrm-intel is installed
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32))
DRI_DRIVERS += i915 i965
- VULKAN_DRIVERS += intel
endif
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
@@ -173,10 +175,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))
+ # Remove vulkan headers only where they get installed in tmp
+ ifeq ($(DEB_HOST_ARCH_OS), linux)
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 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
endif
ifneq ($(DEB_HOST_ARCH_OS), hurd)
Reply to: