--- Begin Message ---
Source: mesa
Version: 17.3.3-1
Severity: important
Tags: patch
Hello,
mesa currently FTBFS on hurd-i386 for a few upstream and downstream
reasons. The attached patches pthread_setname_np and GetDriverConfig are
cherry-picks from upstream. The attached patch "patch" is for the Debian
changes: the libva dependency is avoided on hurd-any, but --with libva
was still pased, thus failing. Also, surfaceless requires libdrm, which
is not available.
Samuel
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: hurd-i386 (i686-AT386)
Kernel: GNU-Mach 1.8+git20171101-486-dbg/Hurd-0.9
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
commit 9131e6d3c2dcc30260e23f2232b44c8cffc6f315
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 13 12:33:15 2018 +0100
u_thread: Use pthread_setname_np on linux only.
pthread_setname_np was added in glibc 2.12 for the Linux port only, other
ports do not necessarily have it.
Signed-off-by: Jose Fonseca <jfonseca@vmware.com>
diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index 26cc0b0934..8c6e0bdc59 100644
--- a/src/util/u_thread.h
+++ b/src/util/u_thread.h
@@ -62,7 +62,8 @@ static inline void u_thread_setname( const char *name )
{
#if defined(HAVE_PTHREAD)
# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
+ (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
+ defined(__linux__)
pthread_setname_np(pthread_self(), name);
# endif
#endif
commit 47ac11bcf8bd9e4525e0fb4308d0bca87a8900c6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jan 15 15:38:25 2018 +0100
glx: fix non-dri build
glXGetDriverConfig parameters do not provide a context to dynamically
check for the presence of the function, so the dispatcher directly calls
glXGetDriverConfig, but in non-dri builds dri_glx.c didn't provide
glXGetDriverConfig.
This change make it just return NULL in that case.
Fixes: 84f764a7591 "glxglvnddispatch: Add missing dispatch for GetDriverConfig
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c
index 56d894eda7..5b65afc860 100644
--- a/src/glx/g_glxglvnddispatchfuncs.c
+++ b/src/glx/g_glxglvnddispatchfuncs.c
@@ -338,11 +338,15 @@ static Display *dispatch_GetCurrentDisplayEXT(void)
static const char *dispatch_GetDriverConfig(const char *driverName)
{
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/*
* The options are constant for a given driverName, so we do not need
* a context (and apps expect to be able to call this without one).
*/
return glXGetDriverConfig(driverName);
+#else
+ return NULL;
+#endif
}
diff -ur mesa-17.3.1.orig/debian/rules mesa-17.3.1/debian/rules
--- mesa-17.3.1.orig/debian/rules 2018-01-13 09:10:32.000000000 +0000
+++ mesa-17.3.1/debian/rules 2018-01-13 09:52:21.000000000 +0000
@@ -26,16 +26,20 @@
DRI_DRIVERS =
GALLIUM_DRIVERS =
VULKAN_DRIVERS =
-EGL_PLATFORMS = x11,surfaceless
confflags_DRI3 = --disable-dri3
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ EGL_PLATFORMS = x11
+
confflags_DIRECT_RENDERING = --disable-driglx-direct
confflags_GBM = --disable-gbm
DRI_DRIVERS = swrast
+ with_libva =
else
+ EGL_PLATFORMS = x11,surfaceless
+
ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_DRI3 = --enable-dri3
# Gallium drivers which require kernel support, not yet ported to non-Linux
@@ -108,6 +112,7 @@
confflags_GALLIUM += --enable-va
confflags_GALLIUM += --enable-gallium-extra-hud
confflags_GALLIUM += --enable-lmsensors
+ with_libva = ,libva
endif
# Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
@@ -227,7 +232,7 @@
dh_makeshlibs -a -- -c4
%:
- dh $@ --with quilt,autoreconf,libva \
+ dh $@ --with quilt,autoreconf$(with_libva) \
--parallel \
--builddirectory=build/
--- End Message ---
--- Begin Message ---
Source: mesa
Source-Version: 18.0.0~rc2-1
We believe that the bug you reported is fixed in the latest version of
mesa, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 888047@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Timo Aaltonen <tjaalton@debian.org> (supplier of updated mesa package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 25 Jan 2018 13:42:14 +0200
Source: mesa
Binary: libxatracker2 libxatracker-dev libgbm1 libgbm-dev libegl-mesa0 libegl1-mesa libegl1-mesa-dev libwayland-egl1-mesa libgles2-mesa libgles2-mesa-dev libglapi-mesa libglx-mesa0 libgl1-mesa-glx libgl1-mesa-dri libgl1-mesa-dev mesa-common-dev libosmesa6 libosmesa6-dev mesa-va-drivers mesa-vdpau-drivers mesa-vulkan-drivers mesa-opencl-icd
Architecture: source
Version: 18.0.0~rc2-1
Distribution: experimental
Urgency: medium
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Timo Aaltonen <tjaalton@debian.org>
Description:
libegl-mesa0 - free implementation of the EGL API -- Mesa vendor library
libegl1-mesa - transitional dummy package
libegl1-mesa-dev - free implementation of the EGL API -- development files
libgbm-dev - generic buffer management API -- development files
libgbm1 - generic buffer management API -- runtime
libgl1-mesa-dev - free implementation of the OpenGL API -- GLX development files
libgl1-mesa-dri - free implementation of the OpenGL API -- DRI modules
libgl1-mesa-glx - transitional dummy package
libglapi-mesa - free implementation of the GL API -- shared library
libgles2-mesa - transitional dummy package
libgles2-mesa-dev - free implementation of the OpenGL|ES 2.x API -- development files
libglx-mesa0 - free implementation of the OpenGL API -- GLX vendor library
libosmesa6 - Mesa Off-screen rendering extension
libosmesa6-dev - Mesa Off-screen rendering extension -- development files
libwayland-egl1-mesa - implementation of the Wayland EGL platform -- runtime
libxatracker-dev - X acceleration library -- development files
libxatracker2 - X acceleration library -- runtime
mesa-common-dev - Developer documentation for Mesa
mesa-opencl-icd - free implementation of the OpenCL API -- ICD runtime
mesa-va-drivers - Mesa VA-API video acceleration drivers
mesa-vdpau-drivers - Mesa VDPAU video acceleration drivers
mesa-vulkan-drivers - Mesa Vulkan graphics drivers
Closes: 887444 888047
Changes:
mesa (18.0.0~rc2-1) experimental; urgency=medium
.
* New upstream release.
* libgbm1.symbols: Updated.
* rules: Use -O1 for sh3 & sh4, thanks John Paul Adrian Glaubitz!
(Closes: #887444)
* rules: Fix hurd FTBFS, thanks Samuel Thibault! (Closes: #888047)
Checksums-Sha1:
5099f319272d2d33c00684c94e226762142b63fc 4879 mesa_18.0.0~rc2-1.dsc
0066bb08b7f2db8b249f0d6aaf876161098ef6b6 19075437 mesa_18.0.0~rc2.orig.tar.gz
49f9435cbab0fec65391e37c7eae68856173c412 119787 mesa_18.0.0~rc2-1.diff.gz
663661c86998c20a4e008432935e93bd33f4e59b 9971 mesa_18.0.0~rc2-1_source.buildinfo
Checksums-Sha256:
1d023c6299c68e196fd8a67cf4d2611ad3108efd640b5e8a2d196fd6cc06fc70 4879 mesa_18.0.0~rc2-1.dsc
a36dbade45756a5abf19cd4fa65b9394cb6ec1511e64ed4d0965d473c64eaddb 19075437 mesa_18.0.0~rc2.orig.tar.gz
691930d32316ef3d4747a8526bb2173eb51bcff3f604e3ecc0ac848980f39fa2 119787 mesa_18.0.0~rc2-1.diff.gz
c0127d5150b544808da04e0c18b02b70c4d2c155ccea2454fbc1a7d9a477ef76 9971 mesa_18.0.0~rc2-1_source.buildinfo
Files:
a1ad0772fea699124a24e1d74629d547 4879 graphics optional mesa_18.0.0~rc2-1.dsc
755ced6e9039d2f3394b09a99e3ed2e2 19075437 graphics optional mesa_18.0.0~rc2.orig.tar.gz
ce8804fdeca24c817b701cf818797bc8 119787 graphics optional mesa_18.0.0~rc2-1.diff.gz
c363183eaa8d9c7801a49d20614063e2 9971 graphics optional mesa_18.0.0~rc2-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIcBAEBCAAGBQJaaitKAAoJEMtwMWWoiYTcX24QAJFndY0RsLPo+9w5cXJ9GRlj
xqMGvM5ABXduWZ6oFfA7/GuPh42qpm/1okjIFvzw22uJjx4h12jHCZ0VP2gEMpHF
6EkExX4yZsxpXUCIZ9qmHwBHjqCebh0Mt1hi26LI0HKx1kQy6kiWi4YafrwM0XA6
wW7ng+H4TMXn+cUm7+ycg5tUaKVJ5r4RvJVQ7qH3i83PjFelmj5FHo04iKtlzblv
Y9dtsZ2jBlmis/88cHPk3UAUvxxgdMYFs74WqZlGbkEPevNELocb8FdJQn88w2Z5
jRCVtkF6g0ARBuTJQ3bPtnqoZe4fp1idQw2fUT2+uF0jknqxR6JWkRMl8odAddpm
M/CIVP7wi+l80U1zQorfuvhcLVruwCUXAUWL3Om5YSa/602I50eND4wm7Xidd3Dj
XmMVxWGJebITangnKLLpBPMm4csAg3TLTB1tjExBEwLPrZWnQAuZNP7E73iNLIns
F08iuWOTlxjcK7XLvTil+3kPak981SrjFIG3nQvJ3lLnpJkfm8ZGgl30XbQIYJx4
tfgD85IpoENrM+7Mq8noEAbOXawOsyjcgDPrURMpYqIrJ4RtSdWp2dc9DV6fO98h
VqJT+kxlXoaRKrkSFRVxYmuofsCNk/qEgx+7mGGhBM3cuRAr/xsm7IOszkt/sMpS
E311PXBR09xusgluoERt
=LsuO
-----END PGP SIGNATURE-----
--- End Message ---