MesaLib: libGL has a different version when dri is disabled.

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Aug 22 14:54:01 2019 +0100
Changeset:	fe074568479a42fe08f3b04305c5a4ec679496e4

Modified Files:
	MesaLib/PLIST
	MesaLib/options.mk

Log Message:
MesaLib: libGL has a different version when dri is disabled.

... I don't even.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fe074568479a42fe08f3b04305c5a4ec679496e4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib/PLIST      | 2 +-
 MesaLib/options.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diffs:
diff --git a/MesaLib/PLIST b/MesaLib/PLIST
index ae21c4691f..56a865945f 100644
--- a/MesaLib/PLIST
+++ b/MesaLib/PLIST
@@ -60,7 +60,7 @@ ${PLIST.egl}lib/libEGL.so.1
 ${PLIST.egl}lib/libEGL.so.1.0.0
 lib/libGL.so
 lib/libGL.so.1
-lib/libGL.so.1.2.0
+lib/libGL.so.${GLVER}
 ${PLIST.glesv1}lib/libGLESv1_CM.so
 ${PLIST.glesv1}lib/libGLESv1_CM.so.1
 ${PLIST.glesv1}lib/libGLESv1_CM.so.1.1.0
diff --git a/MesaLib/options.mk b/MesaLib/options.mk
index 13e0cf73ce..d85638cb1d 100644
--- a/MesaLib/options.mk
+++ b/MesaLib/options.mk
@@ -235,11 +235,13 @@ MESON_ARGS+=		-Dgallium-xa=false
 MESON_ARGS+=		-Dllvm=false
 MESON_ARGS+=		-Dllvm-shared=false
 .  endif # llvm
+PLIST_SUBST+=		GLVER="1.2.0"
 MESON_ARGS+=		-Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
 MESON_ARGS+=		-Ddri-drivers=${DRI_DRIVERS:ts,}
 MESON_ARGS+=		-Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
 MESON_ARGS+=		-Dplatforms=${EGL_PLATFORMS:ts,}
 .else # !dri
+PLIST_SUBST+=		GLVER="1.6.0"
 MESON_ARGS+=		-Dgallium-drivers=
 MESON_ARGS+=		-Ddri-drivers=
 MESON_ARGS+=		-Dvulkan-drivers=