cvs commit: patches/XFree86 XFree86-4.3.0-bool-1.patch XFree86-4.3.0-linux_2.6.0-4.patch XFree86-4.3.0-linux_2.6_atkbd-1.patch XFree86-4.3.0-bool.patch XFree86-4.3.0-linux-2.6-atkbd-1.patch XFree86-4.3.0-linux-2.6.0-4.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jun 8 15:18:15 PDT 2004


jim         04/06/08 16:18:15

  Added:       XFree86  XFree86-4.3.0-bool-1.patch
                        XFree86-4.3.0-linux_2.6.0-4.patch
                        XFree86-4.3.0-linux_2.6_atkbd-1.patch
  Removed:     XFree86  XFree86-4.3.0-bool.patch
                        XFree86-4.3.0-linux-2.6-atkbd-1.patch
                        XFree86-4.3.0-linux-2.6.0-4.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/XFree86/XFree86-4.3.0-bool-1.patch
  
  Index: XFree86-4.3.0-bool-1.patch
  ===================================================================
  Submitted By: Kelledin (kelledin at users dot sourceforge dot net)
  Date: 2004-02-18
  Initial Package Version: 4.3.0
  Upstream Status: Reported to maintainers
  Origin: Kelledin
  Description: XFree86 4.3.x uses a loaded name ("bool") for a union type field.
               This causes nasty compile problems when other stuff (like
               ncurses-5.4) includes the <stdbool.h> header.  This patch is a
               workaround for this issue.
  
  diff -Naur xc/programs/Xserver/hw/xfree86/common/xf86Opt.h xc-bool/programs/Xserver/hw/xfree86/common/xf86Opt.h
  --- xc/programs/Xserver/hw/xfree86/common/xf86Opt.h	2001-05-04 14:05:30.000000000 -0500
  +++ xc-bool/programs/Xserver/hw/xfree86/common/xf86Opt.h	2004-02-18 14:27:07.000000000 -0600
  @@ -5,6 +5,10 @@
   #ifndef _XF86_OPT_H_
   #define _XF86_OPT_H_
   
  +#ifdef bool
  +#  undef bool
  +#endif
  +
   typedef struct {
       double freq;
       int units;
  diff -Naur xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h xc-bool/programs/Xserver/hw/xfree86/xf86cfg/loader.h
  --- xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h	2001-07-09 18:45:24.000000000 -0500
  +++ xc-bool/programs/Xserver/hw/xfree86/xf86cfg/loader.h	2004-02-18 14:26:51.000000000 -0600
  @@ -66,6 +66,10 @@
   
   #ifndef LOADER_PRIVATE
   /* common/xf86Opt.h */
  +#ifdef bool
  +#  undef bool
  +#endif
  +
   typedef struct {
       double freq;
       int units;
  
  
  
  1.1                  patches/XFree86/XFree86-4.3.0-linux_2.6.0-4.patch
  
  Index: XFree86-4.3.0-linux_2.6.0-4.patch
  ===================================================================
  Submitted By: DJ Lucas (dj_at_lucasit_dot_com)
  Date: 2003-08-17
  Initial Package Version: 4.3.0
  Origin: DJ Lucas (dj_at_lucasit_dot_com)
  Description: Fix build problem with XFree86 when building against
    2.6.x kernel headers.  
  Notes:
    1) The 2.6 kernel headers are purposely not intened to be used in
    userspace at all, as previously stated on the LKML.  This patch goes
    directly against that recomendation.  This patch is intened for those
    attempting to test the possibility of 'sanitizing' the kernel headers
    per the indirect suggestions of the LKML.
    2) This patch also applies cleanly to the updated 4.3.0.1 source.
  
  diff -Naur xc-orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
  --- xc-orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2002-10-20 21:45:27.000000000 +0000
  +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2003-08-17 18:33:54.000000000 +0000
  @@ -73,6 +73,7 @@
   #endif
   
   /* Deal with spurious kernel header change */
  +#include <linux/version.h>
   #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
   # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
   #  define rate period
  diff -Naur xc-orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
  --- xc-orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2003-02-17 15:11:57.000000000 +0000
  +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2003-08-17 18:33:54.000000000 +0000
  @@ -99,6 +99,14 @@
   #include <asm/kbio.h>
   #endif
   
  +/* Deal with spurious kernel header change */
  +#include <linux/version.h>
  +#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
  +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
  +#  define rate period
  +# endif
  +#endif
  +
   static int
   KDKBDREP_ioctl_ok(int rate, int delay) {
   #if defined(KDKBDREP) && !defined(__sparc__)
  @@ -134,6 +142,10 @@
   #endif /* KDKBDREP */
   }
   
  +#ifdef rate
  +#undef rate
  +#endif
  +
   static int
   KIOCSRATE_ioctl_ok(int rate, int delay) {
   #ifdef KIOCSRATE
  
  
  
  1.1                  patches/XFree86/XFree86-4.3.0-linux_2.6_atkbd-1.patch
  
  Index: XFree86-4.3.0-linux_2.6_atkbd-1.patch
  ===================================================================
  Submitted By: Zack Winkles <winkie at linuxfromscratch.org>
  Date: 2004-03-18
  Initial Package Version: 4.3.0
  Origin: XFree86 CVS HEAD
  Upstream Status: Merged.
  Description: Fix XFree86 improperly accessing the keyboard on linux 2.6:
  
  atkbd.c: Unknown key released (translated set 2, code 0x7a on isa0060/serio0).
  atkbd.c: This is an XFree86 bug. It shouldn't access hardware directly.
  
  diff -Naur xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
  --- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2002-10-20 17:45:27.000000000 -0400
  +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004-03-18 19:10:26.925106600 -0500
  @@ -80,7 +80,7 @@
   #endif
   
   static int
  -KDKBDREP_ioctl_ok(int rate, int delay) {
  +KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
   #if defined(KDKBDREP) && !defined(__sparc__)
        /* This ioctl is defined in <linux/kd.h> but is not
   	implemented anywhere - must be in some m68k patches. */
  @@ -89,7 +89,7 @@
      /* don't change, just test */
      kbdrep_s.rate = -1;
      kbdrep_s.delay = -1;
  -   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  +   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
          return 0;
      }
   
  @@ -104,7 +104,7 @@
      if (kbdrep_s.delay < 1)
        kbdrep_s.delay = 1;
      
  -   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  +   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
        return 0;
      }
   
  @@ -178,7 +178,7 @@
       delay = xf86Info.kbdDelay;
   
   
  -  if(KDKBDREP_ioctl_ok(rate, delay)) 	/* m68k? */
  +  if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) 	/* m68k? */
       return;
   
     if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
  diff -Naur xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
  --- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2003-02-17 10:11:57.000000000 -0500
  +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004-03-18 19:10:26.926106448 -0500
  @@ -100,7 +100,7 @@
   #endif
   
   static int
  -KDKBDREP_ioctl_ok(int rate, int delay) {
  +KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
   #if defined(KDKBDREP) && !defined(__sparc__)
        /* This ioctl is defined in <linux/kd.h> but is not
   	implemented anywhere - must be in some m68k patches. */
  @@ -109,7 +109,7 @@
      /* don't change, just test */
      kbdrep_s.rate = -1;
      kbdrep_s.delay = -1;
  -   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  +   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
          return 0;
      }
   
  @@ -124,7 +124,7 @@
      if (kbdrep_s.delay < 1)
        kbdrep_s.delay = 1;
      
  -   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  +   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
        return 0;
      }
   
  @@ -190,7 +190,7 @@
     if (pKbd->delay >= 0)
       delay = pKbd->delay;
   
  -  if(KDKBDREP_ioctl_ok(rate, delay)) 	/* m68k? */
  +  if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) 	/* m68k? */
       return;
   
     if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
  
  
  



More information about the patches mailing list