debian/changelog

+mesa (18.3.0~rc5-2) experimental; urgency=medium
+
+  * rules: Drop virgl, va/vdpau from s390x.
+  * meson-fix-hurd-build.diff: Hurd needs -D_GNU_SOURCE.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 03 Dec 2018 20:43:45 +0200
+
 mesa (18.3.0~rc5-1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/patches/meson-fix-hurd-build.diff

+--- a/meson.build
++++ b/meson.build
+@@ -779,7 +779,7 @@ if cc.compiles('int foo(void) __attribut
+ endif
+ 
+ # TODO: this is very incomplete
+-if ['linux', 'cygwin'].contains(host_machine.system())
++if ['linux', 'linux-gnu', 'cygwin', 'gnu'].contains(host_machine.system())
+   pre_args += '-D_GNU_SOURCE'
+ endif
+ 

debian/patches/series

 07_gallium-fix-build-failure-on-powerpcspe.diff
 meson-add-glx-direct-toggle.diff
+meson-fix-hurd-build.diff

debian/rules

@@ -49,8 +49,11 @@ else
 
   ifeq ($(DEB_HOST_ARCH_OS), linux)
 	confflags_DRI3 = -Ddri3=true
+	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+		DRI_DRIVERS += nouveau,
 		# Gallium drivers which require kernel support, not yet ported to non-Linux
-	GALLIUM_DRIVERS += virgl,
+		GALLIUM_DRIVERS += nouveau, virgl,
+	endif
 
 	# Freedreno requires arm in addition
 	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
@@ -72,10 +75,6 @@ else
 	# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
 	EGL_PLATFORMS += wayland,
 
-	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
-		DRI_DRIVERS += nouveau,
-		GALLIUM_DRIVERS += nouveau,
-	endif
   endif
 
 	EGL_PLATFORMS += drm,
@@ -88,6 +87,8 @@ else
   ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
 	DRI_DRIVERS += r200, r100,
 	GALLIUM_DRIVERS += r600, r300,
+	confflags_GALLIUM += -Dgallium-va=true
+	confflags_GALLIUM += -Dgallium-vdpau=true
   endif
 
   # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
@@ -116,8 +117,6 @@ else
 
 	confflags_DIRECT_RENDERING = -Dglx-direct=true
 	confflags_GBM = -Dgbm=true
-	confflags_GALLIUM += -Dgallium-vdpau=true
-	confflags_GALLIUM += -Dgallium-va=true
 	confflags_GALLIUM += -Dgallium-extra-hud=true
 	confflags_GALLIUM += -Dlmsensors=true
 	with_libva = ,libva