Module Name: src
Committed By: macallan
Date: Sat Dec 3 16:38:15 UTC 2016
Modified Files:
src/distrib/sets/lists/xserver: md.macppc md.sparc64
src/external/mit/xorg/server/drivers: Makefile
Log Message:
- build glint driver on macppc
- reenable it on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.92 -r1.93 src/external/mit/xorg/server/drivers/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/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.73 src/distrib/sets/lists/xserver/md.macppc:1.74
--- src/distrib/sets/lists/xserver/md.macppc:1.73 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xserver/md.macppc Sat Dec 3 16:38:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.73 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.macppc,v 1.74 2016/12/03 16:38:15 macallan Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -31,6 +31,8 @@
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
@@ -205,6 +207,7 @@
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
./usr/X11R7/man/html4/chips.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/imstt.html -unknown- obsolete
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
@@ -226,6 +229,7 @@
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg
./usr/X11R7/man/man4/imstt.4 -unknown- obsolete
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.62 src/distrib/sets/lists/xserver/md.sparc64:1.63
--- src/distrib/sets/lists/xserver/md.sparc64:1.62 Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xserver/md.sparc64 Sat Dec 3 16:38:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.62 2016/09/24 21:57:38 mrg Exp $ x11
+# $NetBSD: md.sparc64,v 1.63 2016/12/03 16:38:15 macallan Exp $ x11
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -31,10 +31,8 @@
./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg,xorg_server_ver=118,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/glint_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=118,obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
@@ -187,8 +185,7 @@
./usr/X11R7/man/cat4/ag10e.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
@@ -212,8 +209,7 @@
./usr/X11R7/man/html4/ag10e.html -unknown- html,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
-./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/man/html4/glint.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
@@ -237,8 +233,7 @@
./usr/X11R7/man/man4/ag10e.4 -unknown- .man,xorg,xorg_server_ver=118,obsolete
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.92 src/external/mit/xorg/server/drivers/Makefile:1.93
--- src/external/mit/xorg/server/drivers/Makefile:1.92 Sun Oct 16 08:20:58 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Dec 3 16:38:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2016/10/16 08:20:58 mrg Exp $
+# $NetBSD: Makefile,v 1.93 2016/12/03 16:38:15 macallan Exp $
.include <bsd.own.mk>
@@ -223,6 +223,7 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-ati \
xf86-video-chips \
+ xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -290,6 +291,7 @@ SUBDIR+= \
${MACHINE} == "sparc64"
SUBDIR+= \
xf86-video-ati \
+ xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-r128 \
@@ -298,7 +300,6 @@ SUBDIR+= \
xf86-video-sunffb \
xf86-video-wsfb
# xf86-video-ag10e \
-# xf86-video-glint \
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
