debian/changelog | 23 +++++++++++++++++++++++
debian/control | 4 ++--
debian/not-installed | 4 +---
debian/patches/egl-platform-mir.patch | 12 ++----------
debian/rules | 16 +++++++++++-----
5 files changed, 39 insertions(+), 20 deletions(-)
New commits:
commit 6cf49938f1706f27e1f4f7643c8a39c9e8d262fa
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 23:01:17 2016 +0300
release to yakkety
diff --git a/debian/changelog b/debian/changelog
index 0d05aa7..d3ed5ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (12.0.1-3ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.1-3ubuntu1) yakkety; urgency=medium
* egl-platform-mir.patch: Don't enable support for ABGR8888. (LP:
#1473901)
commit 1f09cb3c1f12d0698ded9061c4117e4030612388
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 16:38:35 2016 +0300
upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 01452c2..251ab61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (12.0.1-3) UNRELEASED; urgency=medium
+mesa (12.0.1-3) experimental; urgency=medium
* rules, control: Build mesa-vulkan-drivers only on linux-
{amd64,i386,x32}.
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 13:53:28 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 16:31:00 +0300
mesa (12.0.1-2) experimental; urgency=medium
commit 098bc5bb1c0fa6de7263e6d28198801d68c4e6eb
Author: Timo Aaltonen <tjaal...@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 <tjaal...@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)
commit d327c372843df90bc8cf16ff1cea76b627902b10
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 11:45:18 2016 +0300
release to experimental
diff --git a/debian/changelog b/debian/changelog
index 8444deb..a071fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (12.0.1-2) UNRELEASED; urgency=medium
+mesa (12.0.1-2) experimental; 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 <tjaal...@debian.org> Sun, 17 Jul 2016 06:11:25 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 11:45:01 +0300
mesa (12.0.1-1) experimental; urgency=medium
commit e509edb361788008e9565c1fbea4158da4466353
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Jul 18 11:36:40 2016 +0300
egl-platform-mir.patch: Don't enable support for ABGR8888. (LP: #1473901)
diff --git a/debian/changelog b/debian/changelog
index 6e2cbb4..af612dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-1ubuntu2) UNRELEASED; urgency=medium
+
+ * egl-platform-mir.patch: Don't enable support for ABGR8888. (LP:
+ #1473901)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 18 Jul 2016 11:36:21 +0300
+
mesa (12.0.1-1ubuntu1) yakkety; urgency=medium
* Merge from debian experimental.
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
index fd459f4..578dd8d 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -937,15 +937,7 @@
.getBuffers = dri_get_buffers,
.flushFrontBuffer = dri_flush_front_buffer,
-@@ -550,6 +550,7 @@ gbm_dri_is_format_supported(struct gbm_d
- break;
- case GBM_BO_FORMAT_ARGB8888:
- case GBM_FORMAT_ARGB8888:
-+ case GBM_FORMAT_ABGR8888:
- if (usage & GBM_BO_USE_SCANOUT)
- return 0;
- break;
-@@ -642,6 +643,43 @@ gbm_dri_to_gbm_format(uint32_t dri_forma
+@@ -642,6 +642,43 @@ gbm_dri_to_gbm_format(uint32_t dri_forma
return ret;
}
@@ -989,7 +981,7 @@
static struct gbm_bo *
gbm_dri_bo_import(struct gbm_device *gbm,
uint32_t type, void *buffer, uint32_t usage)
-@@ -866,34 +904,7 @@ gbm_dri_bo_create(struct gbm_device *gbm
+@@ -866,34 +903,7 @@ gbm_dri_bo_create(struct gbm_device *gbm
bo->base.base.height = height;
bo->base.base.format = format;
commit 1816c2d319f24142a39c371a29f4c9fd9118e52e
Author: Timo Aaltonen <tjaal...@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 <tjaal...@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/
commit 19ef49e90031a613f7efd28db05ca7fd3a1905b9
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Sun Jul 17 06:11:30 2016 +0300
rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
instead.
diff --git a/debian/changelog b/debian/changelog
index 7ef44ee..e27bf88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-2) UNRELEASED; urgency=medium
+
+ * rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
+ instead.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Sun, 17 Jul 2016 06:11:25 +0300
+
mesa (12.0.1-1) experimental; urgency=medium
* New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index 00622a8..258cffc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-PKG_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -145,8 +143,6 @@ override_dh_auto_configure:
--disable-silent-rules \
$(confflags)
- echo "#define MESA_GIT_SHA1 \"$(PKG_VERSION)\"" >
build/src/git_sha1.h.tmp
-
override_dh_auto_install:
dh_auto_install
for file in debian/*.in; \
