mesa: Changes to 'debian-experimental'
debian/changelog | 2 ++
debian/control | 13 +++++++++++++
debian/mesa-vulkan-drivers.install | 2 ++
debian/not-installed | 3 +++
debian/rules | 3 +++
5 files changed, 23 insertions(+)
New commits:
commit 61e8a4ff83423a308062894b26968d84357af745
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue May 31 16:30:29 2016 +0300
Enable building intel vulkan driver on linux & kfreebsd, add libgcrypt20-dev and libvulkan-dev to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 932ea94..dc9bd1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (12.0.0~rc1-1) UNRELEASED; urgency=medium
* control: Add python3 to build-depends.
* symbols: Updated.
* mesa-common-dev: Add mesa_glinterop.h.
+ * Enable building intel vulkan driver on linux & kfreebsd, add
+ libgcrypt20-dev and libvulkan-dev to build-depends.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 04 May 2016 15:41:31 +0300
diff --git a/debian/control b/debian/control
index f6234e9..c172759 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,13 @@ Build-Depends:
libxxf86vm-dev,
libexpat1-dev,
dpkg-dev (>= 1.16.1),
+ libgcrypt20-dev [!hurd-any],
libxfixes-dev,
libxdamage-dev,
libxext-dev,
libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
+ libvulkan-dev [!hurd-any],
autoconf,
automake,
libtool,
@@ -464,6 +466,17 @@ Description: Mesa VDPAU video acceleration drivers
.
This package enables support for VDPAU for some gallium drivers.
+Package: mesa-vulkan-drivers
+Section: libs
+Architecture: linux-any kfreebsd-any
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ libvulkan1,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Mesa Vulkan drivers
+
+
Package: mesa-opencl-icd
Section: libs
Architecture: amd64 i386 armhf
diff --git a/debian/mesa-vulkan-drivers.install b/debian/mesa-vulkan-drivers.install
new file mode 100644
index 0000000..5a9619b
--- /dev/null
+++ b/debian/mesa-vulkan-drivers.install
@@ -0,0 +1,2 @@
+etc/vulkan/icd.d/intel_icd.json usr/share/vulkan/icd.d
+usr/lib/*/libvulkan_intel.so
diff --git a/debian/not-installed b/debian/not-installed
index 365fcd0..da7f3ee 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,4 +3,7 @@
# 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 ff216dd..ee4ecd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ include debian/not-installed
DRI_DRIVERS =
GALLIUM_DRIVERS =
+VULKAN_DRIVERS =
EGL_DISPLAYS = x11
confflags_DRI3 = --disable-dri3
@@ -71,6 +72,7 @@ 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))
@@ -108,6 +110,7 @@ confflags += \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
+ --with-vulkan-drivers="$(VULKAN_DRIVERS)" \
--enable-osmesa \
--enable-glx-tls \
--enable-shared-glapi \
Reply to: