Module Name: src
Committed By: tsutsui
Date: Tue Aug 8 14:34:21 UTC 2023
Modified Files:
src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd
xorg.conf.uskbd
src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp
xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us
xorg.conf.800x600-jp xorg.conf.800x600-us
src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh
xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh
src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0
Log Message:
Specify options "AutoAddDevices" to prefer xorg.conf keyboard options.
Fixes PR/57346.
Should be pulled up to netbsd-10.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \
src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \
src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \
src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \
src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \
src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \
src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd
diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.3 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.4
--- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.jpkbd,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.jpkbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -11,6 +11,11 @@ Section "Files"
FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd
diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.3 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.4
--- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.uskbd,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.uskbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -11,6 +11,11 @@ Section "Files"
FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.640x240-jp,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.640x240-jp,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.640x240-us,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.640x240-us,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.640x480-jp,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.640x480-jp,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.640x480-us,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.640x480-us,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.800x600-jp,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.800x600-jp,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us
diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us:1.4
--- src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.800x600-us,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.800x600-us,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh
diff -u src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh:1.3 src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh:1.4
--- src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.ws003sh,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.ws003sh,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh
diff -u src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh:1.3 src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh:1.4
--- src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.ws007sh,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.ws007sh,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh
diff -u src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh:1.3 src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh:1.4
--- src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.ws011sh,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.ws011sh,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh
diff -u src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh:1.3 src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh:1.4
--- src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh:1.3 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.ws020sh,v 1.3 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.ws020sh,v 1.4 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -12,6 +12,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00
diff -u src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00:1.2 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00:1.3
--- src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00:1.2 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.C3x00,v 1.2 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.C3x00,v 1.3 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -11,6 +11,11 @@ Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
+
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Index: src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0
diff -u src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0:1.2 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0:1.3
--- src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0:1.2 Fri Jun 20 08:08:58 2014
+++ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0 Tue Aug 8 14:34:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.conf.C7x0,v 1.2 2014/06/20 08:08:58 wiz Exp $
+# $NetBSD: xorg.conf.C7x0,v 1.3 2023/08/08 14:34:21 tsutsui Exp $
Section "ServerLayout"
Identifier "wsfb"
@@ -10,6 +10,11 @@ EndSection
Section "Files"
# FontPath "/usr/pkg/share/fonts/X11/TTF/"
EndSection
+
+Section "ServerFlags"
+ # Explicitly prefer keyboard options defined in xorg.conf
+ Option "AutoAddDevices" "false"
+EndSection
Section "InputDevice"
Identifier "Keyboard0"
