Re: Providing port specific sample xorg.conf file

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

macallan@ wrote:

> > To use Xorg server properly, several ports require some machine
> > specific but common settings (wskbd protocol for keyboard,
> > CCW settings for PDA screen etc.) in xorg.org.
> 
> Some ports ( IIRC macppc, sparc(64) and I think sgimips ) add these  
> lines automatically when generating a config file using Xorg -configure.

It looks these are for xf86-video-foo drivers.

Most ports that use wsfb driver don't require probing video to setup
xorg.conf, but users still have to modify lines for screen size
and keyboard layout etc. so I think it's still worth to provide
sample xorg.conf files in the default (/etc/X11) dir.

I'm planning to handle such xorg.conf examples in
src/external/mit/xorg/etc with CONFIGFILES as
src/etc does for misc config files, and I'll add
such xorg.conf files into xserver.tgz set (rather than xetc.tgz).

Comments?

Index: src/external/mit/xorg/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- src/external/mit/xorg/Makefile      7 Sep 2009 21:07:03 -0000       1.7
+++ src/external/mit/xorg/Makefile      9 Nov 2010 16:08:31 -0000
@@ -4,7 +4,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=                tools .WAIT include .WAIT lib .WAIT bin share server
+SUBDIR=                tools .WAIT include .WAIT lib .WAIT bin share server etc
 
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=  cleandir
@@ -57,6 +57,7 @@ DISTRIBTARGETS=       \
        bin/xfs \
        bin/xinit \
        bin/xsm \
+       etc \
        lib/fontconfig/etc \
        lib/fontconfig/etc/conf.avail \
        lib/fontconfig/etc/conf.d
--- /dev/null   2010-11-10 01:01:58.000000000 +0900
+++ src/external/mit/xorg/etc/Makefile  2010-11-10 00:42:43.000000000 +0900
@@ -0,0 +1,20 @@
+# $NetBSD$
+
+.include <bsd.own.mk>
+
+.if exists(etc.${RELEASEMACHINE}/Makefile.inc)
+.include "etc.${RELEASEMACHINE}/Makefile.inc"
+.endif
+
+FILESDIR=      ${X11ETCDIR}
+CONFIGFILES=
+CONFIGSYMLINKS=
+
+.if defined(XORGCONF_FILES)
+.for file in ${XORGCONF_FILES}
+CONFIGFILES+=          ${file}
+FILESMODE_${file:T}=   644
+.endfor
+.endif
+
+.include <bsd.prog.mk>
--- /dev/null   2010-11-10 01:02:25.000000000 +0900
+++ src/external/mit/xorg/etc/etc.dreamcast/Makefile.inc        2010-11-10 
00:42:54.000000000 +0900
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+XORGCONF_FILES=        etc.${MACHINE}/xorg.conf.tmpl
--- /dev/null   2010-11-08 03:15:01.000000000 +0900
+++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.tmpl      2010-11-10 
00:26:29.000000000 +0900
@@ -0,0 +1,46 @@
+Section "ServerLayout"
+       Identifier      "wsfb"
+       Screen  0       "Screen0" 0 0
+       InputDevice     "Mouse0" "CorePointer"
+       InputDevice     "Keyboard0" "CoreKeyboard"
+EndSection
+       
+Section "Files"
+       FontPath        "/usr/pkg/lib/X11/fonts/TTF/"
+EndSection
+
+Section "InputDevice"
+       Identifier      "Keyboard0"
+       Driver          "kbd"
+       Option          "Protocol"      "wskbd"
+       Option          "Device"        "/dev/wskbd0"
+       Option          "XkbLayout"     "us"
+#      Option          "XkbLayout"     "jp(106)"
+EndSection
+
+Section "InputDevice"
+       Identifier      "Mouse0"
+       Driver          "mouse"
+       Option          "Protocol"      "wsmouse"
+       Option          "ButtonMapping" "1 2 3 2"
+EndSection
+
+Section "Device"
+       Identifier      "Wsdisplay0"
+       Driver          "wsfb"
+EndSection
+
+Section "Monitor"
+       Identifier      "Monitor"
+EndSection
+
+Section "Screen"
+       Identifier      "Screen0"
+       Device          "Wsdisplay0"
+       Monitor         "Monitor"
+
+       SubSection "Display"
+               Viewport        0 0
+               Depth           16
+       EndSubSection
+EndSection
Index: src/distrib/sets/lists/xserver/md.dreamcast
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xserver/md.dreamcast,v
retrieving revision 1.10
diff -u -p -r1.10 md.dreamcast
--- src/distrib/sets/lists/xserver/md.dreamcast 19 Jun 2010 18:17:55 -0000      
1.10
+++ src/distrib/sets/lists/xserver/md.dreamcast 7 Nov 2010 18:39:12 -0000
@@ -1,4 +1,5 @@
 #      $NetBSD: md.dreamcast,v 1.10 2010/06/19 18:17:55 tsutsui Exp $
+./etc/X11/xorg.conf.tmpl                               -unknown-       xorg
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/Xdreamcast                             -unknown-       x11
 ./usr/X11R6/man/cat1/Xdreamcast.0                      -unknown-       x11,.cat

---
Izumi Tsutsui