Attachment 683 Details for Bug 1133 – Patch to make DoLoadableServer NO work (relative to programs/Xserver/hw/xfree86/input)

[patch] Patch to make DoLoadableServer NO work (relative to programs/Xserver/hw/xfree86/input)

kbd-mess.patch (text/plain), 1.45 KB, created by Kristian Høgsberg on 2004-08-19 07:02:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2004-08-19 07:02:42 UTC

Size: 1.45 KB

patch

obsolete

>Index: Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/Imakefile,v
>retrieving revision 1.2
>diff -u -p -r1.2 Imakefile
>--- Imakefile	23 Apr 2004 19:54:01 -0000	1.2
>+++ Imakefile	19 Aug 2004 13:56:34 -0000
>@@ -8,6 +8,12 @@ XCOMM $XFree86: xc/programs/Xserver/hw/x
> JOYSTICKDIR = joystick
> #endif
> 
>+#if UseDeprecatedKeyboardDriver
>+BUILTIN=xf86KEYBOARD KBD
>+#else
>+BUILTIN=KBD
>+#endif
>+
> SUBDIRS = XInputDrivers $(JOYSTICKDIR)
> DRIVERS = XInputDrivers
> 
>@@ -35,7 +41,7 @@ INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC
> 	   -I$(EXTINCSRC) -I$(XINCLUDESRC)
> 
> #if !DoLoadableServer
>-ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(DRIVERS))
>+ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(BUILTIN) $(DRIVERS))
> DriverObjectList($(DRIVERS),idriver.list)
> #endif
> 
>Index: confdrv.sh
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/confdrv.sh,v
>retrieving revision 1.2
>diff -u -p -r1.2 confdrv.sh
>--- confdrv.sh	23 Apr 2004 19:54:01 -0000	1.2
>+++ confdrv.sh	19 Aug 2004 13:56:34 -0000
>@@ -8,7 +8,6 @@
> #
> 
> DRVCONF=./drvConf.c
>-BUILTIN="xf86KEYBOARD"
> 
> cat > $DRVCONF <<EOF
> /*
>@@ -20,7 +19,7 @@ cat > $DRVCONF <<EOF
> 
> extern InputDriverRec
> EOF
>-Args="$BUILTIN `echo $* | tr '[a-z]' '[A-Z]'`"
>+Args=`echo $* | tr '[a-z]' '[A-Z]'`
> set - $Args
> while [ $# -gt 1 ]; do
>   echo "#undef $1" >> $DRVCONF

Actions: View | Splinter Review

Attachments on bug 1133: 677 | 683 | 687

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.