Module Name: src
Committed By: mrg
Date: Fri Aug 19 03:59:31 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
src/external/mit/xorg/server/xorg-server: Makefile Makefile.common
Makefile.serverlib
src/external/mit/xorg/server/xorg-server.old: Makefile Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/share/mk: bsd.own.mk
Log Message:
- introduce HAVE_XORG_GLAMOR which is set to yes on xorg-server 1.18
and x86 ports only so far.
- build glamor extension.
- fix debug set lists for xorg-server 1.18
- install xf86-video-amdgpu driver on xorg-server 1.8 and x86
- clean up radeon-kms Makefile and enable glamor xorg-server 1.8
- clean up various obsolete makefile parts
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.77 -r1.78 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/Makefile \
src/external/mit/xorg/server/xorg-server.old/Makefile.common
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.942 -r1.943 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.26 src/distrib/sets/lists/xdebug/md.amd64:1.27
--- src/distrib/sets/lists/xdebug/md.amd64:1.26 Wed Aug 17 03:10:23 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.26 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: md.amd64,v 1.27 2016/08/19 03:59:30 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
@@ -84,22 +84,23 @@
./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- 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.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.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/cirrus_alpine.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug obsolete xorg,obsolete
@@ -146,9 +147,9 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
@@ -157,17 +158,17 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug -unknown- xorg,debug
@@ -175,7 +176,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.23 src/distrib/sets/lists/xdebug/md.i386:1.24
--- src/distrib/sets/lists/xdebug/md.i386:1.23 Wed Aug 17 03:10:23 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.23 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: md.i386,v 1.24 2016/08/19 03:59:30 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
@@ -129,24 +129,25 @@
./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,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.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.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/cirrus_alpine.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/elographics_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/elographics_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/geode_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug obsolete xorg,obsolete
@@ -195,9 +196,9 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
@@ -205,16 +206,16 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug
@@ -223,7 +224,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.90 src/distrib/sets/lists/xserver/md.amd64:1.91
--- src/distrib/sets/lists/xserver/md.amd64:1.90 Tue Aug 16 19:04:41 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.90 2016/08/16 19:04:41 mrg Exp $
+# $NetBSD: md.amd64,v 1.91 2016/08/19 03:59:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -391,6 +391,8 @@
./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- obsolete
./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/amdgpu_drv.so -unknown- xorg,xorg_server_ver=118
+./usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1 -unknown- xorg,xorg_server_ver=118
./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
@@ -617,22 +619,23 @@
./usr/X11R7/man/cat1/pcitweak.0 -unknown- obsolete
./usr/X11R7/man/cat1/scanpci.0 -unknown- obsolete
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
-./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/amdgpu.0 -unknown- .cat,xorg,xorg_server_ver=118
+./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/cyrix.0 -unknown- obsolete
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
./usr/X11R7/man/cat4/intel.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
@@ -640,14 +643,14 @@
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeonhd.0 -unknown- .cat,xorg,obsolete
-./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/savage.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/siliconmotion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
@@ -657,7 +660,7 @@
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/x86/radeon.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
@@ -665,22 +668,23 @@
./usr/X11R7/man/html1/pcitweak.html -unknown- obsolete
./usr/X11R7/man/html1/scanpci.html -unknown- obsolete
./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete
-./usr/X11R7/man/html4/apm.html -unknown- html,xorg
+./usr/X11R7/man/html4/amdgpu.html -unknown- html,xorg,xorg_server_ver=118
+./usr/X11R7/man/html4/apm.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
-./usr/X11R7/man/html4/chips.html -unknown- html,xorg
-./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
+./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/cyrix.html -unknown- obsolete
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
-./usr/X11R7/man/html4/glint.html -unknown- html,xorg
-./usr/X11R7/man/html4/i128.html -unknown- html,xorg
-./usr/X11R7/man/html4/i740.html -unknown- html,xorg
+./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i128.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i740.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/imstt.html -unknown- obsolete
./usr/X11R7/man/html4/intel.html -unknown- html,xorg
-./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg
+./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
-./usr/X11R7/man/html4/mga.html -unknown- html,xorg
+./usr/X11R7/man/html4/mga.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
-./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
+./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
@@ -688,14 +692,14 @@
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/radeonhd.html -unknown- html,xorg,obsolete
-./usr/X11R7/man/html4/s3.html -unknown- html,xorg
-./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg
+./usr/X11R7/man/html4/s3.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/savage.html -unknown- html,xorg
./usr/X11R7/man/html4/siliconmotion.html -unknown- html,xorg
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
-./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg
+./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
-./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
+./usr/X11R7/man/html4/tseng.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
@@ -705,7 +709,7 @@
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html4/x86/radeon.html -unknown- html,xorg
-./usr/X11R7/man/html4/xgi.html -unknown- html,xorg
+./usr/X11R7/man/html4/xgi.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
@@ -713,6 +717,7 @@
./usr/X11R7/man/man1/pcitweak.1 -unknown- obsolete
./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
+./usr/X11R7/man/man4/amdgpu.4 -unknown- .man,xorg,xorg_server_ver=118
./usr/X11R7/man/man4/apm.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.107 src/distrib/sets/lists/xserver/md.i386:1.108
--- src/distrib/sets/lists/xserver/md.i386:1.107 Tue Aug 16 01:10:19 2016
+++ src/distrib/sets/lists/xserver/md.i386 Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.107 2016/08/16 01:10:19 mrg Exp $
+# $NetBSD: md.i386,v 1.108 2016/08/19 03:59:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -427,6 +427,8 @@
./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- obsolete
./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/amdgpu_drv.so -unknown- xorg,xorg_server_ver=118
+./usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1 -unknown- xorg,xorg_server_ver=118
./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
@@ -657,23 +659,24 @@
./usr/X11R7/man/cat1/pcitweak.0 -unknown- obsolete
./usr/X11R7/man/cat1/scanpci.0 -unknown- obsolete
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
-./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/amdgpu.0 -unknown- .cat,xorg,xorg_server_ver=118
+./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/cyrix.0 -unknown- obsolete
./usr/X11R7/man/cat4/elographics.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xor,xorg_server_ver=110g
+./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
./usr/X11R7/man/cat4/intel.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
@@ -681,14 +684,14 @@
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeonhd.0 -unknown- .cat,xorg,obsolete
-./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/savage.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/siliconmotion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
@@ -698,7 +701,7 @@
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/x86/radeon.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
@@ -706,23 +709,24 @@
./usr/X11R7/man/html1/pcitweak.html -unknown- obsolete
./usr/X11R7/man/html1/scanpci.html -unknown- obsolete
./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete
-./usr/X11R7/man/html4/apm.html -unknown- html,xorg
+./usr/X11R7/man/html4/amdgpu.html -unknown- html,xorg,xorg_server_ver=118
+./usr/X11R7/man/html4/apm.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
-./usr/X11R7/man/html4/chips.html -unknown- html,xorg
-./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
+./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/cyrix.html -unknown- obsolete
./usr/X11R7/man/html4/elographics.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
-./usr/X11R7/man/html4/glint.html -unknown- html,xorg
-./usr/X11R7/man/html4/i128.html -unknown- html,xorg
-./usr/X11R7/man/html4/i740.html -unknown- html,xorg
+./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i128.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i740.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/imstt.html -unknown- obsolete
./usr/X11R7/man/html4/intel.html -unknown- html,xorg
-./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg
+./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
-./usr/X11R7/man/html4/mga.html -unknown- html,xorg
+./usr/X11R7/man/html4/mga.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
-./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
+./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
@@ -730,14 +734,14 @@
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/radeonhd.html -unknown- html,xorg,obsolete
-./usr/X11R7/man/html4/s3.html -unknown- html,xorg
-./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg
+./usr/X11R7/man/html4/s3.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/savage.html -unknown- html,xorg
./usr/X11R7/man/html4/siliconmotion.html -unknown- html,xorg
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
-./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg
+./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
-./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
+./usr/X11R7/man/html4/tseng.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
@@ -747,7 +751,7 @@
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html4/x86/radeon.html -unknown- html,xorg
-./usr/X11R7/man/html4/xgi.html -unknown- html,xorg
+./usr/X11R7/man/html4/xgi.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
@@ -755,6 +759,7 @@
./usr/X11R7/man/man1/pcitweak.1 -unknown- obsolete
./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
+./usr/X11R7/man/man4/amdgpu.4 -unknown- .man,xorg,xorg_server_ver=118
./usr/X11R7/man/man4/apm.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.77 src/external/mit/xorg/server/drivers/Makefile:1.78
--- src/external/mit/xorg/server/drivers/Makefile:1.77 Tue Aug 16 19:45:33 2016
+++ src/external/mit/xorg/server/drivers/Makefile Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2016/08/16 19:45:33 mrg Exp $
+# $NetBSD: Makefile,v 1.78 2016/08/19 03:59:30 mrg Exp $
# xf86-input drivers
@@ -69,9 +69,13 @@ SUBDIR+= \
xf86-video-tdfx \
xf86-video-tseng \
xf86-video-xgi
-
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+.if ${XORG_SERVER_SUBDIR} == "xorg-server"
+SUBDIR+= \
+ xf86-video-amdgpu
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server"
+
.if ${MACHINE_ARCH} == "i386"
SUBDIR+= \
xf86-video-geode
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.4 Wed Aug 17 00:10:19 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Fri Aug 19 03:59:30 2016
@@ -1,29 +1,23 @@
-# $NetBSD: Makefile,v 1.4 2016/08/17 00:10:19 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/19 03:59:30 mrg Exp $
.include <bsd.own.mk>
DRIVER= xf86-video-ati-kms
DRIVER_NAME= radeon_drv
-.PATH: ${X11SRCDIR.${DRIVER}}/src/AtomBios
-SRCS.ATOMBIOS= \
- CD_Operations.c \
- Decoder.c \
- hwserv_drv.c
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
-.endif
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DUSE_XAA
.else
-CPPFLAGS+= -DHAS_DIRTYTRACKING2 \
+CPPFLAGS+= \
+ -DHAS_DIRTYTRACKING2 \
-DHAVE_XORG_LIST \
-DHAVE_XF86_CURSOR_RESET_CURSOR \
-DHAVE_DRI3_H \
-DHAVE_MISYNCSHM_H \
- -DHAVE_PRESENT_H
+ -DHAVE_PRESENT_H \
+ -DHAVE_XF86_CURSOR_RESET_CURSOR
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
@@ -33,14 +27,22 @@ SRCS.EXA= radeon_exa.c r600_exa.c r6xx_a
SRCS.KMS= radeon_dri2.c radeon_dri3.c radeon_drm_queue.c radeon_kms.c \
radeon_present.c radeon_sync.c radeon_vbo.c radeon_bo_helper.c \
drmmode_display.c
-# XXX not yet
+
+.if ${HAVE_XORG_GLAMOR} != "no"
+SRCS.GLAMOR=
+.else
SRCS.GLAMOR= radeon_glamor.c radeon_glamor_wrappers.c
+CPPFLAGS+= \
+ -DHAVE_GLAMOR_H \
+ -DUSE_GLAMOR
+.endif
SRCS= radeon_accel.c radeon_video.c \
radeon_misc.c radeon_probe.c \
radeon_textured_video.c radeon_xvmc.c \
$(SRCS.EXA) \
- $(SRCS.KMS)
+ $(SRCS.KMS) \
+ $(SRCS.GLAMOR)
MAN= radeon.4
MANSUBDIR= /x86
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.25 src/external/mit/xorg/server/xorg-server/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/Makefile:1.25 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile Fri Aug 19 03:59:30 2016
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2016/08/19 03:59:30 mrg Exp $
.include <bsd.own.mk>
.include "Makefile.common"
-.if ${XSERVER_NEEDS_XFONT} != "no"
-SUBDIR.xfont=Xfont fontbase
-.else
-SUBDIR.xfont=
-.endif
-
SUBDIR= doc include .WAIT
SUBDIR+= glx
SUBDIR+= dix fb mi Xext miext os randr render
@@ -23,7 +17,7 @@ SUBDIR+= hw
SUBDIR+= dri3
.endif
-.if ${XORG_XSERVER_GLAMOR} != "no"
+.if ${HAVE_XORG_GLAMOR} != "no"
SUBDIR+= glamor
.endif
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.26 src/external/mit/xorg/server/xorg-server/Makefile.common:1.27
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.26 Wed Jun 12 21:35:29 2013
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2013/06/12 21:35:29 mrg Exp $
+# $NetBSD: Makefile.common,v 1.27 2016/08/19 03:59:30 mrg Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -9,7 +9,6 @@
# XFree86 servers all need XFONT as well.
.if ${MKXORG_SERVER} != "no"
-XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
@@ -59,9 +58,6 @@ XSERVER_X68K= yes
.endif
-# Does this server need Xfont/fontbase libraries?
-XSERVER_NEEDS_XFONT?= no
-
# Does this platform build XFree86 X server?
XSERVER_XFREE86?= no
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.11 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.12
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.11 Mon Aug 15 21:58:40 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.11 2016/08/15 21:58:40 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.12 2016/08/19 03:59:30 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -21,6 +21,10 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+.if ${HAVE_XORG_GLAMOR} != "no"
+CPPFLAGS+= -DGLAMOR
+.endif
+
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
Index: src/external/mit/xorg/server/xorg-server.old/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/Makefile:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile Fri Aug 19 03:59:31 2016
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/19 03:59:31 mrg Exp $
.include <bsd.own.mk>
.include "Makefile.common"
-.if ${XSERVER_NEEDS_XFONT} != "no"
-SUBDIR.xfont=Xfont fontbase
-.else
-SUBDIR.xfont=
-.endif
-
SUBDIR= doc include .WAIT
SUBDIR+= glx
SUBDIR+= dix fb mi Xext miext os randr render
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2
--- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.common Fri Aug 19 03:59:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/08/19 03:59:31 mrg Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -7,9 +7,7 @@
.include <bsd.own.mk>
-# XFree86 servers all need XFONT as well.
.if ${MKXORG_SERVER} != "no"
-XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
@@ -59,9 +57,6 @@ XSERVER_X68K= yes
.endif
-# Does this server need Xfont/fontbase libraries?
-XSERVER_NEEDS_XFONT?= no
-
# Does this platform build XFree86 X server?
XSERVER_XFREE86?= no
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.12 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug 19 03:59:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/19 03:59:31 mrg Exp $
.include <bsd.own.mk>
@@ -34,11 +34,13 @@ LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
+.if ${HAVE_XORG_GLAMOR} != "no"
+LDADD+= ${LDADD.glamor}
+.endif
LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
LDADD+= ${LDADD.hw/xfree86/common}
LDADD+= ${LDADD.hw/xfree86/xorgos}
-#LDADD+= ${LDADD.osandcommon}
LDADD+= ${LDADD.hw/xfree86/xf86config}
LDADD+= ${LDADD.hw/xfree86/dixmods}
LDADD+= ${LDADD.hw/xfree86/xf86modes}
@@ -84,6 +86,9 @@ DPADD+= ${LIBALPHA}
.endif
LDADD+= -lm -lGL -lXv -lxshmfence
+.if ${HAVE_XORG_GLAMOR} != "no"
+LDADD+= -lepoxy
+.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
# Needed by current xf86-video-intel for SNA.
@@ -91,7 +96,8 @@ LDADD+= -lpthread
DPADD+= ${LIBPTHREAD}
.endif
-DPADD+= ${DPADD.dix} \
+DPADD+= \
+ ${DPADD.dix} \
${DPADD.fb} \
${DPADD.mi} \
${DPADD.xfixes} \
@@ -129,6 +135,12 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
${LIBGL} ${LIBXV} ${LIBXSHMFENCE}
+.if ${HAVE_XORG_GLAMOR} != "no"
+DPADD+= \
+ ${DPADD.glamor} \
+ ${LIBEPOXY}
+.endif
+
# XXX
.if ${HAVE_DRI3:Uno} != "no"
DPADD+= ${DPADD.dri3}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.942 src/share/mk/bsd.own.mk:1.943
--- src/share/mk/bsd.own.mk:1.942 Thu Aug 18 08:06:53 2016
+++ src/share/mk/bsd.own.mk Fri Aug 19 03:59:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.942 2016/08/18 08:06:53 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.943 2016/08/19 03:59:30 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1393,11 +1393,17 @@ HAVE_XORG_SERVER_VER?=110
.if ${HAVE_XORG_SERVER_VER:U0} == "118"
XORG_SERVER_SUBDIR?=xorg-server
+. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+HAVE_XORG_GLAMOR?= yes
+. endif
.else
XORG_SERVER_SUBDIR?=xorg-server.old
.endif
X11SRCDIR.xorg-server?= ${X11SRCDIRMIT}/${XORG_SERVER_SUBDIR}/dist
+HAVE_XORG_GLAMOR?= no
+
+# Build glamor extension?
.for _dir in \
xtrans fontconfig freetype evieext mkfontscale bdftopcf \
