Tue Jun 18 11:28:30 2019 UTC ()
Include mesa-ver.mk so MESA_VER doesn't get expanded into an empty string.

This changes the output of glGetString(GL_VERSION)
from: 3.1 Mesa
to: 3.1 Mesa 18.3.4

This means programs like firefox/libreoffice no longer blacklist our mesa
version as being too old.

Fixes WebGL on firefox with AMD CEDAR, reported by nia.


(maya)
diff -r1.6 -r1.7 src/external/mit/xorg/lib/libmesa.mk
cvs diff -r1.6 -r1.7 src/external/mit/xorg/lib/libmesa.mk (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libmesa.mk 2019/04/03 15:26:34 1.6
+++ src/external/mit/xorg/lib/libmesa.mk 2019/06/18 11:28:30 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: libmesa.mk,v 1.6 2019/04/03 15:26:34 joerg Exp $ 1# $NetBSD: libmesa.mk,v 1.7 2019/06/18 11:28:30 maya Exp $
2# 2#
3# Consumer of this Makefile should set MESA_SRC_MODULES. 3# Consumer of this Makefile should set MESA_SRC_MODULES.
4 4
5CPPFLAGS.ac_surface.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :} 5CPPFLAGS.ac_surface.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
6 6
7# The source file lists derived from src/mesa/Makefile.sources. 7# The source file lists derived from src/mesa/Makefile.sources.
8# Please keep the organization in line with those files. 8# Please keep the organization in line with those files.
9 9
10# Main sources 10# Main sources
11PATHS.main= mesa/main 11PATHS.main= mesa/main
12INCLUDES.main= glsl mesa/main 12INCLUDES.main= glsl mesa/main
13SRCS.main= \ 13SRCS.main= \
14 accum.c \ 14 accum.c \
@@ -533,13 +533,15 @@ CPPFLAGS+= \ @@ -533,13 +533,15 @@ CPPFLAGS+= \
533 -DMESA_LLVM_VERSION_PATCH=0 533 -DMESA_LLVM_VERSION_PATCH=0
534CXXFLAGS+= -fno-rtti 534CXXFLAGS+= -fno-rtti
535.endif 535.endif
536 536
537.include "../asm.mk" 537.include "../asm.mk"
538 538
539CPPFLAGS+= \ 539CPPFLAGS+= \
540 -DHAVE_LIBDRM -DGLX_USE_DRM -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DMESA_EGL_NO_X11_HEADERS 540 -DHAVE_LIBDRM -DGLX_USE_DRM -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DMESA_EGL_NO_X11_HEADERS
541 541
542CPPFLAGS+= \ 542CPPFLAGS+= \
543 -DYYTEXT_POINTER=1 543 -DYYTEXT_POINTER=1
544 544
545CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp 545CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
 546
 547.include "libGL/mesa-ver.mk"