MesaLib: Update to 19.2.7

This is a bugfix release.

EGL platform selection was reworked so we have to move X11 to always
be the first fallback because Mesa is apparently bad at detecting X11 now.

3 files changed, 22 insertions, 23 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 20b15e267ec..cfc1c061566 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.178 2019/12/02 10:09:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.179 2019/12/08 13:07:20 nia Exp $
 
-DISTNAME=	mesa-19.2.4
+DISTNAME=	mesa-19.2.7
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
@@ -28,7 +28,7 @@ LDFLAGS.SunOS+=		-lsocket -lnsl
 DRI_DRIVERS=		#
 GALLIUM_DRIVERS=	swrast
 VULKAN_DRIVERS=		#
-MESA_PLATFORMS=		surfaceless
+MESA_PLATFORMS=		#
 
 .include "../../mk/compiler.mk"
 .include "features.mk"
@@ -48,7 +48,7 @@ PLIST_VARS+=		kms vaapi
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.81
 .include "../../x11/libdrm/buildlink3.mk"
-MESA_PLATFORMS+=	drm
+MESA_PLATFORMS+=	drm surfaceless
 MESON_ARGS+=		-Degl=true
 MESON_ARGS+=		-Dgbm=true
 MESON_ARGS+=		-Dgallium-xa=true
@@ -109,6 +109,7 @@ PLIST.r200=		yes
 PLIST.r300=		yes
 .  endif
 .else
+MESA_PLATFORMS+=	surfaceless
 MESON_ARGS+=		-Degl=false
 MESON_ARGS+=		-Dgbm=false
 .endif # ${MESALIB_SUPPORTS_DRI} == "yes"
@@ -154,9 +155,7 @@ CXXFLAGS.NetBSD+=	-Dalloca=__builtin_alloca
 
 EGDIR=		${PREFIX}/share/examples/mesa
 
-OWN_DIRS=	${PKG_SYSCONFDIR}/drirc.d
-CONF_FILES+=	${EGDIR}/00-mesa-defaults.conf \
-		${PKG_SYSCONFDIR}/drirc.d/00-mesa-defaults.conf
+CONF_FILES+=	${EGDIR}/00-mesa-defaults.conf ${PKG_SYSCONFDIR}/drirc
 
 INSTALLATION_DIRS+=	${EGDIR}
 
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 8b73b94ef76..7029e0a2b9a 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.144 2019/11/29 10:34:13 jperkin Exp $
+$NetBSD: distinfo,v 1.145 2019/12/08 13:07:20 nia Exp $
 
-SHA1 (mesa-19.2.4.tar.xz) = 85cc1b57840f14d720f806f8160356b8c9b13a7f
-RMD160 (mesa-19.2.4.tar.xz) = f2c7d454fb67cc27bf28de3ea4f5c85979523e96
-SHA512 (mesa-19.2.4.tar.xz) = e8a0e90460f3153d730f8fb13f2c912a9826c05d2af9e22dc575bcd8885bf6a33c0af1c6659e81701ff097a132df88eead208e89dceb552b9da809ab543fa479
-Size (mesa-19.2.4.tar.xz) = 11458340 bytes
+SHA1 (mesa-19.2.7.tar.xz) = 9b8ebf66770353a48bd710e12e2727fb33645f44
+RMD160 (mesa-19.2.7.tar.xz) = 5323b623ac22c168b86548cf6d842ce004e346a9
+SHA512 (mesa-19.2.7.tar.xz) = 87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
+Size (mesa-19.2.7.tar.xz) = 11460812 bytes
 SHA1 (patch-include_c11_threads__posix.h) = e1dca04b5c514d20123ef99338c6dabedbc14c5f
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index a6d990a6ad5..47c135e90ea 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.76 2019/10/21 20:47:55 nia Exp $
+# $NetBSD: options.mk,v 1.77 2019/12/08 13:07:20 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 
@@ -68,16 +68,6 @@ MESON_ARGS+=		-Dvulkan-drivers=""
 .endif
 
 #
-# Wayland support
-#
-.if !empty(PKG_OPTIONS:Mwayland)
-MESA_PLATFORMS+=	wayland
-PLIST.wayland=		yes
-.  include "../../devel/wayland/buildlink3.mk"
-.  include "../../devel/wayland-protocols/buildlink3.mk"
-.endif
-
-#
 # X11 support
 #
 .if !empty(PKG_OPTIONS:Mx11)
@@ -108,3 +98,13 @@ MESON_ARGS+=		-Dgallium-vdpau=false
 MESON_ARGS+=		-Dglx=disabled
 MESON_ARGS+=		-Dgallium-vdpau=false
 .endif
+
+#
+# Wayland support
+#
+.if !empty(PKG_OPTIONS:Mwayland)
+MESA_PLATFORMS+=	wayland
+PLIST.wayland=		yes
+.  include "../../devel/wayland/buildlink3.mk"
+.  include "../../devel/wayland-protocols/buildlink3.mk"
+.endif