mesa: Changes to 'debian-experimental'
debian/changelog | 9 ++
debian/patches/01_gallium-util-add-missing-u_debug-include.patch | 39 ++++++++++
debian/patches/series | 1
debian/rules | 9 +-
4 files changed, 54 insertions(+), 4 deletions(-)
New commits:
commit c25a50e5dd84456cc4ce2cb406ccda00df5a6c18
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Sep 12 11:28:57 2014 +0200
Don't try to install vdpau hardlinks on hurd
Should fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index 5da7e76..3bfdf0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
big endian archs.
* Enable --with-egl-platforms=drm on kfreebsd-any, should fix FTBFS.
+ * Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index 66b6845..3606e47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -279,10 +279,12 @@ binary-arch: install
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+ 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/
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
+ endif
dh_install -s --fail-missing
dh_installman -s
commit c42909269c29cf25a5e1143fd24c3806ee3c6acf
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Sep 12 10:44:33 2014 +0200
Enable --with-egl-platforms=drm on kfreebsd-any
Should fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index bfa5e4e..5da7e76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
big endian archs.
+ * Enable --with-egl-platforms=drm on kfreebsd-any, should fix FTBFS.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index 74568e2..66b6845 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,10 +78,7 @@ else
# svga needs xa state tracker
confflags_GALLIUM += --enable-xa
-#
-# Although the KMS egl drivers will probably build on kfreebsd & hurd
-# only linux actually has KMS drivers implemented at this point.
- EGL_DISPLAYS += drm
+
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
@@ -89,6 +86,8 @@ else
endif
endif
+ EGL_DISPLAYS += drm
+
# 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
commit 1c88709ecc6c4b160ccb247641910434c8b132cc
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Sep 12 10:37:57 2014 +0200
Add 01_gallium-util-add-missing-u_debug-include.patch
Fixes FTBFS on big endian archs.
diff --git a/debian/changelog b/debian/changelog
index 76cf8a6..bfa5e4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
+
+ * Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
+ big endian archs.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
+
mesa (10.3.0~rc3-1) experimental; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/patches/01_gallium-util-add-missing-u_debug-include.patch b/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
new file mode 100644
index 0000000..12ed857
--- /dev/null
+++ b/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
@@ -0,0 +1,39 @@
+From 05bd91b0202e06cab998112a3a833c1fa3b47d31 Mon Sep 17 00:00:00 2001
+From: Andreas Boll <andreas.boll.dev@gmail.com>
+Date: Fri, 12 Sep 2014 10:11:24 +0200
+Subject: [PATCH] gallium/util: add missing u_debug include
+
+Needed for assert.
+Fixes build on BE archs with -Werror=implicit-function-declaration.
+
+In file included from
+../../../../../src/gallium/auxiliary/draw/draw_fs.c:30:0:
+../../../../../src/gallium/auxiliary/util/u_math.h: In function
+'util_memcpy_cpu_to_le32':
+../../../../../src/gallium/auxiliary/util/u_math.h:810:4: error:
+implicit declaration of function 'assert'
+[-Werror=implicit-function-declaration]
+ assert(n % 4 == 0);
+ ^
+
+Cc: "10.3" <mesa-stable@lists.freedesktop.org>
+Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+---
+ src/gallium/auxiliary/util/u_math.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
+index 25bcfb5..39bd40f 100644
+--- a/src/gallium/auxiliary/util/u_math.h
++++ b/src/gallium/auxiliary/util/u_math.h
+@@ -40,6 +40,7 @@
+
+
+ #include "pipe/p_compiler.h"
++#include "util/u_debug.h"
+
+
+ #ifdef __cplusplus
+--
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..2274a62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_gallium-util-add-missing-u_debug-include.patch
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: