Module Name: src
Committed By: mrg
Date: Thu Dec 18 06:24:30 UTC 2014
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: md.amd64 md.i386 md.macppc md.ofppc
md.sparc md.sparc64 mi shl.mi
src/distrib/sets/lists/xetc: mi
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.i386
md.macppc md.ofppc md.prep md.sparc md.sparc64 mi
src/external/mit/xorg/bin/glxgears: Makefile
src/external/mit/xorg/bin/glxinfo: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libGL/internal: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
Added Files:
src/external/mit/xorg/lib: asm.mk driver.mk libglsl.mk libloader.mk
libmesa.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libglapi: Makefile
Removed Files:
src/external/mit/xorg: TODO
src/external/mit/xorg/lib/dri: dri.mk
src/external/mit/xorg/lib/dri/i810: Makefile
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/mach64: Makefile
src/external/mit/xorg/lib/dri/mga: Makefile
src/external/mit/xorg/lib/dri/r128: Makefile
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/dri/radeon: Makefile
src/external/mit/xorg/lib/dri/s3v: Makefile
src/external/mit/xorg/lib/dri/savage: Makefile
src/external/mit/xorg/lib/dri/sis: Makefile
src/external/mit/xorg/lib/dri/swrast: Makefile
src/external/mit/xorg/lib/dri/tdfx: Makefile
src/external/mit/xorg/lib/dri/trident: Makefile
src/external/mit/xorg/lib/dri/unichrome: Makefile
src/external/mit/xorg/lib/libGL: Makefile.glslsrcs Makefile.mesa
src/external/mit/xorg/lib/libOSMesa: Makefile libmesa.mk shlib_version
Log Message:
update sets and reachover makefiles for mesa 10.3.5.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xdebug/md.amd64 \
src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.macppc \
src/distrib/sets/lists/xdebug/md.ofppc \
src/distrib/sets/lists/xdebug/md.sparc64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/md.sparc
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xserver/md.prep
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xserver/mi
cvs rdiff -u -r1.18 -r0 src/external/mit/xorg/TODO
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/glxgears/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/glxinfo/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/asm.mk \
src/external/mit/xorg/lib/driver.mk src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libloader.mk \
src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.13 -r0 src/external/mit/xorg/lib/dri/dri.mk
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/i810/Makefile
cvs rdiff -u -r1.12 -r0 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.16 -r0 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.14 -r0 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/mach64/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/mga/Makefile
cvs rdiff -u -r1.5 -r0 src/external/mit/xorg/lib/dri/r128/Makefile
cvs rdiff -u -r1.10 -r0 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.10 -r0 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.7 -r0 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.9 -r0 src/external/mit/xorg/lib/dri/radeon/Makefile
cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/lib/dri/s3v/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/savage/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/sis/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/dri/swrast/Makefile
cvs rdiff -u -r1.5 -r0 src/external/mit/xorg/lib/dri/tdfx/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/dri/trident/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/dri/unichrome/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libGL/Makefile.glslsrcs
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/lib/libGL/Makefile.mesa
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL/internal/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.9 -r0 src/external/mit/xorg/lib/libOSMesa/Makefile \
src/external/mit/xorg/lib/libOSMesa/libmesa.mk
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libOSMesa/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libglapi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.56 src/distrib/sets/lists/xbase/shl.mi:1.57
--- src/distrib/sets/lists/xbase/shl.mi:1.56 Wed Oct 1 09:30:58 2014
+++ src/distrib/sets/lists/xbase/shl.mi Thu Dec 18 06:24:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.56 2014/10/01 09:30:58 skrll Exp $
+# $NetBSD: shl.mi,v 1.57 2014/12/18 06:24:27 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -180,9 +180,12 @@
./usr/X11R7/lib/libICE.so -unknown- xorg
./usr/X11R7/lib/libICE.so.7 -unknown- xorg
./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libOSMesa.so -unknown- xorg
-./usr/X11R7/lib/libOSMesa.so.7 -unknown- xorg
-./usr/X11R7/lib/libOSMesa.so.7.0 -unknown- xorg
+./usr/X11R7/lib/libglapi.so -unknown- xorg
+./usr/X11R7/lib/libglapi.so.0 -unknown- xorg
+./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libOSMesa.so -unknown- obsolete
+./usr/X11R7/lib/libOSMesa.so.7 -unknown- obsolete
+./usr/X11R7/lib/libOSMesa.so.7.0 -unknown- obsolete
./usr/X11R7/lib/libSM.so -unknown- xorg
./usr/X11R7/lib/libSM.so.7 -unknown- xorg
./usr/X11R7/lib/libSM.so.7.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.153 src/distrib/sets/lists/xcomp/mi:1.154
--- src/distrib/sets/lists/xcomp/mi:1.153 Wed Nov 5 14:30:00 2014
+++ src/distrib/sets/lists/xcomp/mi Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.153 2014/11/05 14:30:00 prlw1 Exp $
+# $NetBSD: mi,v 1.154 2014/12/18 06:24:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5129,6 +5129,7 @@
./usr/X11R7/include/GL/GLwMDrawAP.h -unknown- xorg
./usr/X11R7/include/GL/gl.h -unknown- xorg
./usr/X11R7/include/GL/gl_mangle.h -unknown- xorg
+./usr/X11R7/include/GL/glcorearb.h -unknown- xorg
./usr/X11R7/include/GL/glext.h -unknown- xorg
./usr/X11R7/include/GL/glu.h -unknown- xorg
./usr/X11R7/include/GL/glu_mangle.h -unknown- xorg
@@ -5143,11 +5144,13 @@
./usr/X11R7/include/GL/glxtokens.h -unknown- xorg
./usr/X11R7/include/GL/internal/dri_interface.h -unknown- xorg
./usr/X11R7/include/GL/internal/glcore.h -unknown- xorg
-./usr/X11R7/include/GL/internal/sarea.h -unknown- xorg
+./usr/X11R7/include/GL/internal/sarea.h -unknown- obsolete
./usr/X11R7/include/GL/osmesa.h -unknown- xorg
-./usr/X11R7/include/GL/xmesa.h -unknown- xorg
-./usr/X11R7/include/GL/xmesa_x.h -unknown- xorg
-./usr/X11R7/include/GL/xmesa_xf86.h -unknown- xorg
+./usr/X11R7/include/GL/wglext.h -unknown- xorg
+./usr/X11R7/include/GL/wmesa.h -unknown- xorg
+./usr/X11R7/include/GL/xmesa.h -unknown- obsolete
+./usr/X11R7/include/GL/xmesa_x.h -unknown- obsolete
+./usr/X11R7/include/GL/xmesa_xf86.h -unknown- obsolete
./usr/X11R7/include/X11/CallbackI.h -unknown- xorg
./usr/X11R7/include/X11/Composite.h -unknown- xorg
./usr/X11R7/include/X11/CompositeP.h -unknown- xorg
@@ -6162,8 +6165,10 @@
./usr/X11R7/lib/libGLw_p.a -unknown- profile,xorg
./usr/X11R7/lib/libICE.a -unknown- xorg
./usr/X11R7/lib/libICE_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libOSMesa.a -unknown- xorg
-./usr/X11R7/lib/libOSMesa_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libOSMesa.a -unknown- obsolete
+./usr/X11R7/lib/libOSMesa_p.a -unknown- obsolete
+./usr/X11R7/lib/libglapi.a -unknown- xorg
+./usr/X11R7/lib/libglapi_p.a -unknown- xorg
./usr/X11R7/lib/libSM.a -unknown- xorg
./usr/X11R7/lib/libSM_p.a -unknown- profile,xorg
./usr/X11R7/lib/libX11-xcb.a -unknown- xorg
@@ -9236,7 +9241,7 @@
./usr/libdata/lint/llib-lGLw.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lICE.ln -unknown- lint,x11
./usr/libdata/lint/llib-lICE.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-lOSMesa.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lOSMesa.ln -unknown- obsolete
./usr/libdata/lint/llib-lSM.ln -unknown- lint,x11
./usr/libdata/lint/llib-lSM.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lX11.ln -unknown- lint,x11
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.37 src/distrib/sets/lists/xcomp/shl.mi:1.38
--- src/distrib/sets/lists/xcomp/shl.mi:1.37 Mon Mar 17 07:25:34 2014
+++ src/distrib/sets/lists/xcomp/shl.mi Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.37 2014/03/17 07:25:34 mrg Exp $
+# $NetBSD: shl.mi,v 1.38 2014/12/18 06:24:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -52,7 +52,8 @@
./usr/X11R7/lib/libGL_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libGLw_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libICE_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libOSMesa_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libOSMesa_pic.a -unknown- obsolete
+./usr/X11R7/lib/libglapi_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libSM_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libX11-xcb_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libX11_pic.a -unknown- xorg,picinstall
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.6 src/distrib/sets/lists/xdebug/md.amd64:1.7
--- src/distrib/sets/lists/xdebug/md.amd64:1.6 Thu Apr 3 02:51:19 2014
+++ src/distrib/sets/lists/xdebug/md.amd64 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.6 2014/04/03 02:51:19 riastradh Exp $
+# $NetBSD: md.amd64,v 1.7 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -46,9 +46,10 @@
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug obsolete xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi810_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi915_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi965_dri.so.0.debug obsolete xorg,obsolete
@@ -65,19 +66,20 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtdfx_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtrident_dri.so.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libunichrome_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug -unknown- obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/sis_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/sis_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug -unknown- obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.6 src/distrib/sets/lists/xdebug/md.i386:1.7
--- src/distrib/sets/lists/xdebug/md.i386:1.6 Thu Apr 3 02:51:19 2014
+++ src/distrib/sets/lists/xdebug/md.i386 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.6 2014/04/03 02:51:19 riastradh Exp $
+# $NetBSD: md.i386,v 1.7 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -92,7 +92,7 @@
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi810_dri.so.0.debug obsolete xorg,obsolete
@@ -111,17 +111,18 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtdfx_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtrident_dri.so.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libunichrome_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug -unknown- obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/sis_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/sis_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.3 src/distrib/sets/lists/xdebug/md.macppc:1.4
--- src/distrib/sets/lists/xdebug/md.macppc:1.3 Fri Feb 8 15:13:04 2013
+++ src/distrib/sets/lists/xdebug/md.macppc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.3 2013/02/08 15:13:04 christos Exp $
+# $NetBSD: md.macppc,v 1.4 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
@@ -56,14 +56,14 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtdfx_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.3 src/distrib/sets/lists/xdebug/md.ofppc:1.4
--- src/distrib/sets/lists/xdebug/md.ofppc:1.3 Fri Feb 8 15:13:04 2013
+++ src/distrib/sets/lists/xdebug/md.ofppc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.3 2013/02/08 15:13:04 christos Exp $
+# $NetBSD: md.ofppc,v 1.4 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg
@@ -38,14 +38,14 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libtdfx_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- obsolete,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- obsolete,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- debug,xorg
Index: src/distrib/sets/lists/xdebug/md.sparc64
diff -u src/distrib/sets/lists/xdebug/md.sparc64:1.3 src/distrib/sets/lists/xdebug/md.sparc64:1.4
--- src/distrib/sets/lists/xdebug/md.sparc64:1.3 Fri Feb 8 15:13:04 2013
+++ src/distrib/sets/lists/xdebug/md.sparc64 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.3 2013/02/08 15:13:04 christos Exp $
+# $NetBSD: md.sparc64,v 1.4 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
@@ -43,13 +43,13 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr300_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ag10e_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.sparc
diff -u src/distrib/sets/lists/xdebug/md.sparc:1.4 src/distrib/sets/lists/xdebug/md.sparc:1.5
--- src/distrib/sets/lists/xdebug/md.sparc:1.4 Mon Apr 21 19:26:56 2014
+++ src/distrib/sets/lists/xdebug/md.sparc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.4 2014/04/21 19:26:56 christos Exp $
+# $NetBSD: md.sparc,v 1.5 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
@@ -40,13 +40,13 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr300_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mach64_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ag10e_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.8 src/distrib/sets/lists/xdebug/mi:1.9
--- src/distrib/sets/lists/xdebug/mi:1.8 Fri Mar 21 12:30:00 2014
+++ src/distrib/sets/lists/xdebug/mi Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.8 2014/03/21 12:30:00 martin Exp $
+# $NetBSD: mi,v 1.9 2014/12/18 06:24:28 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R6/lib/libFS_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libGLU_g.a -unknown- debuglib,x11
@@ -52,7 +52,8 @@
./usr/X11R7/lib/libGL_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libGLw_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libICE_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libOSMesa_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libOSMesa_g.a -unknown- obsolete
+./usr/X11R7/lib/libglapi.a -unknown- debuglib,xorg
./usr/X11R7/lib/libSM_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libX11-xcb_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libX11_g.a -unknown- debuglib,xorg
@@ -406,3 +407,5 @@
./usr/libdata/debug/usr/X11R7/bin/xwininfo.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/xwud.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/libexec/chooser.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- debug,xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.15 src/distrib/sets/lists/xdebug/shl.mi:1.16
--- src/distrib/sets/lists/xdebug/shl.mi:1.15 Wed Oct 1 09:30:58 2014
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.15 2014/10/01 09:30:58 skrll Exp $
+# $NetBSD: shl.mi,v 1.16 2014/12/18 06:24:28 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -63,7 +63,8 @@
./usr/libdata/debug/usr/X11R7/lib/libGLU.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libGLw.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libICE.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug -unknown- xorg,debug
@@ -143,6 +144,6 @@
./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.23 src/distrib/sets/lists/xetc/mi:1.24
--- src/distrib/sets/lists/xetc/mi:1.23 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xetc/mi Thu Dec 18 06:24:28 2014
@@ -1,7 +1,8 @@
-# $NetBSD: mi,v 1.23 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: mi,v 1.24 2014/12/18 06:24:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
+./etc/drirc -unknown- xorg
./etc/X11/fs/config -unknown- x11
./etc/X11/fs/config -unknown- xorg
./etc/X11/lbxproxy/AtomControl -obsolete- obsolete,xorg
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.37 src/distrib/sets/lists/xserver/md.alpha:1.38
--- src/distrib/sets/lists/xserver/md.alpha:1.37 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.alpha Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.37 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.alpha,v 1.38 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -14,28 +14,28 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/s3v_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/s3v_dri.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.73 src/distrib/sets/lists/xserver/md.amd64:1.74
--- src/distrib/sets/lists/xserver/md.amd64:1.73 Thu Apr 3 02:51:20 2014
+++ src/distrib/sets/lists/xserver/md.amd64 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.73 2014/04/03 02:51:20 riastradh Exp $
+# $NetBSD: md.amd64,v 1.74 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -355,38 +355,40 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/i810_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/i810_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/i810_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/i810_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/i915_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/i915_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/i965_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/i965_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/s3v_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/s3v_dri.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/dri/unichrome_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/unichrome_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/unichrome_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/unichrome_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.10 src/distrib/sets/lists/xserver/md.bebox:1.11
--- src/distrib/sets/lists/xserver/md.bebox:1.10 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.bebox Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.10 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.bebox,v 1.11 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -6,8 +6,8 @@
./usr/X11R7/lib/X11/doc/README.DRI -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.92 src/distrib/sets/lists/xserver/md.i386:1.93
--- src/distrib/sets/lists/xserver/md.i386:1.92 Thu Apr 3 02:51:20 2014
+++ src/distrib/sets/lists/xserver/md.i386 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.92 2014/04/03 02:51:20 riastradh Exp $
+# $NetBSD: md.i386,v 1.93 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -391,38 +391,40 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/i810_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/i810_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/i810_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/i810_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/i915_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/i915_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/i965_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/i965_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/s3v_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/s3v_dri.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/dri/unichrome_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/unichrome_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/unichrome_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/unichrome_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.66 src/distrib/sets/lists/xserver/md.macppc:1.67
--- src/distrib/sets/lists/xserver/md.macppc:1.66 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.macppc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.66 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.macppc,v 1.67 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xmacppc -unknown- x11
@@ -313,22 +313,22 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.19 src/distrib/sets/lists/xserver/md.ofppc:1.20
--- src/distrib/sets/lists/xserver/md.ofppc:1.19 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.ofppc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.19 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.ofppc,v 1.20 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -313,22 +313,22 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.14 src/distrib/sets/lists/xserver/md.prep:1.15
--- src/distrib/sets/lists/xserver/md.prep:1.14 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.prep Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.14 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.prep,v 1.15 2014/12/18 06:24:28 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -6,8 +6,8 @@
./usr/X11R7/lib/X11/doc/README.DRI -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.56 src/distrib/sets/lists/xserver/md.sparc:1.57
--- src/distrib/sets/lists/xserver/md.sparc:1.56 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.sparc Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.56 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.sparc,v 1.57 2014/12/18 06:24:28 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -286,20 +286,20 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.54 src/distrib/sets/lists/xserver/md.sparc64:1.55
--- src/distrib/sets/lists/xserver/md.sparc64:1.54 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.sparc64 Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.54 2014/01/02 16:46:40 tho Exp $ x11
+# $NetBSD: md.sparc64,v 1.55 2014/12/18 06:24:28 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -285,20 +285,20 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.33 src/distrib/sets/lists/xserver/mi:1.34
--- src/distrib/sets/lists/xserver/mi:1.33 Sat Feb 9 17:17:36 2013
+++ src/distrib/sets/lists/xserver/mi Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.33 2013/02/09 17:17:36 christos Exp $
+# $NetBSD: mi,v 1.34 2014/12/18 06:24:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -54,10 +54,14 @@
./usr/X11R6/man/man1/xvidtune.1 -unknown- .man,x11
./usr/X11R7/bin/Xnest -unknown- xorg
./usr/X11R7/bin/Xvfb -unknown- xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/gallium_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/gallium_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/kms_swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0 -unknown- xorg
./usr/X11R7/man/cat1/Xmark.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/Xnest.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/Xserver.0 -unknown- .cat,xorg
Index: src/external/mit/xorg/bin/glxgears/Makefile
diff -u src/external/mit/xorg/bin/glxgears/Makefile:1.3 src/external/mit/xorg/bin/glxgears/Makefile:1.4
--- src/external/mit/xorg/bin/glxgears/Makefile:1.3 Tue Jul 8 22:29:12 2014
+++ src/external/mit/xorg/bin/glxgears/Makefile Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/08 22:29:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/18 06:24:28 mrg Exp $
NOMAN= # defined
@@ -11,7 +11,7 @@ CPPFLAGS+=${X11FLAGS.THREADS}
LDADD+= -lGL -lXext -lX11 -lpthread -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
-.PATH: ${X11SRCDIR.MesaDemos}/src/xdemos
+.PATH: ${X11SRCDIR.mesa-demos}/src/xdemos
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/glxinfo/Makefile
diff -u src/external/mit/xorg/bin/glxinfo/Makefile:1.4 src/external/mit/xorg/bin/glxinfo/Makefile:1.5
--- src/external/mit/xorg/bin/glxinfo/Makefile:1.4 Tue Jul 8 22:29:12 2014
+++ src/external/mit/xorg/bin/glxinfo/Makefile Thu Dec 18 06:24:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/08 22:29:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2014/12/18 06:24:28 mrg Exp $
NOMAN= # defined
@@ -10,12 +10,14 @@ PROG_CXX= glxinfo
PROG= glxinfo
.endif
+SRCS+= glinfo_common.c glxinfo.c
+
CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
-LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lm
-DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
+LDADD+= -lGL -lXext -lX11 -lpthread -lm
+DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
-.PATH: ${X11SRCDIR.MesaDemos}/src/xdemos
+.PATH: ${X11SRCDIR.mesa-demos}/src/xdemos
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.29 src/external/mit/xorg/lib/Makefile:1.30
--- src/external/mit/xorg/lib/Makefile:1.29 Sun Jul 13 18:28:13 2014
+++ src/external/mit/xorg/lib/Makefile Thu Dec 18 06:24:28 2014
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.29 2014/07/13 18:28:13 martin Exp $
+# $NetBSD: Makefile,v 1.30 2014/12/18 06:24:28 mrg Exp $
# build libraries for xorg
-SUBDIR= libfontenc freetype libFS libICE libOSMesa \
+SUBDIR= libfontenc freetype libFS libICE libglapi \
libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
.endif
SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
- .WAIT \
- dri fontconfig libSM libX11 \
+ .WAIT
+SUBDIR+=dri gallium fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile \
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.18 src/external/mit/xorg/lib/dri/Makefile:1.19
--- src/external/mit/xorg/lib/dri/Makefile:1.18 Mon Nov 22 21:05:30 2010
+++ src/external/mit/xorg/lib/dri/Makefile Thu Dec 18 06:24:28 2014
@@ -1,26 +1,392 @@
-# $NetBSD: Makefile,v 1.18 2010/11/22 21:05:30 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2014/12/18 06:24:28 mrg Exp $
-SUBDIR= libmesa .WAIT
+# 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
+
+# -I${X11SRCDIR.MesaLib}/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${DESTDIR}${X11INCDIR}/libdrm
+
+#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+
+# We don't actually build this on non-x86 at all, currently.
.if ${MACHINE_ARCH} == "alpha"
-SUBDIR+= mach64 mga r128 r200 r300 r600 radeon savage sis tdfx
+DRIVERS= r200 radeon
.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
-SUBDIR+= mach64 mga r128 r200 r300 r600 radeon tdfx
+DRIVERS= r200 radeon
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-SUBDIR+= mach64 mga r128 r200 r300 r600 radeon
+DRIVERS= r200 radeon
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
- savage sis tdfx unichrome
+DRIVERS= i915 i965 r200 radeon
.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
-SUBDIR+= mga
+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.MesaLib}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
+DRI_SOURCES.i915+= i915_${_f}
+CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.MesaLib}/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.MesaLib}/src/mesa/drivers/dri/i965/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+CPPFLAGS.i965_${_f} += -I${X11SRCDIR.MesaLib}/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.MesaLib}/src/mesa/drivers/dri/r200/${_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 \
+ -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.MesaLib}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.MesaLib}/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}
+.endfor
+
+LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
+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
-SUBDIR+= swrast
+MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
+.include "../libmesa.mk"
+.include "../libglsl.mk"
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+SRCS+= streaming-load-memcpy.c
+CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
+.endif
+
+.include "../driver.mk"
+
+.for _d in ${DRIVERS}
+LINKS+= ${DRIDIR}/mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
+.endfor
+
+.endif
PKGCONFIG= dri
PKGDIST.dri= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.dri= ${MESA_VER}
-.include <bsd.subdir.mk>
+# 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.MesaLib}/src/mesa/drivers/dri/common
+
.include <bsd.x11.mk>
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.20 src/external/mit/xorg/lib/libGL/Makefile:1.21
--- src/external/mit/xorg/lib/libGL/Makefile:1.20 Mon Dec 15 00:20:29 2014
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Dec 18 06:24:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/12/15 00:20:29 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/18 06:24:30 mrg Exp $
.include <bsd.own.mk>
@@ -9,14 +9,60 @@ SUBDIR= internal
# glx
.PATH: ${X11SRCDIR.MesaLib}/src/glx
-SRCS.glx= clientattrib.c compsize.c eval.c glxconfig.c glxcmds.c \
- glxext.c glxextensions.c indirect_glx.c indirect.c \
- indirect_init.c indirect_size.c indirect_window_pos.c \
- indirect_transpose_matrix.c indirect_vertex_array.c \
- indirect_vertex_program.c pixel.c pixelstore.c render2.c \
- renderpix.c single2.c singlepix.c vertarr.c xfont.c \
- glx_pbuffer.c glx_query.c \
- glxcurrent.c indirect_texture_compression.c
+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.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
+
+.for _f in ${SRCS.glx}
+CPPFLAGS.${_f}= -I${X11SRCDIR.MesaLib}/../src/mapi/glapi -DGLX_SHARED_GLAPI
+.endfor
+
+# glapi
+.PATH: ${X11SRCDIR.MesaLib}/src/mapi
+.PATH: ${X11SRCDIR.MesaLib}/../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
+.endfor
+
# XXX see TODO
#.if ${MACHINE_ARCH} == "i386"
@@ -29,79 +75,90 @@ SRCS.glx= clientattrib.c compsize.c eval
.if ${X11DRI} != "no"
# dri
-SRCS.dri= XF86dri.c dri_glx.c drisw_glx.c dri_common.c \
- glxhash.c dri2_glx.c dri2.c
+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
-# MAPI stuff.
-.PATH: ${X11SRCDIR.MesaLib}/src/mapi/mapi
-SRCS.mapi= \
- u_current.c \
- u_execmem.c \
- u_thread.c
-
-# XXX Why don't we just link against libmesa?
-MESA_SRC_MODULES= main math vbo tnl program swrast glapi common ss
-
-.include "../libOSMesa/libmesa.mk"
+.include "../libloader.mk"
.PATH: ${X11SRCDIR.MesaLib}/src/glw
.PATH: ${X11SRCDIR.MesaLib}/include/GL
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/x11
-INCS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h gl.h gl_mangle.h \
- glext.h glx.h glx_mangle.h glxext.h xmesa.h xmesa_x.h \
- xmesa_xf86.h
+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
-# XXX Create a separate libglsl rather than copying this...
-.include "Makefile.glslsrcs"
-SRCS+= ${SRCS.dri} ${SRCS.glx} ${SRCS.glsl} ${SRCS.mapi}
+SRCS+= ${SRCS.dri} ${SRCS.glx} ${SRCS.glapi}
CPPFLAGS+= \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/include/GL/internal \
- -I${X11SRCDIR.MesaLib}/src/mesa \
+ -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${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/GL \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions
-# XXX ?
-# -I${X11SRCDIR.dri2proto}/src/mesa \
-
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread
-CPPFLAGS+= -DUSE_SSE_SYSCTL_DETECTION \
- -D__GLX_ALIGN64 \
- -DMESA_EXECMEM_MMAP \
- -DEXEC_HEAP_SIZE=10485760 \
- -D_NETBSD_SOURCE \
- -DUSE_NATIVE_LIBM_FUNCS \
- -DPTHREADS \
- -DUSE_EXTERNAL_DXTN_LIB=1 \
- -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING \
- -DGLX_INDIRECT_RENDERING \
- -DHZ=100 \
- -DHAVE_ALIAS \
+# -D_NETBSD_SOURCE \
+
+# old
+CPPFLAGS+= -D__GLX_ALIGN64 \
-DXF86VIDMODE \
- -UIN_DRI_DRIVER \
- -DMAPI_MODE_UTIL
+ -DGLX_SHARED_GLAPI
-LIBDPLIBS= Xext ${.CURDIR}/../libXext \
- X11 ${.CURDIR}/../libX11/dynamic \
- Xxf86vm ${.CURDIR}/../libXxf86vm \
- Xfixes ${.CURDIR}/../libXfixes \
- Xdamage ${.CURDIR}/../libXdamage \
- drm ${.CURDIR}/../libdrm \
- m ${.CURDIR}/../../../../../lib/libm
+# 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 \
+ 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
@@ -110,6 +167,16 @@ PKGDIST.gl= ${X11SRCDIR.MesaLib}/src/mes
.include "${.CURDIR}/../libGL/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>
Index: src/external/mit/xorg/lib/libGL/mesa-ver.mk
diff -u src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1 src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.2
--- src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1 Mon Nov 22 21:05:29 2010
+++ src/external/mit/xorg/lib/libGL/mesa-ver.mk Thu Dec 18 06:24:30 2014
@@ -1,3 +1,3 @@
-# $NetBSD: mesa-ver.mk,v 1.1 2010/11/22 21:05:29 mrg Exp $
+# $NetBSD: mesa-ver.mk,v 1.2 2014/12/18 06:24:30 mrg Exp $
-MESA_VER= 7.8.2
+MESA_VER= 10.3.5
Index: src/external/mit/xorg/lib/libGL/internal/Makefile
diff -u src/external/mit/xorg/lib/libGL/internal/Makefile:1.1 src/external/mit/xorg/lib/libGL/internal/Makefile:1.2
--- src/external/mit/xorg/lib/libGL/internal/Makefile:1.1 Sat May 22 08:52:34 2010
+++ src/external/mit/xorg/lib/libGL/internal/Makefile Thu Dec 18 06:24:30 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/05/22 08:52:34 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/18 06:24:30 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.MesaLib}/include/GL/internal
-INCS= dri_interface.h sarea.h
+INCS= dri_interface.h
INCSDIR=${X11INCDIR}/GL/internal
NOOBJ= # defined
Index: src/external/mit/xorg/lib/libGLw/Makefile
diff -u src/external/mit/xorg/lib/libGLw/Makefile:1.3 src/external/mit/xorg/lib/libGLw/Makefile:1.4
--- src/external/mit/xorg/lib/libGLw/Makefile:1.3 Sun Jun 2 11:02:40 2013
+++ src/external/mit/xorg/lib/libGLw/Makefile Thu Dec 18 06:24:30 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/06/02 11:02:40 mbalmer Exp $
+# $NetBSD: Makefile,v 1.4 2014/12/18 06:24:30 mrg Exp $
.include <bsd.own.mk>
LIB= GLw
-.PATH: ${X11SRCDIR.MesaLib}/src/glw
+.PATH: ${X11SRCDIR.glw}
SRCS= GLwDrawA.c
@@ -19,17 +19,22 @@ SRCS+= GLwMDrawA.c
CPPFLAGS+= -I${X11MOTIFPATH}/include
.endif
-LIBDPLIBS= Xext ${.CURDIR}/../libXext \
- X11 ${.CURDIR}/../libX11/dynamic \
- Xxf86vm ${.CURDIR}/../libXxf86vm \
- Xfixes ${.CURDIR}/../libXfixes \
- Xdamage ${.CURDIR}/../libXdamage \
- m ${.CURDIR}/../../../../../lib/libm \
- drm ${.CURDIR}/../libdrm \
- GL ${.CURDIR}/../libGL \
- ICE ${.CURDIR}/../libICE \
- SM ${.CURDIR}/../libSM \
- Xt ${.CURDIR}/../libXt
+.PATH: ${X11SRCDIR.glw}
+INCS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
+INCSDIR=${X11INCDIR}/GL
+
+LIBDPLIBS= Xext ${.CURDIR}/../libXext \
+ X11 ${.CURDIR}/../libX11/dynamic \
+ Xxf86vm ${.CURDIR}/../libXxf86vm \
+ Xfixes ${.CURDIR}/../libXfixes \
+ Xdamage ${.CURDIR}/../libXdamage \
+ m ${.CURDIR}/../../../../../lib/libm \
+ drm ${.CURDIR}/../libdrm \
+ GL ${.CURDIR}/../libGL \
+ ICE ${.CURDIR}/../libICE \
+ SM ${.CURDIR}/../libSM \
+ Xt ${.CURDIR}/../libXt \
+ xcb-dri2 ${.CURDIR}/../libxcb/dri2
PKGCONFIG= glw
PKGDIST.glw= ${X11SRCDIR.MesaLib}/src/glw
Added files:
Index: src/external/mit/xorg/lib/asm.mk
diff -u /dev/null src/external/mit/xorg/lib/asm.mk:1.1
--- /dev/null Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/asm.mk Thu Dec 18 06:24:28 2014
@@ -0,0 +1,16 @@
+# $NetBSD: asm.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+
+# Shared with libmesa.mk / libGL / libglapi
+
+.if ${MACHINE} == "amd64"
+CPPFLAGS+= \
+ -DUSE_SSE41 \
+ -DUSE_X86_64_ASM
+.elif ${MACHINE} == "i386"
+CPPFLAGS+= \
+ -DUSE_X86_ASM \
+ -DUSE_MMX_ASM \
+ -DUSE_3DNOW_ASM \
+ -DUSE_SSE_ASM
+.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
+.endif
Index: src/external/mit/xorg/lib/driver.mk
diff -u /dev/null src/external/mit/xorg/lib/driver.mk:1.1
--- /dev/null Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/driver.mk Thu Dec 18 06:24:28 2014
@@ -0,0 +1,24 @@
+# $NetBSD: driver.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+
+# stuff both dri and gallium drivers need.
+
+# util
+.PATH: ${X11SRCDIR.MesaLib}/src/util
+SRCS.util= \
+ hash_table.c \
+ MESAralloc.c
+.PATH: ${X11SRCDIR.MesaLib}/../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
+
+BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/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
+SRCS+= utils.c dri_util.c xmlconfig.c
+SRCS+= megadriver_stub.c
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u /dev/null src/external/mit/xorg/lib/libglsl.mk:1.1
--- /dev/null Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libglsl.mk Thu Dec 18 06:24:28 2014
@@ -0,0 +1,111 @@
+# $NetBSD: libglsl.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+
+LIBGLSL_GENERATED_CXX_FILES = \
+ glsl_lexer.cpp \
+ glsl_parser.cpp
+
+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.MesaLib}/src/glsl
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl/glcpp
+
+SRCS+= ${LIBGLSL_GENERATED_CXX_FILES} \
+ ${LIBGLSL_FILES} \
+ ${LIBGLCPP_GENERATED_FILES} \
+ ${LIBGLCPP_FILES}
Index: src/external/mit/xorg/lib/libloader.mk
diff -u /dev/null src/external/mit/xorg/lib/libloader.mk:1.1
--- /dev/null Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libloader.mk Thu Dec 18 06:24:28 2014
@@ -0,0 +1,18 @@
+# $NetBSD: libloader.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $
+
+# makefile fragment for mesa src/loader
+
+# loader stuff.
+.PATH: ${X11SRCDIR.MesaLib}/src/loader
+.PATH: ${X11SRCDIR.MesaLib}/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
+.endfor
+
+SRCS+= ${SRCS.loader}
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u /dev/null src/external/mit/xorg/lib/libmesa.mk:1.1
--- /dev/null Thu Dec 18 06:24:30 2014
+++ src/external/mit/xorg/lib/libmesa.mk Thu Dec 18 06:24:28 2014
@@ -0,0 +1,443 @@
+# $NetBSD: libmesa.mk,v 1.1 2014/12/18 06:24:28 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.MesaLib}/../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
+
+# 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.MesaLib}/../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.MesaLib}/../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.MesaLib}/../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.MesaLib}/src/${_path_}
+. endfor
+
+. for _path_ in ${INCLUDES.${_mod_}}
+. for _s in ${SRCS.${_mod_}}
+CPPFLAGS.${_s}+= -I${X11SRCDIR.MesaLib}/src/${_path_}
+. endfor
+. endfor
+
+.endfor
+
+.for _path_ in ${INCLUDES.all}
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/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+= \
+ -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/gallium/Makefile
diff -u /dev/null src/external/mit/xorg/lib/gallium/Makefile:1.1
--- /dev/null Thu Dec 18 06:24:31 2014
+++ src/external/mit/xorg/lib/gallium/Makefile Thu Dec 18 06:24:30 2014
@@ -0,0 +1,473 @@
+# $NetBSD: Makefile,v 1.1 2014/12/18 06:24:30 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
+
+DRIVERS= kms_swrast swrast
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DRIVERS+= r600
+.endif
+
+CPPFLAGS+= \
+ -I${DESTDIR}${X11INCDIR}/libdrm
+
+# cargo culted.
+#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+
+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/radeon \
+ drivers/r600 \
+ drivers/r600/sb \
+ drivers/softpipe \
+ winsys/radeon/drm \
+ winsys/sw/null \
+ winsys/sw/dri \
+ winsys/sw/kms-dri \
+ state_trackers/dri
+
+GALLIUM_NAMES= kms_swrast r600 swrant
+
+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.MesaLib}/../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
+.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.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
+
+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.MesaLib}/src/gallium/drivers/r600
+.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.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.MesaLib}/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.MesaLib}/src/gallium/${_d}
+.endfor
+
+#. if defined(${GALLIUM_SOURCES.${_d}})
+#SRCS+= ${GALLIUM_SOURCES.${_d}}
+#. endif
+
+.include "../libloader.mk"
+
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
+LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
+
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.MesaLib}/src/gallium/targets/dri/dri.sym
+
+## build mesagallium parts
+MESA_SRC_MODULES= main math vbo state_tracker program asm_s
+.include "../libmesa.mk"
+.include "../libglsl.mk"
+
+# Special addition for just gallium; it misses the rest of asm_c files.
+.PATH: ${X11SRCDIR.MesaLib}/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.mk"
+
+
+.PATH: ${X11SRCDIR.MesaLib}/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
+
+CPPFLAGS.target.c += \
+ -DDRI_TARGET \
+ -DGALLIUM_GALAHAD \
+ -DGALLIUM_NOOP \
+ -DGALLIUM_RBUG \
+ -DGALLIUM_TRACE \
+ -DGALLIUM_R200 \
+ -DGALLIUM_R600 \
+ -DGALLIUM_SOFTPIPE \
+ -I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
+ -I${X11SRCDIR.MesaLib}/src/loader \
+ -I${X11SRCDIR.MesaLib}/src/gallium/winsys
+
+.include <bsd.x11.mk>
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+.for _d in ${DRIVERS}
+SYMLINKS+= ${DRIDIR}/gallium_dri.so ${DRIDIR}/${_d}_dri.so
+SYMLINKS+= ${DRIDIR}/gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+.endfor
+
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libglapi/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libglapi/Makefile:1.1
--- /dev/null Thu Dec 18 06:24:31 2014
+++ src/external/mit/xorg/lib/libglapi/Makefile Thu Dec 18 06:24:30 2014
@@ -0,0 +1,101 @@
+# $NetBSD: Makefile,v 1.1 2014/12/18 06:24:30 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= glapi
+LIBISCXX= yes
+
+SHLIB_MAJOR= 0
+SHLIB_MINOR= 0
+
+# util
+.PATH: ${X11SRCDIR.MesaLib}/src/util
+SRCS.util= \
+ hash_table.c \
+ ralloc.c
+.PATH: ${X11SRCDIR.MesaLib}/../src/util
+SRCS.util+= \
+ format_srgb.c
+
+# mapi
+.PATH: ${X11SRCDIR.MesaLib}/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.MesaLib}/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
+
+CPPFLAGS+= \
+ -DMAPI_MODE_GLAPI -DMAPI_ABI_HEADER=\"shared-glapi_glapi_mapi_tmp.h\"
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB}
+
+.include "${.CURDIR}/../libGL/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>
