[src/trunk]: src/share/mk switch Mesa 19 to use MesaLib.old subdir.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bdd82121dcac
branches:  trunk
changeset: 984574:bdd82121dcac
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 11 22:07:35 2021 +0000

description:
switch Mesa 19 to use MesaLib.old subdir.

diffstat:

 share/mk/bsd.own.mk |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 008d8921fd32 -r bdd82121dcac share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Jul 11 21:58:52 2021 +0000
+++ b/share/mk/bsd.own.mk       Sun Jul 11 22:07:35 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1257 2021/06/19 06:19:35 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1258 2021/07/11 22:07:35 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1259,18 +1259,17 @@
 MKDTB.earmv7eb=                        yes
 MKDTB.earmv7hfeb=              yes
 
-# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
-HAVE_MESA_VER?=        18
-.if ${HAVE_MESA_VER} == "10"
+HAVE_MESA_VER?=        19
+.if ${HAVE_MESA_VER} == 19
 EXTERNAL_MESALIB_DIR?= MesaLib.old
-.elif ${HAVE_MESA_VER} == "18"
+.elif ${HAVE_MESA_VER} == 21
 EXTERNAL_MESALIB_DIR?= MesaLib
 .endif
 
-# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18
+# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
 # XXX This knows that MKX11=no is default below, but would
 # require splitting the below loop in two parts.
-.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} == "18"
+.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} >= 19
 MKLLVMRT.amd64=                yes
 MKLLVMRT.i386=         yes
 MKLLVMRT.aarch64=      yes