Module Name: src
Committed By: mrg
Date: Sun Mar 10 02:29:54 UTC 2019
Modified Files:
src/external/mit/xorg/lib: Makefile driver.mk libglsl.mk libloader.mk
libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL/internal: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile
src/external/mit/xorg/lib/libglut: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
src/external/mit/xorg/server/xorg-server.old/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/lib: driver.old.mk libglsl.old.mk
libloader.old.mk libmesa.old.mk mesa-which.mk
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile mesa-ver.mk shlib_version
src/external/mit/xorg/lib/libGL.old/internal: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile shlib_version
src/external/mit/xorg/lib/libglapi.old: Makefile
Log Message:
move mesa10 build into .old scheme:
- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)
- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/driver.old.mk \
src/external/mit/xorg/lib/libglsl.old.mk \
src/external/mit/xorg/lib/libloader.old.mk \
src/external/mit/xorg/lib/libmesa.old.mk \
src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libGL.old/Makefile \
src/external/mit/xorg/lib/libGL.old/mesa-ver.mk \
src/external/mit/xorg/lib/libGL.old/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libGL.old/internal/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL/internal/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libgbm.old/Makefile \
src/external/mit/xorg/lib/libgbm.old/shlib_version
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libglapi/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libglapi.old/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libglut/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.1109 -r1.1110 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.45 src/external/mit/xorg/lib/Makefile:1.46
--- src/external/mit/xorg/lib/Makefile:1.45 Fri Mar 8 11:14:49 2019
+++ src/external/mit/xorg/lib/Makefile Sun Mar 10 02:29:52 2019
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2019/03/08 11:14:49 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2019/03/10 02:29:52 mrg Exp $
# build libraries for xorg
.include <bsd.own.mk>
-SUBDIR= libfontenc freetype libFS libICE libglapi \
+.include "mesa-which.mk"
+
+SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel libdrm_amdgpu
@@ -19,7 +21,7 @@ SUBDIR+=xkeyboard-config
SUBDIR+=libxcb \
.WAIT
.if !defined(MLIBDIR)
-SUBDIR+=dri7 dri gallium
+SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
.endif
SUBDIR+=fontconfig libSM libX11 \
.WAIT \
@@ -28,7 +30,7 @@ SUBDIR+=fontconfig libSM libX11 \
.WAIT \
libXi libXxf86vm \
.WAIT \
- libGL libXScrnSaver libXTrap libXevie libXfont libXfont2 \
+ libGL${OLD_PREFIX} libXScrnSaver libXTrap libXevie libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
libxkbui \
@@ -46,7 +48,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
.WAIT \
libXdmGreet \
xcb-util
-SUBDIR+=libgbm
+SUBDIR+=libgbm${OLD_PREFIX}
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.1 src/external/mit/xorg/lib/driver.mk:1.2
--- src/external/mit/xorg/lib/driver.mk:1.1 Thu Dec 18 06:24:28 2014
+++ src/external/mit/xorg/lib/driver.mk Sun Mar 10 02:29:52 2019
@@ -1,24 +1,24 @@
-# $NetBSD: driver.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: driver.mk,v 1.2 2019/03/10 02:29:52 mrg Exp $
# stuff both dri and gallium drivers need.
# util
-.PATH: ${X11SRCDIR.MesaLib}/src/util
+.PATH: ${X11SRCDIR.Mesa}/src/util
SRCS.util= \
hash_table.c \
MESAralloc.c
-.PATH: ${X11SRCDIR.MesaLib}/../src/util
+.PATH: ${X11SRCDIR.Mesa}/../src/util
SRCS.util+= \
format_srgb.c
-CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.MesaLib}/src/util
-CPPFLAGS.hash_table.c+= -I${X11SRCDIR.MesaLib}/src/util
-CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.MesaLib}/src/util
+CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.hash_table.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.Mesa}/src/util
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/util/ralloc.c MESAralloc.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/ralloc.c MESAralloc.c
SRCS+= ${SRCS.util}
# also need to pull in libdricommon.la libmegadriver_stub.la
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
SRCS+= utils.c dri_util.c xmlconfig.c
SRCS+= megadriver_stub.c
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.1 src/external/mit/xorg/lib/libloader.mk:1.2
--- src/external/mit/xorg/lib/libloader.mk:1.1 Thu Dec 18 06:24:28 2014
+++ src/external/mit/xorg/lib/libloader.mk Sun Mar 10 02:29:52 2019
@@ -1,18 +1,18 @@
-# $NetBSD: libloader.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: libloader.mk,v 1.2 2019/03/10 02:29:52 mrg Exp $
# makefile fragment for mesa src/loader
# loader stuff.
-.PATH: ${X11SRCDIR.MesaLib}/src/loader
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
+.PATH: ${X11SRCDIR.Mesa}/src/loader
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
SRCS.loader += \
loader.c \
pci_id_driver_map.c \
xmlconfig.c
.for _f in ${SRCS.loader}
-CPPFLAGS.${_f}= -I${X11SRCDIR.MesaLib}/src/mesa \
- -I${X11SRCDIR.MesaLib}/src
+CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src
.endfor
SRCS+= ${SRCS.loader}
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.2 src/external/mit/xorg/lib/libglsl.mk:1.3
--- src/external/mit/xorg/lib/libglsl.mk:1.2 Fri Feb 26 21:20:17 2016
+++ src/external/mit/xorg/lib/libglsl.mk Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.2 2016/02/26 21:20:17 riastradh Exp $
+# $NetBSD: libglsl.mk,v 1.3 2019/03/10 02:29:52 mrg Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -104,8 +104,8 @@ LIBGLCPP_GENERATED_FILES = \
LIBGLCPP_FILES = \
pp.c
-.PATH: ${X11SRCDIR.MesaLib}/src/glsl
-.PATH: ${X11SRCDIR.MesaLib}/src/glsl/glcpp
+.PATH: ${X11SRCDIR.Mesa}/src/glsl
+.PATH: ${X11SRCDIR.Mesa}/src/glsl/glcpp
SRCS+= ${LIBGLSL_GENERATED_CXX_FILES} \
${LIBGLSL_FILES} \
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.2 src/external/mit/xorg/lib/libmesa.mk:1.3
--- src/external/mit/xorg/lib/libmesa.mk:1.2 Tue Nov 3 06:00:50 2015
+++ src/external/mit/xorg/lib/libmesa.mk Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.2 2015/11/03 06:00:50 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.3 2019/03/10 02:29:52 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -125,16 +125,16 @@ SRCS.main= \
es1_conversion.c
# Build files
-.PATH: ${X11SRCDIR.MesaLib}/../src/mesa/main
+.PATH: ${X11SRCDIR.Mesa}/../src/mesa/main
SRCS.main+= \
enums.c \
api_exec.c
# XXX avoid source name clashes with glx
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/main
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/main/pixel.c MESApixel.c \
- ${X11SRCDIR.MesaLib}/src/mesa/main/pixelstore.c MESApixelstore.c \
- ${X11SRCDIR.MesaLib}/src/mesa/main/eval.c MESAeval.c
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/main
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/main/pixel.c MESApixel.c \
+ ${X11SRCDIR.Mesa}/src/mesa/main/pixelstore.c MESApixelstore.c \
+ ${X11SRCDIR.Mesa}/src/mesa/main/eval.c MESAeval.c
# Math sources
PATHS.math= mesa/math
@@ -263,7 +263,7 @@ PATHS.asm_s= mesa/x86 mesa/x86/rtasm mes
.if ${MACHINE} == "amd64"
SRCS.asm_s= \
xform4.S
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/arch/x86_64
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/x86_64
.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
SRCS.asm_s= \
sparc_clip.S \
@@ -288,7 +288,7 @@ SRCS.asm_s= \
sse_xform4.S \
sse_normal.S \
read_rgba_span_x86.S
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/arch/i386
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/i386
.endif
@@ -376,7 +376,7 @@ SRCS.program= \
program_lexer.l
# Generated
-.PATH: ${X11SRCDIR.MesaLib}/../src/mesa/program
+.PATH: ${X11SRCDIR.Mesa}/../src/mesa/program
SRCS.program+= \
program_parse.tab.c
@@ -387,31 +387,31 @@ SRCS.program+= \
SRCS+= ${SRCS.${_mod_}}
. for _path_ in ${PATHS.${_mod_}}
-.PATH: ${X11SRCDIR.MesaLib}/src/${_path_}
+.PATH: ${X11SRCDIR.Mesa}/src/${_path_}
. endfor
. for _path_ in ${INCLUDES.${_mod_}}
. for _s in ${SRCS.${_mod_}}
-CPPFLAGS.${_s}+= -I${X11SRCDIR.MesaLib}/src/${_path_}
+CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src/${_path_}
. endfor
. endfor
.endfor
.for _path_ in ${INCLUDES.all}
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/${_path_}
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/${_path_}
.endfor
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/gallium/include
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/mapi/glapi
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/mesa
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/../src/mesa/main
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gallium/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mapi/glapi
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
CPPFLAGS+= \
-DPACKAGE_NAME=\"Mesa\" \
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.28 src/external/mit/xorg/lib/dri/Makefile:1.29
--- src/external/mit/xorg/lib/dri/Makefile:1.28 Tue Jun 7 23:21:58 2016
+++ src/external/mit/xorg/lib/dri/Makefile Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/06/07 23:21:58 christos Exp $
+# $NetBSD: Makefile,v 1.29 2019/03/10 02:29:52 mrg Exp $
# Link the mesa_dri_drivers mega driver.
@@ -15,12 +15,12 @@ LIB= mesa_dri_drivers
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
-# -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
+# -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${MODULE}/server \
CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib}/src/egl/main \
- -I${X11SRCDIR.MesaLib}/src/egl/drivers/dri \
- -I${X11SRCDIR.MesaLib}/../src/mesa/drivers/dri/common \
+ -I${X11SRCDIR.Mesa}/src/egl/main \
+ -I${X11SRCDIR.Mesa}/src/egl/drivers/dri \
+ -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common \
-I${DESTDIR}${X11INCDIR}/libdrm
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
@@ -86,9 +86,9 @@ I915_INTEL_FILES = \
intel_fbo.c
.for _f in ${I915_INTEL_FILES}
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
DRI_SOURCES.i915+= i915_${_f}
-CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i915
+CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915
.endfor
DRI_SOURCES.i965 = \
@@ -259,9 +259,9 @@ I965_INTEL_FILES = \
intel_upload.c
.for _f in ${I965_INTEL_FILES}
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i965/${_f} i965_${_f}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/${_f} i965_${_f}
DRI_SOURCES.i965+= i965_${_f}
-CPPFLAGS.i965_${_f} += -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/i965
+CPPFLAGS.i965_${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965
.endfor
DRI_SOURCES.r200 = \
@@ -298,15 +298,15 @@ R200_RADEON_FILES= \
radeon_screen.c
.for _f in ${R200_RADEON_FILES}
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/${_f} r200_${_f}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/${_f} r200_${_f}
DRI_SOURCES.r200+= r200_${_f}
.endfor
.for _f in ${DRI_SOURCES.r200}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200/server \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200 \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/r200/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/r200 \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon \
-DRADEON_R200
.endfor
@@ -339,14 +339,14 @@ DRI_SOURCES.radeon = \
radeon_blit.c
.for _f in ${DRI_SOURCES.radeon}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server \
- -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon \
-DRADEON_R100
.endfor
.for _d in ${DRI_SUBDIRS}
SRCS+= ${DRI_SOURCES.${_d}}
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${_d}
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${_d}
.endfor
LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
@@ -380,7 +380,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
.endif
PKGCONFIG= dri
-PKGDIST.dri= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri
+PKGDIST.dri= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.dri= ${MESA_VER}
@@ -392,7 +392,7 @@ PKGCONFIG_SED_FLAGS= \
FILESDIR= /etc
FILES= drirc
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
.include <bsd.x11.mk>
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.17 src/external/mit/xorg/lib/gallium/Makefile:1.18
--- src/external/mit/xorg/lib/gallium/Makefile:1.17 Tue Nov 29 23:17:22 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/11/29 23:17:22 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/10 02:29:52 mrg Exp $
# Link the gallium mega driver.
@@ -248,13 +248,13 @@ GALLIUM_SOURCES.auxiliary/vl= \
vl_deint_filter.c
# Generated
-.PATH: ${X11SRCDIR.MesaLib}/../src/gallium/auxiliary
+.PATH: ${X11SRCDIR.Mesa}/../src/gallium/auxiliary
GALLIUM_SOURCES.auxiliary= \
u_indices_gen.c \
u_unfilled_gen.c \
u_format_table.c
.for _f in ${GALLIUM_SOURCES.auxiliary}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/auxiliary/util
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
.endfor
GALLIUM_SOURCES.drivers/galahad= \
@@ -284,14 +284,14 @@ GALLIUM_SOURCES.drivers/rbug = \
rbug_objects.c \
rbug_screen.c
# Conflicts with auxiliary/rbug/ files
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/rbug/rbug_core.c DRIVERrbug_core.c
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/gallium/drivers/rbug/rbug_context.c DRIVERrbug_context.c
-CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.MesaLib}/src/gallium/auxiliary
-CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.MesaLib}/src/gallium/drivers/rbug
-CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.MesaLib}/src/gallium/drivers
-CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.MesaLib}/src/gallium/auxiliary
-CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.MesaLib}/src/gallium/drivers/rbug
-CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.MesaLib}/src/gallium/drivers
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/rbug/rbug_core.c DRIVERrbug_core.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/rbug/rbug_context.c DRIVERrbug_context.c
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers/rbug
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers/rbug
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers
GALLIUM_SOURCES.drivers/radeon = \
cayman_msaa.c \
@@ -356,7 +356,7 @@ GALLIUM_SOURCES.drivers/r600/sb = \
#LLVM_C_SOURCES = r600_llvm.c
.for _f in ${GALLIUM_SOURCES.drivers/r600} ${GALLIUM_SOURCES.drivers/r600/sb}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/r600
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/r600
.endfor
GALLIUM_SOURCES.drivers/nouveau = \
@@ -467,7 +467,7 @@ GALLIUM_SOURCES.drivers/nouveau/nvc0 = \
${GALLIUM_SOURCES.drivers/nouveau/nv50} \
${GALLIUM_SOURCES.drivers/nouveau/codegen} \
${GALLIUM_SOURCES.drivers/nouveau/nvc0}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/nouveau
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/nouveau
.endfor
@@ -528,7 +528,7 @@ GALLIUM_SOURCES.state_trackers/dri = \
drisw.c \
dri2.c
.for _f in ${GALLIUM_SOURCES.state_trackers/dri}
-CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri/common
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri/common
.endfor
# missing
@@ -539,7 +539,7 @@ CPPFLAGS+= \
.for _d in ${GALLIUM_SUBDIRS}
SRCS+= ${GALLIUM_SOURCES.${_d}}
-.PATH: ${X11SRCDIR.MesaLib}/src/gallium/${_d}
+.PATH: ${X11SRCDIR.Mesa}/src/gallium/${_d}
.endfor
#. if defined(${GALLIUM_SOURCES.${_d}})
@@ -567,7 +567,7 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../l
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
-LDFLAGS+= -Wl,--version-script=${X11SRCDIR.MesaLib}/src/gallium/targets/dri/dri.sym
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
## build mesagallium parts
MESA_SRC_MODULES= main math vbo state_tracker program asm_s
@@ -575,7 +575,7 @@ MESA_SRC_MODULES= main math vbo state_t
.include "../libglsl.mk"
# Special addition for just gallium; it misses the rest of asm_c files.
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/x86
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
SRCS+= common_x86.c
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
@@ -586,14 +586,14 @@ CFLAGS.streaming-load-memcpy.c+= -msse4.
.include "../driver.mk"
-.PATH: ${X11SRCDIR.MesaLib}/src/gallium/targets/dri
+.PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
SRCS+= target.c
CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib}/src/gallium/include \
- -I${X11SRCDIR.MesaLib}/src/gallium/auxiliary \
- -I${X11SRCDIR.MesaLib}/src/gallium/drivers \
- -I${X11SRCDIR.MesaLib}/../src/mesa/drivers/dri/common
+ -I${X11SRCDIR.Mesa}/src/gallium/include \
+ -I${X11SRCDIR.Mesa}/src/gallium/auxiliary \
+ -I${X11SRCDIR.Mesa}/src/gallium/drivers \
+ -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common
CPPFLAGS.target.c += \
-DDRI_TARGET \
@@ -602,9 +602,9 @@ CPPFLAGS.target.c += \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
-DGALLIUM_SOFTPIPE \
- -I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
- -I${X11SRCDIR.MesaLib}/src/loader \
- -I${X11SRCDIR.MesaLib}/src/gallium/winsys
+ -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri \
+ -I${X11SRCDIR.Mesa}/src/loader \
+ -I${X11SRCDIR.Mesa}/src/gallium/winsys
.if ${BUILD_RADEON} == 1
CPPFLAGS.target.c += \
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.21 src/external/mit/xorg/lib/libGL/Makefile:1.22
--- src/external/mit/xorg/lib/libGL/Makefile:1.21 Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libGL/Makefile Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/12/18 06:24:30 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2019/03/10 02:29:52 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ LIBISCXX= yes
SUBDIR= internal
# glx
-.PATH: ${X11SRCDIR.MesaLib}/src/glx
+.PATH: ${X11SRCDIR.Mesa}/src/glx
SRCS.glx= \
clientattrib.c \
clientinfo.c \
@@ -42,33 +42,33 @@ SRCS.glx= \
glx_query.c \
glxhash.c
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/../src/mapi/glapi/indirect.c MESAindirect.c
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/../src/mapi/glapi/indirect_init.c MESAindirect_init.c
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/../src/mapi/glapi/indirect_size.c MESAindirect_size.c
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/glx/indirect_window_pos.c MESAindirect_window_pos.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect.c MESAindirect.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_init.c MESAindirect_init.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_size.c MESAindirect_size.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_window_pos.c MESAindirect_window_pos.c
.for _f in ${SRCS.glx}
-CPPFLAGS.${_f}= -I${X11SRCDIR.MesaLib}/../src/mapi/glapi -DGLX_SHARED_GLAPI
+CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../src/mapi/glapi -DGLX_SHARED_GLAPI
.endfor
# glapi
-.PATH: ${X11SRCDIR.MesaLib}/src/mapi
-.PATH: ${X11SRCDIR.MesaLib}/../src/mapi/glapi
+.PATH: ${X11SRCDIR.Mesa}/src/mapi
+.PATH: ${X11SRCDIR.Mesa}/../src/mapi/glapi
SRCS.glapi= \
entry.c \
glapi_gentable.c
.for _f in ${SRCS.glapi}
CPPFLAGS.${_f}= -DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\"glapi_glapi_mapi_tmp.h\" \
- -I${X11SRCDIR.MesaLib}/src/mesa
+ -I${X11SRCDIR.Mesa}/src/mesa
.endfor
# XXX see TODO
#.if ${MACHINE_ARCH} == "i386"
-#.PATH: ${X11SRCDIR.MesaLib}/src/mesa/x86
+#.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
#SRCS.glx+= glapi_x86.S
-#CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.MesaLib}/src/mesa/x86
+#CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.Mesa}/src/mesa/x86
## -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
#.endif
@@ -91,9 +91,9 @@ CPPFLAGS.${fn}=-DDEFAULT_DRIVER_DIR=\"${
.include "../libloader.mk"
-.PATH: ${X11SRCDIR.MesaLib}/src/glw
-.PATH: ${X11SRCDIR.MesaLib}/include/GL
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/x11
+.PATH: ${X11SRCDIR.Mesa}/src/glw
+.PATH: ${X11SRCDIR.Mesa}/include/GL
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/x11
INCS= gl.h gl_mangle.h glcorearb.h glext.h \
glx.h glx_mangle.h glxext.h \
osmesa.h wglext.h wmesa.h
@@ -103,13 +103,13 @@ INCSDIR=${X11INCDIR}/GL
SRCS+= ${SRCS.dri} ${SRCS.glx} ${SRCS.glapi}
CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/include/GL/internal \
- -I${X11SRCDIR.MesaLib}/src/loader \
- -I${X11SRCDIR.MesaLib}/src/mapi \
- -I${X11SRCDIR.MesaLib}/src/mapi/glapi \
- -I${X11SRCDIR.MesaLib}/../src/mapi/glapi \
- -I${X11SRCDIR.MesaLib}/src/glx \
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/include/GL/internal \
+ -I${X11SRCDIR.Mesa}/src/loader \
+ -I${X11SRCDIR.Mesa}/src/mapi \
+ -I${X11SRCDIR.Mesa}/src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/src/glx \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/GL \
-I${DESTDIR}${X11INCDIR}/X11 \
@@ -163,7 +163,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
MKLINT=no
PKGCONFIG= gl
-PKGDIST.gl= ${X11SRCDIR.MesaLib}/src/mesa
+PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.gl= ${MESA_VER}
Index: src/external/mit/xorg/lib/libGL/internal/Makefile
diff -u src/external/mit/xorg/lib/libGL/internal/Makefile:1.2 src/external/mit/xorg/lib/libGL/internal/Makefile:1.3
--- src/external/mit/xorg/lib/libGL/internal/Makefile:1.2 Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libGL/internal/Makefile Sun Mar 10 02:29:52 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/12/18 06:24:30 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/10 02:29:52 mrg Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.MesaLib}/include/GL/internal
+.PATH: ${X11SRCDIR.Mesa}/include/GL/internal
INCS= dri_interface.h
INCSDIR=${X11INCDIR}/GL/internal
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.18 src/external/mit/xorg/lib/libGLU/Makefile:1.19
--- src/external/mit/xorg/lib/libGLU/Makefile:1.18 Fri Aug 3 02:20:20 2018
+++ src/external/mit/xorg/lib/libGLU/Makefile Sun Mar 10 02:29:53 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2018/08/03 02:20:20 kamil Exp $
+# $NetBSD: Makefile,v 1.19 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
+.include "../mesa-which.mk"
+
LIB= GLU
LIBISCXX= yes
@@ -131,7 +133,7 @@ INCSDIR=${X11INCDIR}/GL
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic \
- GL ${.CURDIR}/../libGL \
+ GL ${.CURDIR}/../libGL${OLD_PREFIX} \
Xxf86vm ${.CURDIR}/../libXxf86vm \
Xfixes ${.CURDIR}/../libXfixes \
Xdamage ${.CURDIR}/../libXdamage \
@@ -140,7 +142,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
PKGCONFIG= glu
PKGDIST.glu= ${X11SRCDIR.glu}
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_PREFIX}/mesa-ver.mk"
PKGCONFIG_VERSION.glu= ${MESA_VER}
PKGCONFIG_SED_FLAGS= \
-e "s,@GLU_REQUIRES@,gl,"
Index: src/external/mit/xorg/lib/libGLw/Makefile
diff -u src/external/mit/xorg/lib/libGLw/Makefile:1.4 src/external/mit/xorg/lib/libGLw/Makefile:1.5
--- src/external/mit/xorg/lib/libGLw/Makefile:1.4 Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libGLw/Makefile Sun Mar 10 02:29:53 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/18 06:24:30 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
+.include "../mesa-which.mk"
+
LIB= GLw
.PATH: ${X11SRCDIR.glw}
@@ -30,14 +32,14 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
Xdamage ${.CURDIR}/../libXdamage \
m ${.CURDIR}/../../../../../lib/libm \
drm ${.CURDIR}/../libdrm \
- GL ${.CURDIR}/../libGL \
+ GL ${.CURDIR}/../libGL${OLD_PREFIX} \
ICE ${.CURDIR}/../libICE \
SM ${.CURDIR}/../libSM \
Xt ${.CURDIR}/../libXt \
xcb-dri2 ${.CURDIR}/../libxcb/dri2
PKGCONFIG= glw
-PKGDIST.glw= ${X11SRCDIR.MesaLib}/src/glw
+PKGDIST.glw= ${X11SRCDIR.Mesa}/src/glw
PKGCONFIG_VERSION.glw= 1.0.0
.include <bsd.x11.mk>
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.1 src/external/mit/xorg/lib/libgbm/Makefile:1.2
--- src/external/mit/xorg/lib/libgbm/Makefile:1.1 Mon Feb 23 00:09:30 2015
+++ src/external/mit/xorg/lib/libgbm/Makefile Sun Mar 10 02:29:53 2019
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2015/02/23 00:09:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
LIB= gbm
-.PATH: ${X11SRCDIR.MesaLib}/src/gbm/main
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
SRCS.main= \
backend.c \
gbm.c
-.PATH: ${X11SRCDIR.MesaLib}/src/gbm/backends/dri
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri
SRCS.dri= \
gbm_dri.c
@@ -19,10 +19,10 @@ CPPFLAGS+= -D_OS_UNIX=1
CPPFLAGS+= -DHAVE_PTHREAD=1
CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\"
CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/gbm\"
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/loader
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/gbm/main
-CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/loader
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gbm/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CFLAGS+= -fno-strict-aliasing -fexceptions
@@ -30,7 +30,7 @@ COPTS.gbm_dri.c+= -Wno-error
.include "../libloader.mk"
-.PATH: ${X11SRCDIR.MesaLib}/src/gbm/main
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
INCS= gbm.h
INCSDIR= ${X11INCDIR}
@@ -38,7 +38,7 @@ LIBDPLIBS= glapi ${.CURDIR}/../libg
LIBDPLIBS= drm ${.CURDIR}/../libdrm
PKGCONFIG= gbm
-PKGDIST.gbm= ${X11SRCDIR.MesaLib}/src/gbm/main
+PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.gbm= ${MESA_VER}
Index: src/external/mit/xorg/lib/libglapi/Makefile
diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.2 src/external/mit/xorg/lib/libglapi/Makefile:1.3
--- src/external/mit/xorg/lib/libglapi/Makefile:1.2 Fri Oct 6 20:24:46 2017
+++ src/external/mit/xorg/lib/libglapi/Makefile Sun Mar 10 02:29:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/10/06 20:24:46 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
@@ -9,16 +9,16 @@ SHLIB_MAJOR= 1
SHLIB_MINOR= 0
# util
-.PATH: ${X11SRCDIR.MesaLib}/src/util
+.PATH: ${X11SRCDIR.Mesa}/src/util
SRCS.util= \
hash_table.c \
ralloc.c
-.PATH: ${X11SRCDIR.MesaLib}/../src/util
+.PATH: ${X11SRCDIR.Mesa}/../src/util
SRCS.util+= \
format_srgb.c
# mapi
-.PATH: ${X11SRCDIR.MesaLib}/src/mapi
+.PATH: ${X11SRCDIR.Mesa}/src/mapi
SRCS.mapi= \
entry.c \
mapi_glapi.c \
@@ -28,21 +28,21 @@ SRCS.mapi= \
u_execmem.c
CPPFLAGS.entry.c= -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mapi/entry.c shared_entry.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mapi/entry.c shared_entry.c
# above is shared/libglapi.la
SRCS+= ${SRCS.util} ${SRCS.mapi} ${SRCS.mapi-glapi}
CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/src/mapi \
- -I${X11SRCDIR.MesaLib}/src/mapi/glapi \
- -I${X11SRCDIR.MesaLib}/src/mesa \
- -I${X11SRCDIR.MesaLib}/src/util \
- -I${X11SRCDIR.MesaLib}/../src/mapi \
- -I${X11SRCDIR.MesaLib}/../src/mapi/glapi \
- -I${X11SRCDIR.MesaLib}/../src/mesa
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/src/mapi \
+ -I${X11SRCDIR.Mesa}/src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src/util \
+ -I${X11SRCDIR.Mesa}/../src/mapi \
+ -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/../src/mesa
CPPFLAGS+= \
-DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
Index: src/external/mit/xorg/lib/libglut/Makefile
diff -u src/external/mit/xorg/lib/libglut/Makefile:1.8 src/external/mit/xorg/lib/libglut/Makefile:1.9
--- src/external/mit/xorg/lib/libglut/Makefile:1.8 Tue Jan 5 13:07:47 2016
+++ src/external/mit/xorg/lib/libglut/Makefile Sun Mar 10 02:29:53 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
+.include "../mesa-which.mk"
+
LIB= glut
.PATH: ${X11SRCDIR.MesaGLUT}/src/glut/glx
@@ -55,7 +57,7 @@ SRCS= \
glut_winmisc.c \
layerutil.c
-CPPFLAGS+= -I${X11SRCDIR.MesaGLUT}/include -I${X11SRCDIR.MesaLib}/include
+CPPFLAGS+= -I${X11SRCDIR.MesaGLUT}/include -I${X11SRCDIR.Mesa}/include
CFLAGS+= -fno-strict-aliasing -fexceptions
.PATH: ${X11SRCDIR.MesaGLUT}/include/GL
@@ -66,7 +68,7 @@ LIBDPLIBS= Xi ${.CURDIR}/../libXi \
Xmu ${.CURDIR}/../libXmu \
Xt ${.CURDIR}/../libXt \
X11 ${.CURDIR}/../libX11/dynamic \
- GL ${.CURDIR}/../libGL \
+ GL ${.CURDIR}/../libGL${OLD_PREFIX} \
GLU ${.CURDIR}/../libGLU
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.8 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Mar 10 02:29:53 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/03/10 02:29:53 mrg Exp $
.include <bsd.own.mk>
+.include "../../../lib/mesa-which.mk"
+
DRIVER= xf86-video-ati-kms
DRIVER_NAME= radeon_drv
@@ -53,6 +55,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.${DRIVER}}/../include
-LIBDPLIBS+= gbm ${.CURDIR}/../../../lib/libgbm
+LIBDPLIBS+= gbm ${.CURDIR}/../../../lib/libgbm${OLD_PREFIX}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx:1.2
--- src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/glx/Makefile.glx Sun Mar 10 02:29:54 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.glx,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.2 2019/03/10 02:29:54 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-.PATH: ${X11SRCDIR.MesaLib}/src/glx
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/glapi
+.PATH: ${X11SRCDIR.Mesa}/src/glx
SRCS.glx= \
indirect_dispatch.c \
@@ -50,11 +50,11 @@ CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
- -I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/src/glx \
- -I${X11SRCDIR.MesaLib}/src/mesa \
- -I${X11SRCDIR.MesaLib}/src/mesa/main \
- -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/src/glx \
+ -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src/mesa/main \
+ -I${X11SRCDIR.Mesa}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile Sun Mar 10 02:29:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/10 02:29:54 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # define
@@ -24,7 +24,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.Mesa}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile Sun Mar 10 02:29:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/10 02:29:54 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # defined
@@ -25,7 +25,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.Mesa}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.13 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.14
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.13 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Sun Mar 10 02:29:53 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.glx,v 1.13 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.14 2019/03/10 02:29:53 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-.PATH: ${X11SRCDIR.MesaLib}/src/glx
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/glapi
+.PATH: ${X11SRCDIR.Mesa}/src/glx
SRCS.glx= \
clientinfo.c \
@@ -58,11 +58,11 @@ CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
-I${X11SRCDIR.xorg-server}/present \
- -I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/src/glx \
- -I${X11SRCDIR.MesaLib}/src/mesa \
- -I${X11SRCDIR.MesaLib}/src/mesa/main \
- -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/src/glx \
+ -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src/mesa/main \
+ -I${X11SRCDIR.Mesa}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.13 Fri Aug 12 01:15:50 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Sun Mar 10 02:29:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/12 01:15:50 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2019/03/10 02:29:53 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # define
@@ -24,7 +24,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.Mesa}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.10 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Sun Mar 10 02:29:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/03/10 02:29:54 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # defined
@@ -27,7 +27,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/Xi \
- -I${X11SRCDIR.MesaLib}/include \
+ -I${X11SRCDIR.Mesa}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1109 src/share/mk/bsd.own.mk:1.1110
--- src/share/mk/bsd.own.mk:1.1109 Sat Mar 9 17:59:28 2019
+++ src/share/mk/bsd.own.mk Sun Mar 10 02:29:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1109 2019/03/09 17:59:28 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1110 2019/03/10 02:29:52 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1466,6 +1466,9 @@ HAVE_XORG_SERVER_VER?=110
HAVE_XORG_SERVER_VER?=120
.endif
+# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
+EXTERNAL_MESALIB_DIR?= MesaLib.old
+
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
@@ -1485,7 +1488,7 @@ HAVE_XORG_GLAMOR?= no
xorg-cf-files imake xbiff xkeyboard-config \
xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
- glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \
+ glu glw mesa-demos MesaGLUT MesaLib MesaLib.old MesaLib7 \
ico iceauth listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
rstart setxkbmap showfont smproxy twm viewres \
@@ -1510,6 +1513,9 @@ HAVE_XORG_GLAMOR?= no
X11SRCDIR.${_dir}?= ${X11SRCDIRMIT}/${_dir}/dist
.endfor
+# X11SRCDIR.Mesa points to the currently used Mesa sources
+X11SRCDIR.Mesa?= ${X11SRCDIRMIT}/${EXTERNAL_MESALIB_DIR}/dist
+
.for _i in \
elographics keyboard mouse synaptics vmmouse void ws
X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist
Added files:
Index: src/external/mit/xorg/lib/driver.old.mk
diff -u /dev/null src/external/mit/xorg/lib/driver.old.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/driver.old.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,24 @@
+# $NetBSD: driver.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+# stuff both dri and gallium drivers need.
+
+# util
+.PATH: ${X11SRCDIR.Mesa}/src/util
+SRCS.util= \
+ hash_table.c \
+ MESAralloc.c
+.PATH: ${X11SRCDIR.Mesa}/../src/util
+SRCS.util+= \
+ format_srgb.c
+CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.hash_table.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.Mesa}/src/util
+
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/ralloc.c MESAralloc.c
+
+SRCS+= ${SRCS.util}
+
+# also need to pull in libdricommon.la libmegadriver_stub.la
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
+SRCS+= utils.c dri_util.c xmlconfig.c
+SRCS+= megadriver_stub.c
Index: src/external/mit/xorg/lib/libglsl.old.mk
diff -u /dev/null src/external/mit/xorg/lib/libglsl.old.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libglsl.old.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,113 @@
+# $NetBSD: libglsl.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+LIBGLSL_GENERATED_CXX_FILES = \
+ glsl_lexer.cpp \
+ glsl_parser.cpp
+
+COPTS.glsl_lexer.cpp+= -Wno-deprecated-register
+
+LIBGLSL_FILES = \
+ ast_array_index.cpp \
+ ast_expr.cpp \
+ ast_function.cpp \
+ ast_to_hir.cpp \
+ ast_type.cpp \
+ builtin_functions.cpp \
+ builtin_types.cpp \
+ builtin_variables.cpp \
+ glsl_parser_extras.cpp \
+ glsl_types.cpp \
+ glsl_symbol_table.cpp \
+ hir_field_selection.cpp \
+ ir_basic_block.cpp \
+ ir_builder.cpp \
+ ir_clone.cpp \
+ ir_constant_expression.cpp \
+ ir.cpp \
+ ir_equals.cpp \
+ ir_expression_flattening.cpp \
+ ir_function_can_inline.cpp \
+ ir_function_detect_recursion.cpp \
+ ir_function.cpp \
+ ir_hierarchical_visitor.cpp \
+ ir_hv_accept.cpp \
+ ir_import_prototypes.cpp \
+ ir_print_visitor.cpp \
+ ir_reader.cpp \
+ ir_rvalue_visitor.cpp \
+ ir_set_program_inouts.cpp \
+ ir_validate.cpp \
+ ir_variable_refcount.cpp \
+ linker.cpp \
+ link_atomics.cpp \
+ link_functions.cpp \
+ link_interface_blocks.cpp \
+ link_uniforms.cpp \
+ link_uniform_initializers.cpp \
+ link_uniform_block_active_visitor.cpp \
+ link_uniform_blocks.cpp \
+ link_varyings.cpp \
+ loop_analysis.cpp \
+ loop_controls.cpp \
+ loop_unroll.cpp \
+ lower_clip_distance.cpp \
+ lower_discard.cpp \
+ lower_discard_flow.cpp \
+ lower_if_to_cond_assign.cpp \
+ lower_instructions.cpp \
+ lower_jumps.cpp \
+ lower_mat_op_to_vec.cpp \
+ lower_noise.cpp \
+ lower_offset_array.cpp \
+ lower_packed_varyings.cpp \
+ lower_named_interface_blocks.cpp \
+ lower_packing_builtins.cpp \
+ lower_texture_projection.cpp \
+ lower_variable_index_to_cond_assign.cpp \
+ lower_vec_index_to_cond_assign.cpp \
+ lower_vec_index_to_swizzle.cpp \
+ lower_vector.cpp \
+ lower_vector_insert.cpp \
+ lower_vertex_id.cpp \
+ lower_output_reads.cpp \
+ lower_ubo_reference.cpp \
+ opt_algebraic.cpp \
+ opt_array_splitting.cpp \
+ opt_constant_folding.cpp \
+ opt_constant_propagation.cpp \
+ opt_constant_variable.cpp \
+ opt_copy_propagation.cpp \
+ opt_copy_propagation_elements.cpp \
+ opt_cse.cpp \
+ opt_dead_builtin_varyings.cpp \
+ opt_dead_code.cpp \
+ opt_dead_code_local.cpp \
+ opt_dead_functions.cpp \
+ opt_flatten_nested_if_blocks.cpp \
+ opt_flip_matrices.cpp \
+ opt_function_inlining.cpp \
+ opt_if_simplification.cpp \
+ opt_noop_swizzle.cpp \
+ opt_rebalance_tree.cpp \
+ opt_redundant_jumps.cpp \
+ opt_structure_splitting.cpp \
+ opt_swizzle_swizzle.cpp \
+ opt_tree_grafting.cpp \
+ opt_vectorize.cpp \
+ s_expression.cpp \
+ strtod.c
+
+LIBGLCPP_GENERATED_FILES = \
+ glcpp-lex.c \
+ glcpp-parse.c
+
+LIBGLCPP_FILES = \
+ pp.c
+
+.PATH: ${X11SRCDIR.Mesa}/src/glsl
+.PATH: ${X11SRCDIR.Mesa}/src/glsl/glcpp
+
+SRCS+= ${LIBGLSL_GENERATED_CXX_FILES} \
+ ${LIBGLSL_FILES} \
+ ${LIBGLCPP_GENERATED_FILES} \
+ ${LIBGLCPP_FILES}
Index: src/external/mit/xorg/lib/libloader.old.mk
diff -u /dev/null src/external/mit/xorg/lib/libloader.old.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libloader.old.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,18 @@
+# $NetBSD: libloader.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+# makefile fragment for mesa src/loader
+
+# loader stuff.
+.PATH: ${X11SRCDIR.Mesa}/src/loader
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
+SRCS.loader += \
+ loader.c \
+ pci_id_driver_map.c \
+ xmlconfig.c
+
+.for _f in ${SRCS.loader}
+CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src
+.endfor
+
+SRCS+= ${SRCS.loader}
Index: src/external/mit/xorg/lib/libmesa.old.mk
diff -u /dev/null src/external/mit/xorg/lib/libmesa.old.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libmesa.old.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,443 @@
+# $NetBSD: libmesa.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+#
+# Consumer of this Makefile should set MESA_SRC_MODULES.
+
+INCLUDES.all= mapi mesa mesa/main
+
+# The source file lists derived from src/mesa/Makefile.sources.
+# Please keep the organization in line with those files.
+
+# Main sources
+PATHS.main= mesa/main
+INCLUDES.main= glsl
+SRCS.main= \
+ api_arrayelt.c \
+ api_loopback.c \
+ api_validate.c \
+ accum.c \
+ arbprogram.c \
+ atifragshader.c \
+ attrib.c \
+ arrayobj.c \
+ blend.c \
+ blit.c \
+ bufferobj.c \
+ buffers.c \
+ clear.c \
+ clip.c \
+ colortab.c \
+ compute.c \
+ condrender.c \
+ context.c \
+ convolve.c \
+ copyimage.c \
+ cpuinfo.c \
+ debug.c \
+ depth.c \
+ dlist.c \
+ drawpix.c \
+ drawtex.c \
+ enable.c \
+ errors.c \
+ MESAeval.c \
+ execmem.c \
+ extensions.c \
+ fbobject.c \
+ feedback.c \
+ ffvertex_prog.c \
+ ff_fragment_shader.cpp \
+ fog.c \
+ formatquery.c \
+ formats.c \
+ format_pack.c \
+ format_unpack.c \
+ format_utils.c \
+ framebuffer.c \
+ get.c \
+ genmipmap.c \
+ getstring.c \
+ glformats.c \
+ hash.c \
+ hint.c \
+ histogram.c \
+ image.c \
+ imports.c \
+ light.c \
+ lines.c \
+ matrix.c \
+ mipmap.c \
+ mm.c \
+ multisample.c \
+ objectlabel.c \
+ pack.c \
+ pbo.c \
+ performance_monitor.c \
+ pipelineobj.c \
+ MESApixel.c \
+ MESApixelstore.c \
+ pixeltransfer.c \
+ points.c \
+ polygon.c \
+ queryobj.c \
+ querymatrix.c \
+ rastpos.c \
+ readpix.c \
+ remap.c \
+ renderbuffer.c \
+ samplerobj.c \
+ scissor.c \
+ set.c \
+ shaderapi.c \
+ shaderimage.c \
+ shaderobj.c \
+ shader_query.cpp \
+ shared.c \
+ state.c \
+ stencil.c \
+ syncobj.c \
+ texcompress.c \
+ texcompress_bptc.c \
+ texcompress_cpal.c \
+ texcompress_rgtc.c \
+ texcompress_s3tc.c \
+ texcompress_fxt1.c \
+ texcompress_etc.c \
+ texenv.c \
+ texformat.c \
+ texgen.c \
+ texgetimage.c \
+ teximage.c \
+ texobj.c \
+ texparam.c \
+ texstate.c \
+ texstorage.c \
+ texstore.c \
+ textureview.c \
+ texturebarrier.c \
+ transformfeedback.c \
+ uniforms.c \
+ uniform_query.cpp \
+ varray.c \
+ vdpau.c \
+ version.c \
+ viewport.c \
+ vtxfmt.c \
+ es1_conversion.c
+
+# Build files
+.PATH: ${X11SRCDIR.Mesa}/../src/mesa/main
+SRCS.main+= \
+ enums.c \
+ api_exec.c
+
+# XXX avoid source name clashes with glx
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/main
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/main/pixel.c MESApixel.c \
+ ${X11SRCDIR.Mesa}/src/mesa/main/pixelstore.c MESApixelstore.c \
+ ${X11SRCDIR.Mesa}/src/mesa/main/eval.c MESAeval.c
+
+# Math sources
+PATHS.math= mesa/math
+SRCS.math= \
+ m_debug_clip.c \
+ m_debug_norm.c \
+ m_debug_xform.c \
+ m_eval.c \
+ m_matrix.c \
+ m_translate.c \
+ m_vector.c
+
+PATHS.math_xform= mesa/math
+SRCS.math_xform= \
+ m_xform.c
+
+
+# VBO sources
+PATHS.vbo= mesa/vbo
+INCLUDES.vbo= gallium/auxiliary
+SRCS.vbo= \
+ vbo_context.c \
+ vbo_exec.c \
+ vbo_exec_api.c \
+ vbo_exec_array.c \
+ vbo_exec_draw.c \
+ vbo_exec_eval.c \
+ vbo_noop.c \
+ vbo_primitive_restart.c \
+ vbo_rebase.c \
+ vbo_split.c \
+ vbo_split_copy.c \
+ vbo_split_inplace.c \
+ vbo_save.c \
+ vbo_save_api.c \
+ vbo_save_draw.c \
+ vbo_save_loopback.c
+
+# TNL sources
+PATHS.tnl= mesa/tnl
+SRCS.tnl= \
+ t_context.c \
+ t_pipeline.c \
+ t_draw.c \
+ t_rasterpos.c \
+ t_vb_program.c \
+ t_vb_render.c \
+ t_vb_texgen.c \
+ t_vb_texmat.c \
+ t_vb_vertex.c \
+ t_vb_fog.c \
+ t_vb_light.c \
+ t_vb_normals.c \
+ t_vb_points.c \
+ t_vp_build.c \
+ t_vertex.c \
+ t_vertex_sse.c \
+ t_vertex_generic.c
+
+
+# Software raster sources
+PATHS.swrast= mesa/swrast
+SRCS.swrast= \
+ s_aaline.c \
+ s_aatriangle.c \
+ s_alpha.c \
+ s_atifragshader.c \
+ s_bitmap.c \
+ s_blend.c \
+ s_blit.c \
+ s_clear.c \
+ s_copypix.c \
+ s_context.c \
+ s_depth.c \
+ s_drawpix.c \
+ s_feedback.c \
+ s_fog.c \
+ s_fragprog.c \
+ s_lines.c \
+ s_logic.c \
+ s_masking.c \
+ s_points.c \
+ s_renderbuffer.c \
+ s_span.c \
+ s_stencil.c \
+ s_texcombine.c \
+ s_texfetch.c \
+ s_texfilter.c \
+ s_texrender.c \
+ s_texture.c \
+ s_triangle.c \
+ s_zoom.c
+
+
+# swrast_setup
+PATHS.ss= mesa/swrast_setup
+SRCS.ss= \
+ ss_context.c \
+ ss_triangle.c
+
+
+# Common driver sources
+PATHS.common= mesa/drivers/common
+SRCS.common= \
+ driverfuncs.c \
+ meta_blit.c \
+ meta_copy_image.c \
+ meta_generate_mipmap.c \
+ meta.c
+
+
+# ASM C driver sources
+PATHS.asm_c= mesa/x86 mesa/x86/rtasm mesa/sparc mesa/x86-64
+SRCS.asm_c= \
+ common_x86.c \
+ x86_xform.c \
+ 3dnow.c \
+ sse.c \
+ x86sse.c \
+ sparc.c \
+ x86-64.c
+
+
+# ASM assembler driver sources
+PATHS.asm_s= mesa/x86 mesa/x86/rtasm mesa/sparc mesa/x86-64
+.if ${MACHINE} == "amd64"
+SRCS.asm_s= \
+ xform4.S
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/x86_64
+.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
+SRCS.asm_s= \
+ sparc_clip.S \
+ norm.S \
+ xform.S
+.elif ${MACHINE} == "i386"
+SRCS.asm_s= \
+ common_x86_asm.S \
+ x86_xform2.S \
+ x86_xform3.S \
+ x86_xform4.S \
+ x86_cliptest.S \
+ mmx_blend.S \
+ 3dnow_xform1.S \
+ 3dnow_xform2.S \
+ 3dnow_xform3.S \
+ 3dnow_xform4.S \
+ 3dnow_normal.S \
+ sse_xform1.S \
+ sse_xform2.S \
+ sse_xform3.S \
+ sse_xform4.S \
+ sse_normal.S \
+ read_rgba_span_x86.S
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/arch/i386
+.endif
+
+
+# State tracker sources
+PATHS.state_tracker= mesa/state_tracker
+INCLUDES.state_tracker= glsl
+SRCS.state_tracker= \
+ st_atom.c \
+ st_atom_array.c \
+ st_atom_blend.c \
+ st_atom_clip.c \
+ st_atom_constbuf.c \
+ st_atom_depth.c \
+ st_atom_framebuffer.c \
+ st_atom_msaa.c \
+ st_atom_pixeltransfer.c \
+ st_atom_sampler.c \
+ st_atom_scissor.c \
+ st_atom_shader.c \
+ st_atom_rasterizer.c \
+ st_atom_stipple.c \
+ st_atom_texture.c \
+ st_atom_viewport.c \
+ st_cb_bitmap.c \
+ st_cb_blit.c \
+ st_cb_bufferobjects.c \
+ st_cb_clear.c \
+ st_cb_condrender.c \
+ st_cb_flush.c \
+ st_cb_drawpixels.c \
+ st_cb_drawtex.c \
+ st_cb_eglimage.c \
+ st_cb_fbo.c \
+ st_cb_feedback.c \
+ st_cb_msaa.c \
+ st_cb_program.c \
+ st_cb_queryobj.c \
+ st_cb_rasterpos.c \
+ st_cb_readpixels.c \
+ st_cb_syncobj.c \
+ st_cb_strings.c \
+ st_cb_texture.c \
+ st_cb_texturebarrier.c \
+ st_cb_viewport.c \
+ st_cb_xformfb.c \
+ st_context.c \
+ st_debug.c \
+ st_draw.c \
+ st_draw_feedback.c \
+ st_extensions.c \
+ st_format.c \
+ st_gen_mipmap.c \
+ st_glsl_to_tgsi.cpp \
+ st_manager.c \
+ st_mesa_to_tgsi.c \
+ st_program.c \
+ st_texture.c \
+ st_vdpau.c
+
+
+# Program sources
+PATHS.program= mesa/program
+INCLUDES.program= glsl
+SRCS.program= \
+ arbprogparse.c \
+ prog_hash_table.c \
+ ir_to_mesa.cpp \
+ program.c \
+ program_parse_extra.c \
+ prog_cache.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_noise.c \
+ prog_optimize.c \
+ prog_opt_constant_fold.c \
+ prog_parameter.c \
+ prog_parameter_layout.c \
+ prog_print.c \
+ prog_statevars.c \
+ programopt.c \
+ register_allocate.c \
+ sampler.cpp \
+ string_to_uint_map.cpp \
+ symbol_table.c \
+ program_lexer.l
+
+# Generated
+.PATH: ${X11SRCDIR.Mesa}/../src/mesa/program
+SRCS.program+= \
+ program_parse.tab.c
+
+
+# Run throught all the modules and setup the SRCS and CPPFLAGS etc.
+.for _mod_ in ${MESA_SRC_MODULES}
+
+SRCS+= ${SRCS.${_mod_}}
+
+. for _path_ in ${PATHS.${_mod_}}
+.PATH: ${X11SRCDIR.Mesa}/src/${_path_}
+. endfor
+
+. for _path_ in ${INCLUDES.${_mod_}}
+. for _s in ${SRCS.${_mod_}}
+CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src/${_path_}
+. endfor
+. endfor
+
+.endfor
+
+.for _path_ in ${INCLUDES.all}
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/${_path_}
+.endfor
+
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gallium/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mapi/glapi
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/../src/mesa/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
+
+CPPFLAGS+= \
+ -DPACKAGE_NAME=\"Mesa\" \
+ -DPACKAGE_TARNAME=\"mesa\" \
+ -DPACKAGE_VERSION=\"10.3.5\" \
+ -DPACKAGE_STRING=\"Mesa\ 10.3.5\" \
+ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\"; \
+ -DPACKAGE_URL=\"\" \
+ -DPACKAGE=\"mesa\" \
+ -DVERSION=\"10.3.5\"
+
+CPPFLAGS+= \
+ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
+ -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
+ -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
+ -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE___BUILTIN_BSWAP32=1 \
+ -DHAVE___BUILTIN_BSWAP64=1 -DHAVE_DLADDR=1 -DHAVE_CLOCK_GETTIME=1 \
+ -DHAVE_POSIX_MEMALIGN -DHAVE_PTHREAD=1 -DHAVE_DLOPEN
+
+.include "../asm.mk"
+
+CPPFLAGS+= \
+ -DHAVE_LIBDRM -DGLX_USE_DRM -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DMESA_EGL_NO_X11_HEADERS
+
+CPPFLAGS+= \
+ -DUSE_EXTERNAL_DXTN_LIB=1 \
+ -DYYTEXT_POINTER=1
+
+CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u /dev/null src/external/mit/xorg/lib/mesa-which.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/mesa-which.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,7 @@
+# $NetBSD: mesa-which.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+OLD_PREFIX=
+.if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
+OLD_PREFIX=.old
+EXTRA_DRI_DIRS=dri7
+.endif
Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/dri.old/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/dri.old/Makefile Sun Mar 10 02:29:52 2019
@@ -0,0 +1,421 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+# Link the mesa_dri_drivers mega driver.
+
+.include <bsd.own.mk>
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+
+LIBISMODULE= yes
+LIBISCXX= yes
+
+SHLIB_MAJOR= 0
+
+LIB= mesa_dri_drivers
+DRIDIR= ${X11USRLIBDIR}/modules/dri
+DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
+
+# -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${MODULE}/server \
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.Mesa}/src/egl/main \
+ -I${X11SRCDIR.Mesa}/src/egl/drivers/dri \
+ -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common \
+ -I${DESTDIR}${X11INCDIR}/libdrm
+
+#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+
+# We don't actually build this on non-x86 at all, currently.
+# The following if statements are not effective since we only
+# get here for x86
+.if ${MACHINE_ARCH} == "alpha"
+DRIVERS= r200 radeon
+.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+DRIVERS= r200 radeon
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
+DRIVERS= r200 radeon
+.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DRIVERS= i915 i965 r200 radeon
+.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
+DRIVERS= r200 radeon
+.endif
+
+DRI_SUBDIRS= ${DRIVERS}
+
+DRI_SOURCES.i915 = \
+ i830_context.c \
+ i830_state.c \
+ i830_texblend.c \
+ i830_texstate.c \
+ i830_vtbl.c \
+ i915_tex_layout.c \
+ i915_texstate.c \
+ i915_context.c \
+ i915_debug_fp.c \
+ i915_fragprog.c \
+ i915_program.c \
+ i915_state.c \
+ i915_vtbl.c
+
+I915_INTEL_FILES = \
+ intel_render.c \
+ intel_regions.c \
+ intel_buffer_objects.c \
+ intel_batchbuffer.c \
+ intel_clear.c \
+ intel_extensions.c \
+ intel_mipmap_tree.c \
+ intel_tex_layout.c \
+ intel_tex_image.c \
+ intel_tex_subimage.c \
+ intel_tex_copy.c \
+ intel_tex_validate.c \
+ intel_tex.c \
+ intel_pixel.c \
+ intel_pixel_bitmap.c \
+ intel_pixel_copy.c \
+ intel_pixel_draw.c \
+ intel_pixel_read.c \
+ intel_buffers.c \
+ intel_blit.c \
+ intel_context.c \
+ intel_screen.c \
+ intel_state.c \
+ intel_syncobj.c \
+ intel_tris.c \
+ intel_fbo.c
+
+.for _f in ${I915_INTEL_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
+DRI_SOURCES.i915+= i915_${_f}
+CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915
+.endfor
+
+DRI_SOURCES.i965 = \
+ brw_binding_tables.c \
+ brw_blorp.cpp \
+ brw_blorp_blit.cpp \
+ brw_blorp_blit_eu.cpp \
+ brw_cc.c \
+ brw_cfg.cpp \
+ brw_clear.c \
+ brw_clip.c \
+ brw_clip_line.c \
+ brw_clip_point.c \
+ brw_clip_state.c \
+ brw_clip_tri.c \
+ brw_clip_unfilled.c \
+ brw_clip_util.c \
+ brw_context.c \
+ brw_cubemap_normalize.cpp \
+ brw_curbe.c \
+ brw_dead_control_flow.cpp \
+ brw_device_info.c \
+ brw_disasm.c \
+ brw_draw.c \
+ brw_draw_upload.c \
+ brw_eu.c \
+ brw_eu_compact.c \
+ brw_eu_emit.c \
+ brw_eu_util.c \
+ brw_fs.cpp \
+ brw_fs_channel_expressions.cpp \
+ brw_fs_copy_propagation.cpp \
+ brw_fs_cse.cpp \
+ brw_fs_dead_code_eliminate.cpp \
+ brw_fs_fp.cpp \
+ brw_fs_generator.cpp \
+ brw_fs_live_variables.cpp \
+ brw_fs_peephole_predicated_break.cpp \
+ brw_fs_reg_allocate.cpp \
+ brw_fs_register_coalesce.cpp \
+ brw_fs_saturate_propagation.cpp \
+ brw_fs_sel_peephole.cpp \
+ brw_fs_vector_splitting.cpp \
+ brw_fs_visitor.cpp \
+ brw_gs.c \
+ brw_gs_emit.c \
+ brw_gs_state.c \
+ brw_gs_surface_state.c \
+ brw_gs.c \
+ brw_gs_emit.c \
+ brw_gs_state.c \
+ brw_gs_surface_state.c \
+ brw_interpolation_map.c \
+ brw_lower_texture_gradients.cpp \
+ brw_lower_unnormalized_offset.cpp \
+ brw_meta_updownsample.c \
+ brw_meta_stencil_blit.c \
+ brw_meta_util.c \
+ brw_meta_fast_clear.c \
+ brw_misc_state.c \
+ brw_object_purgeable.c \
+ brw_performance_monitor.c \
+ brw_program.c \
+ brw_primitive_restart.c \
+ brw_queryobj.c \
+ brw_reset.c \
+ brw_sampler_state.c \
+ brw_schedule_instructions.cpp \
+ brw_sf.c \
+ brw_sf_emit.c \
+ brw_sf_state.c \
+ brw_shader.cpp \
+ brw_state_batch.c \
+ brw_state_cache.c \
+ brw_state_dump.c \
+ brw_state_upload.c \
+ brw_surface_formats.c \
+ brw_tex.c \
+ brw_tex_layout.c \
+ brw_urb.c \
+ brw_util.c \
+ brw_vec4.cpp \
+ brw_vec4_copy_propagation.cpp \
+ brw_vec4_cse.cpp \
+ brw_vec4_generator.cpp \
+ brw_vec4_gs.c \
+ brw_vec4_gs_visitor.cpp \
+ brw_vec4_live_variables.cpp \
+ brw_vec4_reg_allocate.cpp \
+ brw_vec4_visitor.cpp \
+ brw_vec4_vp.cpp \
+ brw_vec4_vs_visitor.cpp \
+ brw_vs.c \
+ brw_vs_state.c \
+ brw_vs_surface_state.c \
+ brw_wm.c \
+ brw_wm_iz.cpp \
+ brw_wm_state.c \
+ brw_wm_surface_state.c \
+ gen6_blorp.cpp \
+ gen6_cc.c \
+ gen6_clip_state.c \
+ gen6_depth_state.c \
+ gen6_depthstencil.c \
+ gen6_gs_state.c \
+ gen6_multisample_state.c \
+ gen6_queryobj.c \
+ gen6_sampler_state.c \
+ gen6_scissor_state.c \
+ gen6_sf_state.c \
+ gen6_sol.c \
+ gen6_surface_state.c \
+ gen6_urb.c \
+ gen6_viewport_state.c \
+ gen6_vs_state.c \
+ gen6_wm_state.c \
+ gen7_blorp.cpp \
+ gen7_disable.c \
+ gen7_gs_state.c \
+ gen7_misc_state.c \
+ gen7_sf_state.c \
+ gen7_sol_state.c \
+ gen7_urb.c \
+ gen7_viewport_state.c \
+ gen7_vs_state.c \
+ gen7_wm_state.c \
+ gen7_wm_surface_state.c \
+ gen8_blend_state.c \
+ gen8_depth_state.c \
+ gen8_disable.c \
+ gen8_draw_upload.c \
+ gen8_gs_state.c \
+ gen8_misc_state.c \
+ gen8_multisample_state.c \
+ gen8_sf_state.c \
+ gen8_sol_state.c \
+ gen8_surface_state.c \
+ gen8_viewport_state.c \
+ gen8_vs_state.c \
+ gen8_wm_depth_stencil.c \
+ gen8_ps_state.c
+
+I965_INTEL_FILES = \
+ intel_asm_annotation.c \
+ intel_batchbuffer.c \
+ intel_blit.c \
+ intel_buffer_objects.c \
+ intel_buffers.c \
+ intel_copy_image.c \
+ intel_debug.c \
+ intel_extensions.c \
+ intel_fbo.c \
+ intel_mipmap_tree.c \
+ intel_resolve_map.c \
+ intel_screen.c \
+ intel_pixel.c \
+ intel_pixel_bitmap.c \
+ intel_pixel_copy.c \
+ intel_pixel_draw.c \
+ intel_pixel_read.c \
+ intel_state.c \
+ intel_syncobj.c \
+ intel_tex.c \
+ intel_tex_copy.c \
+ intel_tex_image.c \
+ intel_tex_subimage.c \
+ intel_tex_validate.c \
+ intel_upload.c
+
+.for _f in ${I965_INTEL_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+CPPFLAGS.i965_${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965
+.endfor
+
+DRI_SOURCES.r200 = \
+ r200_context.c \
+ r200_ioctl.c \
+ r200_state.c \
+ r200_state_init.c \
+ r200_cmdbuf.c \
+ r200_tex.c \
+ r200_texstate.c \
+ r200_tcl.c \
+ r200_swtcl.c \
+ r200_maos.c \
+ r200_sanity.c \
+ r200_fragshader.c \
+ r200_vertprog.c \
+ r200_blit.c
+
+R200_RADEON_FILES= \
+ radeon_buffer_objects.c \
+ radeon_common_context.c \
+ radeon_common.c \
+ radeon_dma.c \
+ radeon_debug.c \
+ radeon_fbo.c \
+ radeon_fog.c \
+ radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
+ radeon_queryobj.c \
+ radeon_span.c \
+ radeon_texture.c \
+ radeon_tex_copy.c \
+ radeon_tile.c \
+ radeon_screen.c
+
+.for _f in ${R200_RADEON_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/${_f} r200_${_f}
+DRI_SOURCES.r200+= r200_${_f}
+.endfor
+
+.for _f in ${DRI_SOURCES.r200}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/r200/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/r200 \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon \
+ -DRADEON_R200
+.endfor
+
+DRI_SOURCES.radeon = \
+ radeon_buffer_objects.c \
+ radeon_common_context.c \
+ radeon_common.c \
+ radeon_dma.c \
+ radeon_debug.c \
+ radeon_fbo.c \
+ radeon_fog.c \
+ radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
+ radeon_queryobj.c \
+ radeon_span.c \
+ radeon_texture.c \
+ radeon_tex_copy.c \
+ radeon_tile.c \
+ radeon_context.c \
+ radeon_ioctl.c \
+ radeon_screen.c \
+ radeon_state.c \
+ radeon_state_init.c \
+ radeon_tex.c \
+ radeon_texstate.c \
+ radeon_tcl.c \
+ radeon_swtcl.c \
+ radeon_maos.c \
+ radeon_sanity.c \
+ radeon_blit.c
+
+.for _f in ${DRI_SOURCES.radeon}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/radeon \
+ -DRADEON_R100
+.endfor
+
+.for _d in ${DRI_SUBDIRS}
+SRCS+= ${DRI_SOURCES.${_d}}
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${_d}
+.endfor
+
+LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= glapi ${.CURDIR}/../libglapi.old
+LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+LIBDPLIBS+= drm_intel ${.CURDIR}/../libdrm_intel
+.endif
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+
+MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SRCS+= streaming-load-memcpy.c
+CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
+.endif
+
+.include "../driver.old.mk"
+
+.for _d in ${DRIVERS}
+SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
+.if ${MKDEBUG} != "no"
+SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
+.endif
+.endfor
+
+.endif
+
+PKGCONFIG= dri
+PKGDIST.dri= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
+PKGCONFIG_VERSION.dri= ${MESA_VER}
+
+# XXX remove these from bsd.x11.mk
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@DRI_DRIVER_INSTALL_DIR@,${X11USRLIBDIR}/modules/dri,; \
+ s,@DRI_PC_REQ_PRIV@,,"
+
+FILESDIR= /etc
+FILES= drirc
+
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
+
+.include <bsd.x11.mk>
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
+ -Wno-error=tautological-constant-out-of-range-compare
+
+COPTS.brw_state_batch.c += -Wno-stack-protector
+COPTS.brw_eu_compact.c += -Wno-stack-protector
+COPTS.brw_fs.cpp += -Wno-stack-protector
+COPTS.brw_fs_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_fs_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_program.c += -Wno-stack-protector
+COPTS.brw_schedule_instructions.cpp += -Wno-stack-protector
+COPTS.brw_vec4.cpp += -Wno-stack-protector
+COPTS.brw_vec4_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_vec4_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_vec4_visitor.cpp += -Wno-stack-protector
+
+.include <bsd.lib.mk>
+.else
+.include <bsd.inc.mk>
+.endif
+# Don't re-build .c files when .y files change
+.y.c:
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/gallium.old/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/gallium.old/Makefile Sun Mar 10 02:29:52 2019
@@ -0,0 +1,646 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+# Link the gallium mega driver.
+
+LIBISMODULE= yes
+LIBISCXX= yes
+
+.include <bsd.own.mk>
+
+SHLIB_MAJOR= 0
+
+LIB= gallium_dri
+DRIDIR= ${X11USRLIBDIR}/modules/dri
+DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
+
+CXXFLAGS+= -std=c++11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+
+GALLIUM_SUBDIRS= \
+ auxiliary \
+ auxiliary/cso_cache \
+ auxiliary/draw \
+ auxiliary/hud \
+ auxiliary/indices \
+ auxiliary/os \
+ auxiliary/pipebuffer \
+ auxiliary/postprocess \
+ auxiliary/rbug \
+ auxiliary/rtasm \
+ auxiliary/tgsi \
+ auxiliary/translate \
+ auxiliary/util \
+ auxiliary/vl \
+ drivers/galahad \
+ drivers/identity \
+ drivers/noop \
+ drivers/trace \
+ drivers/rbug \
+ drivers/softpipe \
+ winsys/sw/null \
+ winsys/sw/dri \
+ winsys/sw/kms-dri \
+ state_trackers/dri
+
+GALLIUM_SUBDIRS_ATI= \
+ drivers/radeon \
+ drivers/r600 \
+ drivers/r600/sb \
+ winsys/radeon/drm
+
+GALLIUM_SUBDIRS_NOUVEAU= \
+ drivers/nouveau \
+ drivers/nouveau/nv30 \
+ drivers/nouveau/nv50 \
+ drivers/nouveau/codegen \
+ drivers/nouveau/nvc0 \
+ winsys/nouveau/drm
+
+BUILD_RADEON=0
+BUILD_NOUVEAU=0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_RADEON=1
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+BUILD_NOUVEAU=1
+.endif
+
+DRIVERS= kms_swrast swrast
+.if ${BUILD_RADEON} == 1
+DRIVERS+= r600
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_ATI}
+.endif
+.if ${BUILD_NOUVEAU} == 1
+DRIVERS+= nouveau
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_NOUVEAU}
+.endif
+
+GALLIUM_SOURCES.auxiliary/cso_cache= \
+ cso_cache.c \
+ cso_context.c \
+ cso_hash.c
+GALLIUM_SOURCES.auxiliary/draw= \
+ draw_context.c \
+ draw_fs.c \
+ draw_gs.c \
+ draw_pipe.c \
+ draw_pipe_aaline.c \
+ draw_pipe_aapoint.c \
+ draw_pipe_clip.c \
+ draw_pipe_cull.c \
+ draw_pipe_flatshade.c \
+ draw_pipe_offset.c \
+ draw_pipe_pstipple.c \
+ draw_pipe_stipple.c \
+ draw_pipe_twoside.c \
+ draw_pipe_unfilled.c \
+ draw_pipe_util.c \
+ draw_pipe_validate.c \
+ draw_pipe_vbuf.c \
+ draw_pipe_wide_line.c \
+ draw_pipe_wide_point.c \
+ draw_prim_assembler.c \
+ draw_pt.c \
+ draw_pt_emit.c \
+ draw_pt_fetch.c \
+ draw_pt_fetch_emit.c \
+ draw_pt_fetch_shade_emit.c \
+ draw_pt_fetch_shade_pipeline.c \
+ draw_pt_post_vs.c \
+ draw_pt_so_emit.c \
+ draw_pt_util.c \
+ draw_pt_vsplit.c \
+ draw_vertex.c \
+ draw_vs.c \
+ draw_vs_exec.c \
+ draw_vs_variant.c
+GALLIUM_SOURCES.auxiliary/hud= \
+ font.c \
+ hud_context.c \
+ hud_cpu.c \
+ hud_fps.c \
+ hud_driver_query.c
+GALLIUM_SOURCES.auxiliary/indices= \
+ u_primconvert.c
+GALLIUM_SOURCES.auxiliary/os= \
+ os_misc.c \
+ os_process.c \
+ os_time.c
+GALLIUM_SOURCES.auxiliary/pipebuffer= \
+ pb_buffer_fenced.c \
+ pb_buffer_malloc.c \
+ pb_bufmgr_alt.c \
+ pb_bufmgr_cache.c \
+ pb_bufmgr_debug.c \
+ pb_bufmgr_mm.c \
+ pb_bufmgr_ondemand.c \
+ pb_bufmgr_pool.c \
+ pb_bufmgr_slab.c \
+ pb_validate.c
+GALLIUM_SOURCES.auxiliary/postprocess= \
+ pp_celshade.c \
+ pp_colors.c \
+ pp_init.c \
+ pp_mlaa.c \
+ pp_run.c \
+ pp_program.c
+GALLIUM_SOURCES.auxiliary/rbug= \
+ rbug_connection.c \
+ rbug_context.c \
+ rbug_core.c \
+ rbug_demarshal.c \
+ rbug_texture.c \
+ rbug_shader.c
+GALLIUM_SOURCES.auxiliary/rtasm= \
+ rtasm_cpu.c \
+ rtasm_execmem.c \
+ rtasm_x86sse.c
+GALLIUM_SOURCES.auxiliary/tgsi= \
+ tgsi_build.c \
+ tgsi_dump.c \
+ tgsi_exec.c \
+ tgsi_info.c \
+ tgsi_iterate.c \
+ tgsi_parse.c \
+ tgsi_sanity.c \
+ tgsi_scan.c \
+ tgsi_strings.c \
+ tgsi_text.c \
+ tgsi_transform.c \
+ tgsi_ureg.c \
+ tgsi_util.c
+GALLIUM_SOURCES.auxiliary/translate= \
+ translate.c \
+ translate_cache.c \
+ translate_generic.c \
+ translate_sse.c
+GALLIUM_SOURCES.auxiliary/util= \
+ u_debug.c \
+ u_debug_describe.c \
+ u_debug_flush.c \
+ u_debug_memory.c \
+ u_debug_refcnt.c \
+ u_debug_stack.c \
+ u_debug_symbol.c \
+ u_dump_defines.c \
+ u_dump_state.c \
+ u_bitmask.c \
+ u_blit.c \
+ u_blitter.c \
+ u_cache.c \
+ u_caps.c \
+ u_cpu_detect.c \
+ u_dl.c \
+ u_draw.c \
+ u_draw_quad.c \
+ u_format.c \
+ u_format_other.c \
+ u_format_latc.c \
+ u_format_s3tc.c \
+ u_format_rgtc.c \
+ u_format_etc.c \
+ u_format_bptc.c \
+ u_format_tests.c \
+ u_format_yuv.c \
+ u_format_zs.c \
+ u_framebuffer.c \
+ u_gen_mipmap.c \
+ u_handle_table.c \
+ u_hash.c \
+ u_hash_table.c \
+ u_helpers.c \
+ u_index_modify.c \
+ u_keymap.c \
+ u_linear.c \
+ u_linkage.c \
+ u_network.c \
+ u_math.c \
+ u_mm.c \
+ u_pstipple.c \
+ u_ringbuffer.c \
+ u_sampler.c \
+ u_simple_shaders.c \
+ u_slab.c \
+ u_snprintf.c \
+ u_staging.c \
+ u_suballoc.c \
+ u_surface.c \
+ u_surfaces.c \
+ u_texture.c \
+ u_tile.c \
+ u_transfer.c \
+ u_resource.c \
+ u_upload_mgr.c \
+ u_vbuf.c
+GALLIUM_SOURCES.auxiliary/vl= \
+ vl_csc.c \
+ vl_compositor.c \
+ vl_matrix_filter.c \
+ vl_median_filter.c \
+ vl_decoder.c \
+ vl_mpeg12_decoder.c \
+ vl_mpeg12_bitstream.c \
+ vl_zscan.c \
+ vl_idct.c \
+ vl_mc.c \
+ vl_vertex_buffers.c \
+ vl_video_buffer.c \
+ vl_deint_filter.c
+
+# Generated
+.PATH: ${X11SRCDIR.Mesa}/../src/gallium/auxiliary
+GALLIUM_SOURCES.auxiliary= \
+ u_indices_gen.c \
+ u_unfilled_gen.c \
+ u_format_table.c
+.for _f in ${GALLIUM_SOURCES.auxiliary}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
+.endfor
+
+GALLIUM_SOURCES.drivers/galahad= \
+ glhd_objects.c \
+ glhd_context.c \
+ glhd_screen.c
+
+GALLIUM_SOURCES.drivers/identity = \
+ id_objects.c \
+ id_context.c \
+ id_screen.c
+
+GALLIUM_SOURCES.drivers/noop = \
+ noop_pipe.c \
+ noop_state.c
+
+GALLIUM_SOURCES.drivers/trace = \
+ tr_context.c \
+ tr_dump.c \
+ tr_dump_state.c \
+ tr_screen.c \
+ tr_texture.c
+
+GALLIUM_SOURCES.drivers/rbug = \
+ DRIVERrbug_core.c \
+ DRIVERrbug_context.c \
+ rbug_objects.c \
+ rbug_screen.c
+# Conflicts with auxiliary/rbug/ files
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/rbug/rbug_core.c DRIVERrbug_core.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/gallium/drivers/rbug/rbug_context.c DRIVERrbug_context.c
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers/rbug
+CPPFLAGS.DRIVERrbug_core.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers/rbug
+CPPFLAGS.DRIVERrbug_context.c+= -I${X11SRCDIR.Mesa}/src/gallium/drivers
+
+GALLIUM_SOURCES.drivers/radeon = \
+ cayman_msaa.c \
+ r600_buffer_common.c \
+ r600_pipe_common.c \
+ r600_query.c \
+ r600_streamout.c \
+ r600_texture.c \
+ radeon_video.c \
+ radeon_uvd.c \
+ radeon_vce.c \
+ radeon_vce_40_2_2.c
+#LLVM_C_FILES := \
+# radeon_elf_util.c \
+# radeon_setup_tgsi_llvm.c \
+# radeon_llvm_emit.c \
+# radeon_llvm_util.c
+
+GALLIUM_SOURCES.drivers/r600 = \
+ r600_asm.c \
+ r600_blit.c \
+ r600_hw_context.c \
+ r600_isa.c \
+ r600_pipe.c \
+ r600_shader.c \
+ r600_state.c \
+ r700_asm.c \
+ evergreen_hw_context.c \
+ evergreen_state.c \
+ eg_asm.c \
+ r600_state_common.c \
+ evergreen_compute.c \
+ compute_memory_pool.c \
+ r600_uvd.c
+GALLIUM_SOURCES.drivers/r600/sb = \
+ sb_bc_builder.cpp \
+ sb_bc_decoder.cpp \
+ sb_bc_dump.cpp \
+ sb_bc_finalize.cpp \
+ sb_bc_parser.cpp \
+ sb_context.cpp \
+ sb_core.cpp \
+ sb_dce_cleanup.cpp \
+ sb_def_use.cpp \
+ sb_dump.cpp \
+ sb_expr.cpp \
+ sb_gcm.cpp \
+ sb_gvn.cpp \
+ sb_if_conversion.cpp \
+ sb_ir.cpp \
+ sb_liveness.cpp \
+ sb_pass.cpp \
+ sb_peephole.cpp \
+ sb_psi_ops.cpp \
+ sb_ra_checker.cpp \
+ sb_ra_coalesce.cpp \
+ sb_ra_init.cpp \
+ sb_sched.cpp \
+ sb_shader.cpp \
+ sb_ssa_builder.cpp \
+ sb_valtable.cpp
+#LLVM_C_SOURCES = r600_llvm.c
+
+.for _f in ${GALLIUM_SOURCES.drivers/r600} ${GALLIUM_SOURCES.drivers/r600/sb}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/r600
+.endfor
+
+GALLIUM_SOURCES.drivers/nouveau = \
+ nouveau_screen.c \
+ nouveau_fence.c \
+ nouveau_mm.c \
+ nouveau_buffer.c \
+ nouveau_heap.c \
+ nouveau_video.c \
+ nouveau_vp3_video.c \
+ nouveau_vp3_video_bsp.c \
+ nouveau_vp3_video_vp.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv30 = \
+ nv30_screen.c \
+ nv30_context.c \
+ nv30_format.c \
+ nv30_resource.c \
+ nv30_transfer.c \
+ nv30_miptree.c \
+ nv30_state.c \
+ nv30_state_validate.c \
+ nv30_texture.c \
+ nv30_fragtex.c \
+ nv40_verttex.c \
+ nv30_fragprog.c \
+ nv30_vertprog.c \
+ nv30_clear.c \
+ nv30_vbo.c \
+ nv30_push.c \
+ nv30_draw.c \
+ nv30_query.c \
+ nvfx_vertprog.c \
+ nvfx_fragprog.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv50 = \
+ nv50_context.c \
+ nv50_formats.c \
+ nv50_miptree.c \
+ nv50_resource.c \
+ nv50_screen.c \
+ nv50_state.c \
+ nv50_state_validate.c \
+ nv50_surface.c \
+ nv50_tex.c \
+ nv50_transfer.c \
+ nv50_vbo.c \
+ nv50_program.c \
+ nv50_shader_state.c \
+ nv50_push.c \
+ nv50_query.c \
+ nv84_video.c \
+ nv84_video_bsp.c \
+ nv84_video_vp.c \
+ nv98_video.c \
+ nv98_video_bsp.c \
+ nv98_video_vp.c \
+ nv98_video_ppp.c
+
+GALLIUM_SOURCES.drivers/nouveau/codegen = \
+ nv50_ir.cpp \
+ nv50_ir_bb.cpp \
+ nv50_ir_build_util.cpp \
+ nv50_ir_emit_nv50.cpp \
+ nv50_ir_from_tgsi.cpp \
+ nv50_ir_graph.cpp \
+ nv50_ir_lowering_nv50.cpp \
+ nv50_ir_peephole.cpp \
+ nv50_ir_print.cpp \
+ nv50_ir_ra.cpp \
+ nv50_ir_ssa.cpp \
+ nv50_ir_target.cpp \
+ nv50_ir_target_nv50.cpp \
+ nv50_ir_util.cpp \
+ nv50_ir_emit_nvc0.cpp \
+ nv50_ir_emit_gk110.cpp \
+ nv50_ir_emit_gm107.cpp \
+ nv50_ir_lowering_nvc0.cpp \
+ nv50_ir_lowering_gm107.cpp \
+ nv50_ir_target_nvc0.cpp \
+ nv50_ir_target_gm107.cpp
+
+GALLIUM_SOURCES.drivers/nouveau/nvc0 = \
+ nvc0_compute.c \
+ nvc0_context.c \
+ nvc0_formats.c \
+ nvc0_miptree.c \
+ nvc0_resource.c \
+ nvc0_screen.c \
+ nvc0_state.c \
+ nvc0_state_validate.c \
+ nvc0_surface.c \
+ nvc0_tex.c \
+ nvc0_transfer.c \
+ nvc0_vbo.c \
+ nvc0_vbo_translate.c \
+ nvc0_program.c \
+ nvc0_shader_state.c \
+ nvc0_query.c \
+ nve4_compute.c \
+ nvc0_video.c \
+ nvc0_video_bsp.c \
+ nvc0_video_vp.c \
+ nvc0_video_ppp.c
+
+.for _f in ${GALLIUM_SOURCES.drivers/nouveau} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nv30} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nv50} \
+ ${GALLIUM_SOURCES.drivers/nouveau/codegen} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nvc0}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/drivers/nouveau
+.endfor
+
+
+GALLIUM_SOURCES.winsys/radeon/drm = \
+ radeon_drm_bo.c \
+ radeon_drm_cs.c \
+ radeon_drm_cs_dump.c \
+ radeon_drm_winsys.c
+
+GALLIUM_SOURCES.winsys/nouveau/drm = \
+ nouveau_drm_winsys.c
+
+GALLIUM_SOURCES.drivers/softpipe = \
+ sp_fs_exec.c \
+ sp_clear.c \
+ sp_fence.c \
+ sp_flush.c \
+ sp_query.c \
+ sp_context.c \
+ sp_draw_arrays.c \
+ sp_prim_vbuf.c \
+ sp_quad_pipe.c \
+ sp_quad_stipple.c \
+ sp_quad_depth_test.c \
+ sp_quad_fs.c \
+ sp_quad_blend.c \
+ sp_screen.c \
+ sp_setup.c \
+ sp_state_blend.c \
+ sp_state_clip.c \
+ sp_state_derived.c \
+ sp_state_sampler.c \
+ sp_state_shader.c \
+ sp_state_so.c \
+ sp_state_rasterizer.c \
+ sp_state_surface.c \
+ sp_state_vertex.c \
+ sp_texture.c \
+ sp_tex_sample.c \
+ sp_tex_tile_cache.c \
+ sp_tile_cache.c \
+ sp_surface.c
+
+GALLIUM_SOURCES.winsys/sw/null = \
+ null_sw_winsys.c
+
+GALLIUM_SOURCES.winsys/sw/dri = \
+ dri_sw_winsys.c
+
+GALLIUM_SOURCES.winsys/sw/kms-dri = \
+ kms_dri_sw_winsys.c
+
+GALLIUM_SOURCES.state_trackers/dri = \
+ dri_context.c \
+ dri_drawable.c \
+ dri_query_renderer.c \
+ dri_screen.c \
+ drisw.c \
+ dri2.c
+.for _f in ${GALLIUM_SOURCES.state_trackers/dri}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri/common
+.endfor
+
+# missing
+CPPFLAGS+= \
+ -DGALLIUM_SOFTPIPE \
+ -DGALLIUM_STATIC_TARGETS=1 \
+ -DMESA_EGL_NO_X11_HEADERS
+
+.for _d in ${GALLIUM_SUBDIRS}
+SRCS+= ${GALLIUM_SOURCES.${_d}}
+.PATH: ${X11SRCDIR.Mesa}/src/gallium/${_d}
+.endfor
+
+#. if defined(${GALLIUM_SOURCES.${_d}})
+#SRCS+= ${GALLIUM_SOURCES.${_d}}
+#. endif
+
+.include "../libloader.old.mk"
+
+.if ${BUILD_RADEON} == 1
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
+.endif
+
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
+LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+.if ${BUILD_RADEON} == 1
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+.endif # ${BUILD_RADEON} == 1
+.if ${BUILD_NOUVEAU} == 1
+LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
+.endif # ${BUILD_NOUVEAU} == 1
+.endif # ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
+LIBDPLIBS+= glapi ${.CURDIR}/../libglapi.old
+LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
+
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+
+## build mesagallium parts
+MESA_SRC_MODULES= main math vbo state_tracker program asm_s
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
+
+# Special addition for just gallium; it misses the rest of asm_c files.
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
+SRCS+= common_x86.c
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+SRCS+= streaming-load-memcpy.c
+CFLAGS.streaming-load-memcpy.c+= -msse4.1
+.endif
+
+.include "../driver.old.mk"
+
+
+.PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
+SRCS+= target.c
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.Mesa}/src/gallium/include \
+ -I${X11SRCDIR.Mesa}/src/gallium/auxiliary \
+ -I${X11SRCDIR.Mesa}/src/gallium/drivers \
+ -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common
+
+CPPFLAGS.target.c += \
+ -DDRI_TARGET \
+ -DGALLIUM_GALAHAD \
+ -DGALLIUM_NOOP \
+ -DGALLIUM_RBUG \
+ -DGALLIUM_TRACE \
+ -DGALLIUM_SOFTPIPE \
+ -I${X11SRCDIR.Mesa}/src/gallium/state_trackers/dri \
+ -I${X11SRCDIR.Mesa}/src/loader \
+ -I${X11SRCDIR.Mesa}/src/gallium/winsys
+
+.if ${BUILD_RADEON} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_R200 \
+ -DGALLIUM_R600
+.endif # ${BUILD_RADEON} == 1
+
+.if ${BUILD_NOUVEAU} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_NOUVEAU
+.endif # ${BUILD_NOUVEAU} == 1
+
+CWARNFLAGS.clang+= -Wno-error=constant-conversion \
+ -Wno-error=tautological-constant-out-of-range-compare \
+ -Wno-error=pointer-sign \
+ -Wno-error=switch \
+ -Wno-error=absolute-value \
+ -Wno-error=tautological-compare \
+ -Wno-error=static-in-inline \
+ -Wno-error=logical-not-parentheses
+
+.include <bsd.x11.mk>
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+.for _d in ${DRIVERS}
+SYMLINKS+= gallium_dri.so ${DRIDIR}/${_d}_dri.so
+SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+.if ${MKDEBUG} != "no"
+SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
+.endif
+.endfor
+
+.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+.endif
+
+.include <bsd.lib.mk>
+# Don't regenerate c files
+.y.c:
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libGL.old/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libGL.old/Makefile Sun Mar 10 02:29:52 2019
@@ -0,0 +1,184 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= GL
+LIBISCXX= yes
+
+SUBDIR= internal
+
+# glx
+.PATH: ${X11SRCDIR.Mesa}/src/glx
+SRCS.glx= \
+ clientattrib.c \
+ clientinfo.c \
+ compsize.c \
+ create_context.c \
+ eval.c \
+ glxconfig.c \
+ glxcmds.c \
+ glxcurrent.c \
+ glx_error.c \
+ glxext.c \
+ glxextensions.c \
+ indirect_glx.c \
+ MESAindirect.c \
+ MESAindirect_init.c \
+ MESAindirect_size.c \
+ MESAindirect_window_pos.c \
+ indirect_texture_compression.c \
+ indirect_transpose_matrix.c \
+ indirect_vertex_array.c \
+ indirect_vertex_program.c \
+ pixel.c \
+ pixelstore.c \
+ query_renderer.c \
+ render2.c \
+ renderpix.c \
+ single2.c \
+ singlepix.c \
+ vertarr.c \
+ glx_pbuffer.c \
+ glx_query.c \
+ glxhash.c
+
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect.c MESAindirect.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_init.c MESAindirect_init.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/../src/mapi/glapi/indirect_size.c MESAindirect_size.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/glx/indirect_window_pos.c MESAindirect_window_pos.c
+
+.for _f in ${SRCS.glx}
+CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/../src/mapi/glapi -DGLX_SHARED_GLAPI
+.endfor
+
+# glapi
+.PATH: ${X11SRCDIR.Mesa}/src/mapi
+.PATH: ${X11SRCDIR.Mesa}/../src/mapi/glapi
+SRCS.glapi= \
+ entry.c \
+ glapi_gentable.c
+.for _f in ${SRCS.glapi}
+CPPFLAGS.${_f}= -DMAPI_MODE_BRIDGE \
+ -DMAPI_ABI_HEADER=\"glapi_glapi_mapi_tmp.h\" \
+ -I${X11SRCDIR.Mesa}/src/mesa
+.endfor
+
+
+# XXX see TODO
+#.if ${MACHINE_ARCH} == "i386"
+#.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
+#SRCS.glx+= glapi_x86.S
+#CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.Mesa}/src/mesa/x86
+## -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#.endif
+
+
+.if ${X11DRI} != "no"
+# dri
+SRCS.dri= \
+ drisw_glx.c \
+ xfont.c \
+ dri_common.c \
+ dri_glx.c \
+ XF86dri.c \
+ dri2_glx.c \
+ dri2.c \
+ dri2_query_renderer.c
+.for fn in ${SRCS.dri}
+CPPFLAGS.${fn}=-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\"
+.endfor
+.endif
+
+.include "../libloader.old.mk"
+
+.PATH: ${X11SRCDIR.Mesa}/src/glw
+.PATH: ${X11SRCDIR.Mesa}/include/GL
+.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/x11
+INCS= gl.h gl_mangle.h glcorearb.h glext.h \
+ glx.h glx_mangle.h glxext.h \
+ osmesa.h wglext.h wmesa.h
+INCSDIR=${X11INCDIR}/GL
+
+
+SRCS+= ${SRCS.dri} ${SRCS.glx} ${SRCS.glapi}
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/include/GL/internal \
+ -I${X11SRCDIR.Mesa}/src/loader \
+ -I${X11SRCDIR.Mesa}/src/mapi \
+ -I${X11SRCDIR.Mesa}/src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/src/glx \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${DESTDIR}${X11INCDIR}/GL \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB}
+
+# -D_NETBSD_SOURCE \
+
+# old
+CPPFLAGS+= -D__GLX_ALIGN64 \
+ -DXF86VIDMODE \
+ -DGLX_SHARED_GLAPI
+
+# new
+CPPFLAGS+= \
+ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
+ -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
+ -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
+ -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE___BUILTIN_BSWAP32=1 \
+ -DHAVE___BUILTIN_BSWAP64=1 -DHAVE_DLADDR=1 -DHAVE_CLOCK_GETTIME=1 \
+ -DHAVE_POSIX_MEMALIGN -DHAVE_PTHREAD=1 -DHAVE_DLOPEN
+
+.include "../asm.mk"
+
+CPPFLAGS+= \
+ -DHAVE_LIBDRM -DGLX_USE_DRM \
+ -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING \
+ -DHAVE_ALIAS -DMESA_EGL_NO_X11_HEADERS
+
+CPPFLAGS+= \
+ -DUSE_EXTERNAL_DXTN_LIB=1 \
+ -DYYTEXT_POINTER=1
+
+CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
+CFLAGS+= -pthread
+
+LIBDPLIBS= Xext ${.CURDIR}/../libXext \
+ X11 ${.CURDIR}/../libX11/dynamic \
+ Xxf86vm ${.CURDIR}/../libXxf86vm \
+ Xfixes ${.CURDIR}/../libXfixes \
+ Xdamage ${.CURDIR}/../libXdamage \
+ glapi ${.CURDIR}/../libglapi.old \
+ drm ${.CURDIR}/../libdrm \
+ X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
+ xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
+ xcb-glx ${.CURDIR}/../libxcb/glx \
+ expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
+ m ${NETBSDSRCDIR}/lib/libm
+
+MKLINT=no
+
+PKGCONFIG= gl
+PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
+PKGCONFIG_VERSION.gl= ${MESA_VER}
+
+# XXX remove these from bsd.x11.mk
+# XXX enable GLX TLS? it's enabled in the code, but not here..
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@GL_PC_REQ_PRIV@,x11 xext,; \
+ s,@GL_LIB@,GL,; \
+ s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+ s,@GL_PC_CFLAGS@,,; \
+ s,@GLX_TLS@,no,"
+
+
+CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/libGL.old/mesa-ver.mk
diff -u /dev/null src/external/mit/xorg/lib/libGL.old/mesa-ver.mk:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libGL.old/mesa-ver.mk Sun Mar 10 02:29:52 2019
@@ -0,0 +1,3 @@
+# $NetBSD: mesa-ver.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+MESA_VER= 10.3.5
Index: src/external/mit/xorg/lib/libGL.old/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libGL.old/shlib_version:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libGL.old/shlib_version Sun Mar 10 02:29:52 2019
@@ -0,0 +1,5 @@
+# $NetBSD: shlib_version,v 1.1 2019/03/10 02:29:52 mrg Exp $
+#
+# XXX netbsd-4 has major=1 minor=2
+major=3
+minor=0
Index: src/external/mit/xorg/lib/libGL.old/internal/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libGL.old/internal/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libGL.old/internal/Makefile Sun Mar 10 02:29:52 2019
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.Mesa}/include/GL/internal
+
+INCS= dri_interface.h
+INCSDIR=${X11INCDIR}/GL/internal
+
+NOOBJ= # defined
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/libgbm.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libgbm.old/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libgbm.old/Makefile Sun Mar 10 02:29:53 2019
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:53 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= gbm
+
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
+SRCS.main= \
+ backend.c \
+ gbm.c
+
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri
+SRCS.dri= \
+ gbm_dri.c
+
+SRCS= ${SRCS.main} ${SRCS.dri}
+
+CPPFLAGS+= -D_OS_UNIX=1
+CPPFLAGS+= -DHAVE_PTHREAD=1
+CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\"
+CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/gbm\"
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/include
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/loader
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gbm/main
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CFLAGS+= -fno-strict-aliasing -fexceptions
+
+COPTS.gbm_dri.c+= -Wno-error
+
+.include "../libloader.old.mk"
+
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
+INCS= gbm.h
+INCSDIR= ${X11INCDIR}
+
+LIBDPLIBS= glapi ${.CURDIR}/../libglapi.old
+LIBDPLIBS= drm ${.CURDIR}/../libdrm
+
+PKGCONFIG= gbm
+PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
+PKGCONFIG_VERSION.gbm= ${MESA_VER}
+
+.include "../libdrm/Makefile.defines"
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libgbm.old/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libgbm.old/shlib_version:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libgbm.old/shlib_version Sun Mar 10 02:29:53 2019
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2019/03/10 02:29:53 mrg Exp $
+#
+major=1
+minor=0
Index: src/external/mit/xorg/lib/libglapi.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libglapi.old/Makefile:1.1
--- /dev/null Sun Mar 10 02:29:54 2019
+++ src/external/mit/xorg/lib/libglapi.old/Makefile Sun Mar 10 02:29:53 2019
@@ -0,0 +1,101 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:53 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= glapi
+LIBISCXX= yes
+
+SHLIB_MAJOR= 1
+SHLIB_MINOR= 0
+
+# util
+.PATH: ${X11SRCDIR.Mesa}/src/util
+SRCS.util= \
+ hash_table.c \
+ ralloc.c
+.PATH: ${X11SRCDIR.Mesa}/../src/util
+SRCS.util+= \
+ format_srgb.c
+
+# mapi
+.PATH: ${X11SRCDIR.Mesa}/src/mapi
+SRCS.mapi= \
+ entry.c \
+ mapi_glapi.c \
+ stub.c \
+ table.c \
+ u_current.c \
+ u_execmem.c
+CPPFLAGS.entry.c= -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
+
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mapi/entry.c shared_entry.c
+
+# above is shared/libglapi.la
+
+SRCS+= ${SRCS.util} ${SRCS.mapi} ${SRCS.mapi-glapi}
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.Mesa}/include \
+ -I${X11SRCDIR.Mesa}/src/mapi \
+ -I${X11SRCDIR.Mesa}/src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/src/mesa \
+ -I${X11SRCDIR.Mesa}/src/util \
+ -I${X11SRCDIR.Mesa}/../src/mapi \
+ -I${X11SRCDIR.Mesa}/../src/mapi/glapi \
+ -I${X11SRCDIR.Mesa}/../src/mesa
+
+CPPFLAGS+= \
+ -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB}
+
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
+
+CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread -fno-builtin-memcmp
+
+CPPFLAGS+= \
+ -DPACKAGE_NAME=\"Mesa\" \
+ -DPACKAGE_TARNAME=\"mesa\" \
+ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"; \
+ -DPACKAGE_VERSION=\"${MESA_VER}\" \
+ -DPACKAGE_STRING=\"Mesa\ ${MESA_VER}\" \
+ -DVERSION=\"${MESA_VER}\" \
+ -DPACKAGE_URL=\"\" \
+ -DPACKAGE=\"mesa\" \
+ -DSTDC_HEADERS=1 \
+ -DHAVE_SYS_TYPES_H=1 \
+ -DHAVE_SYS_STAT_H=1 \
+ -DHAVE_STDLIB_H=1 \
+ -DHAVE_STRING_H=1 \
+ -DHAVE_MEMORY_H=1 \
+ -DHAVE_STRINGS_H=1 \
+ -DHAVE_INTTYPES_H=1 \
+ -DHAVE_STDINT_H=1 \
+ -DHAVE_UNISTD_H=1 \
+ -DHAVE_DLFCN_H=1 \
+ -DYYTEXT_POINTER=1 \
+ -DHAVE___BUILTIN_BSWAP32=1 \
+ -DHAVE___BUILTIN_BSWAP64=1 \
+ -DHAVE_DLADDR=1 \
+ -DHAVE_CLOCK_GETTIME=1 \
+ -DHAVE_PTHREAD=1 \
+ -I. \
+ -DUSE_EXTERNAL_DXTN_LIB=1 \
+ -DHAVE_DLOPEN \
+ -DHAVE_POSIX_MEMALIGN \
+ -DHAVE_LIBDRM \
+ -DGLX_USE_DRM \
+ -DGLX_INDIRECT_RENDERING \
+ -DGLX_DIRECT_RENDERING \
+ -DHAVE_PTHREAD \
+ -DHAVE_ALIAS \
+ -DMESA_EGL_NO_X11_HEADERS
+
+.include "../asm.mk"
+
+MKLINT=no
+
+#CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
