- updated for 4.3.99.13

Changed files:
    XFree86-PLD.patch -> 1.16
    XFree86-disable_glide.patch -> 1.4

diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch
index 67e41d2301d57d781d78022fb12a799e3b294ac7..4c9a0d59f6739fd146884f872ddfabf0f320e438 100644 (file)
--- a/XFree86-PLD.patch
+++ b/XFree86-PLD.patch
@@ -1,6 +1,6 @@
-diff -urN xc.orig/Makefile xc/Makefile
---- xc.orig/Makefile   Mon Dec 30 15:54:17 2002
-+++ xc/Makefile        Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/Makefile xc/Makefile
+--- xc.orig/Makefile   2003-04-25 13:00:01.000000000 +0200
++++ xc/Makefile        2003-09-26 10:27:39.655002672 +0200
 @@ -8,7 +8,7 @@
  # or add "MAKE = make" to this file.
  
@@ -10,10 +10,10 @@ diff -urN xc.orig/Makefile xc/Makefile
  RM = rm -f
  MV = mv
  WORLDOPTS =
-diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
---- xc.orig/config/cf/Imake.cf Mon Dec 30 15:52:30 2002
-+++ xc/config/cf/Imake.cf      Mon Dec 30 16:02:13 2002
-@@ -723,6 +723,10 @@
+diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
+--- xc.orig/config/cf/Imake.cf 2003-07-10 13:00:02.000000000 +0200
++++ xc/config/cf/Imake.cf      2003-09-26 10:27:39.710994160 +0200
+@@ -746,6 +746,10 @@
  #   define s390Architecture
  #  undef __s390__
  # endif /* s390 */
@@ -24,10 +24,10 @@ diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
  # ifdef __alpha
  #  define AlphaArchitecture
  #  undef __alpha
-diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc.orig/config/cf/Imake.tmpl       Mon Dec 30 15:52:30 2002
-+++ xc/config/cf/Imake.tmpl    Mon Dec 30 16:02:13 2002
-@@ -253,7 +253,7 @@
+diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
+--- xc.orig/config/cf/Imake.tmpl       2003-09-25 13:00:02.000000000 +0200
++++ xc/config/cf/Imake.tmpl    2003-09-26 10:27:39.733990664 +0200
+@@ -261,7 +261,7 @@
  
  #ifndef BuildHtmlManPages
  #ifdef RmanCmd
@@ -36,7 +36,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #else
  #define BuildHtmlManPages NO
  #endif
-@@ -833,11 +833,7 @@
+@@ -845,11 +845,7 @@
  #define LintlibDir $(USRLIBDIR)/lint
  #endif
  #ifndef SystemManDirectory
@@ -48,7 +48,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #endif
  #ifndef ManDirectoryRoot
  #ifdef ProjectRoot
-@@ -974,7 +970,7 @@
+@@ -986,7 +982,7 @@
  #define NoRConst NO /* YES if const for structs of funcs is bad */
  #endif
  #ifndef InstPgmFlags
@@ -57,7 +57,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #endif
  #ifndef InstBinFlags
  #define InstBinFlags -m 0755
-@@ -1112,7 +1108,7 @@
+@@ -1124,7 +1120,7 @@
  #define CppCmd /LibDirName/cpp
  #endif
  #ifndef RawCppCmd
@@ -66,10 +66,10 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #endif
  #ifndef CppNoLineInfoOption
  #define CppNoLineInfoOption /**/
-diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl Mon Dec 30 15:52:30 2002
-+++ xc/config/cf/X11.tmpl      Mon Dec 30 16:02:13 2002
-@@ -1256,8 +1256,12 @@
+diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl 2003-09-25 13:00:02.000000000 +0200
++++ xc/config/cf/X11.tmpl      2003-09-26 10:27:39.755987320 +0200
+@@ -1240,8 +1240,12 @@
  # define UsbMouseSupport NO
  #endif
  
@@ -83,7 +83,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  
  /* X-TrueType settings */
-@@ -1380,7 +1384,7 @@
+@@ -1364,7 +1368,7 @@
  #define ConfigDir $(LIBDIR)/config
  #endif
  #ifndef DocDir
@@ -92,8 +92,8 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef DocHtmlDir
  #define DocHtmlDir $(DOCDIR)/html
-@@ -1389,31 +1393,31 @@
- #define DocPsDir $(DOCDIR)/PostScript
+@@ -1376,31 +1380,31 @@
+ #define DocPdfDir $(DOCDIR)/PDF
  #endif
  #ifndef FontDir
 -#define FontDir $(LIBDIR)/fonts
@@ -131,8 +131,8 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef NlsDir
  #define NlsDir $(LIBDIR)/nls
-@@ -1425,23 +1429,20 @@
- #define PexApiDir $(LIBDIR)/PEX
+@@ -1409,23 +1413,20 @@
+ #define XLocaleDir $(LIBDIR)/locale
  #endif
  #ifndef LbxproxyDir
 -#define LbxproxyDir $(LIBDIR)/lbxproxy
@@ -158,7 +158,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #ifndef InstallSecurityConfig
  #define InstallSecurityConfig YES     /* Install sample security policy */
  #endif
-@@ -1473,10 +1474,10 @@
+@@ -1457,10 +1458,10 @@
  #define OsNameDefines /* as nothing */
  #endif
  #ifndef DefaultUserPath                       /* for xdm */
@@ -171,7 +171,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef DefaultSystemShell            /* for xdm to set in SHELL */
  #define DefaultSystemShell BourneShell
-@@ -1603,7 +1604,7 @@
+@@ -1587,7 +1588,7 @@
  
       HTMLINDEXCMD = HtmlIndexCmd
  
@@ -180,7 +180,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
          CLIENTSRC = $(TOP)/clients
            DEMOSRC = $(TOP)/demos
         XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1617,7 +1618,7 @@
+@@ -1601,7 +1602,7 @@
          SERVERSRC = $(XTOP)/programs/Xserver
         CONTRIBSRC = ContribDir
     UNSUPPORTEDSRC = UnsupportedDir
@@ -189,10 +189,10 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
             RGBSRC = $(XTOP)/programs/rgb
        BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
       MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/linux.cf      Mon Dec 30 16:20:00 2002
-@@ -320,7 +320,7 @@
+diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf 2003-09-10 13:00:02.000000000 +0200
++++ xc/config/cf/linux.cf      2003-09-26 10:27:39.767985496 +0200
+@@ -309,7 +309,7 @@
   */
  #if BuildXF86DRI
  # if defined(i386Architecture)
@@ -201,8 +201,8 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  # endif
  #endif
  
-@@ -333,7 +333,7 @@
- #  if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture)
+@@ -328,7 +328,7 @@
+ #  if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture)
  #    if OSMajorVersion == 2
         /* Only tested for Linux 2.2.0 through 2.2.12 */
 -#      if OSMinorVersion == 2 && OSTeenyVersion <= 12
@@ -210,7 +210,7 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  #        define BuildXF86DRM  YES
  #      else
           /* Only tested for Linux 2.3.0 through 2.3.18 */
-@@ -721,7 +721,7 @@
+@@ -716,7 +716,7 @@
  
  #define HasVarRun             YES
  #ifndef VarDbDirectory
@@ -219,9 +219,9 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  #endif
  
  #ifndef XF86OSCardDrivers
-diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
---- xc.orig/config/cf/site.def Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/site.def      Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
+--- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
++++ xc/config/cf/site.def      2003-09-26 10:27:39.773984584 +0200
 @@ -119,10 +119,14 @@
  #define HasSentinel   YES
  */
@@ -240,10 +240,10 @@ diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
-diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
---- xc.orig/config/cf/xf86site.def     Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/xf86site.def  Mon Dec 30 16:28:24 2002
-@@ -234,8 +234,8 @@
+diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
+--- xc.orig/config/cf/xf86site.def     2003-09-10 13:00:03.000000000 +0200
++++ xc/config/cf/xf86site.def  2003-09-26 10:27:39.790982000 +0200
+@@ -260,8 +260,8 @@
  /*
   * To not build/install the Cyrillic fonts, uncomment the following
   *
@@ -253,7 +253,7 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
  
  /*
   * To not install the local font directory, uncomment the following
-@@ -281,27 +281,26 @@
+@@ -307,27 +307,26 @@
   * HasGlide2 to YES and set the Glide2IncDir variable. 
   * HasGlide2 is per default NO.
   *
@@ -285,7 +285,7 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
  
  
  /*
-@@ -403,8 +402,8 @@
+@@ -429,8 +428,8 @@
   * Some Linux releases don't have a libtermcap.  In this case you may need
   * to uncomment the following
   *
@@ -294,8 +294,8 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
 +#define TermcapLibrary                -lncurses
  
  /*
-  * If you have Tk (which is required to build XF86Setup), uncomment this
-@@ -677,8 +676,8 @@
+  * Build a server that dynamically loads the modules by setting
+@@ -605,8 +604,8 @@
   * To forceably build static libraries in addition to shared libraries,
   * uncomment this.
   *
@@ -305,10 +305,10 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
  
  /*
   * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf       Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/xfree86.cf    Mon Dec 30 16:02:13 2002
-@@ -107,7 +107,7 @@
+diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf       2003-09-25 13:00:04.000000000 +0200
++++ xc/config/cf/xfree86.cf    2003-09-26 10:31:13.596478624 +0200
+@@ -128,7 +128,7 @@
  #define XConfigFile           XF86Config
  #endif
  #ifndef XConfigDir
@@ -317,18 +317,18 @@ diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
  #endif
  #ifndef XLogFile
  #define XLogFile              XFree86
-@@ -877,7 +877,7 @@
- /* Pure PCI drivers should go first */
+@@ -760,7 +760,7 @@
+ 
  # ifndef XF86CardDrivers
- #  define XF86CardDrivers     ati mga glint s3 s3virge sis savage\
--                              trident chips tdfx fbdev \
-+                              trident chips fbdev \
-                               DevelDrivers vga \
+ #  define XF86CardDrivers     mga glint nv s3 s3virge sis savage \
+-                              trident chips tdfx fbdev ati \
++                              trident chips fbdev ati \
+                               DevelDrivers newport \
                                XF86OSCardDrivers XF86ExtraCardDrivers
  # endif
-diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
---- xc.orig/config/imake/imake.c       Mon Dec 30 15:52:31 2002
-+++ xc/config/imake/imake.c    Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
+--- xc.orig/config/imake/imake.c       2003-04-10 13:00:03.000000000 +0200
++++ xc/config/imake/imake.c    2003-09-26 10:27:39.803980024 +0200
 @@ -1057,6 +1057,7 @@
    static char* suse = "/etc/SuSE-release";
    static char* redhat = "/etc/redhat-release";
@@ -357,9 +357,9 @@ diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
    /* what's the definitive way to tell what any particular distribution is? */
  
    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile      Mon Dec 30 15:53:56 2002
-+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile   Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile      2003-03-04 17:25:10.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile   2003-09-26 10:27:39.000000000 +0200
 @@ -93,7 +93,7 @@
  
  #if HasNCurses
@@ -369,9 +369,9 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xser
  #endif
  
  XF86CONFIGFILE = XConfigFile
-diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.orig/programs/xdm/config/Xres.cpp       Mon Dec 30 15:54:07 2002
-+++ xc/programs/xdm/config/Xres.cpp    Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.orig/programs/xdm/config/Xres.cpp       2003-01-04 04:11:31.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp    2003-09-26 10:27:39.000000000 +0200
 @@ -70,10 +70,10 @@
  #endif /* XPM */
  /**/#endif
@@ -386,12 +386,12 @@ diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
  /**/#endif
  xlogin*useShape: true
  xlogin*logoPadding: 10
-diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
---- xc.orig/programs/xdm/resource.c    Mon Dec 30 15:54:06 2002
-+++ xc/programs/xdm/resource.c Mon Dec 30 16:02:13 2002
-@@ -73,31 +73,31 @@
-  * if it is server-specific).  DO NOT CHANGE THESE DEFINITIONS!
+diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
+--- xc.orig/programs/xdm/resource.c    2003-09-25 13:06:32.000000000 +0200
++++ xc/programs/xdm/resource.c 2003-09-26 10:27:39.000000000 +0200
+@@ -84,31 +84,31 @@
   */
+ #ifndef __EMX__
  #ifndef DEF_SERVER_LINE 
 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
@@ -429,7 +429,7 @@ diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
  #endif
  #ifndef DEF_AUTH_NAME
  #ifdef HASXDMAUTH
-@@ -107,7 +107,7 @@
+@@ -118,7 +118,7 @@
  #endif
  #endif
  #ifndef DEF_AUTH_DIR
@@ -438,9 +438,9 @@ diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
  #endif
  #ifndef DEF_USER_AUTH_DIR
  #define DEF_USER_AUTH_DIR     "/tmp"
-diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
---- xc.orig/programs/xinit/Imakefile   Mon Dec 30 15:54:10 2002
-+++ xc/programs/xinit/Imakefile        Mon Dec 30 16:31:27 2002
+diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
+--- xc.orig/programs/xinit/Imakefile   2003-06-10 13:08:06.000000000 +0200
++++ xc/programs/xinit/Imakefile        2003-09-26 10:27:39.000000000 +0200
 @@ -39,11 +39,12 @@
  InstallNamedProg(startx,startx,$(BINDIR))
  InstallManPage(startx,$(MANDIR))
@@ -459,9 +459,9 @@ diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
  
  LinkConfDirectory(xinit,.,xinit,.)
  
-diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc.orig/programs/xterm/Imakefile   Mon Dec 30 15:54:16 2002
-+++ xc/programs/xterm/Imakefile        Mon Dec 30 16:35:55 2002
+diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.orig/programs/xterm/Imakefile   2003-09-25 13:06:59.000000000 +0200
++++ xc/programs/xterm/Imakefile        2003-09-26 10:27:39.000000000 +0200
 @@ -36,6 +36,10 @@
  #define XkbClientLibs /**/
  #endif
@@ -482,7 +482,7 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
  #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
      (defined(LinuxArchitecture) && \
       (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
-@@ -110,7 +116,7 @@
+@@ -115,7 +121,7 @@
     MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
      XKB_DEFINES = XkbClientDefines
     PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
@@ -491,9 +491,9 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
         INCLUDES = $(XRFINCLUDES)
  
  #ifdef OS2Architecture
-diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
---- xc.orig/programs/xterm/xterm.h     Mon Dec 30 15:54:16 2002
-+++ xc/programs/xterm/xterm.h  Mon Dec 30 16:02:13 2002
+diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
+--- xc.orig/programs/xterm/xterm.h     2003-09-25 13:07:01.000000000 +0200
++++ xc/programs/xterm/xterm.h  2003-09-26 10:27:39.000000000 +0200
 @@ -73,7 +73,7 @@
  #endif
  

diff --git a/XFree86-disable_glide.patch b/XFree86-disable_glide.patch
index 7c5de1082950f566f2a98aecf1699f161efc052d..f9e7d2ff0ee04c02c97a7b397eccf481dd0dc4fb 100644 (file)
--- a/XFree86-disable_glide.patch
+++ b/XFree86-disable_glide.patch
@@ -1,12 +1,12 @@
-diff -Nru xfree.orig/xc/config/cf/xfree86.cf xfree/xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf       2003-08-25 13:00:04.000000000 +0200
-+++ xc/config/cf/xfree86.cf    2003-08-26 18:52:05.082430528 +0200
-@@ -380,7 +380,7 @@
+diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf       2003-09-25 13:00:04.000000000 +0200
++++ xc/config/cf/xfree86.cf    2003-09-26 10:57:00.626294344 +0200
+@@ -374,7 +374,7 @@
  #  define XF86CardDrivers     mga glint nv tga s3 s3virge sis rendition \
                                neomagic i740 tdfx savage \
                                cirrus vmware tseng trident chips apm \
--                              GlideDriver fbdev i128 NscDriver \
-+                              fbdev i128 NscDriver \
+-                              GlideDriver i128 NscDriver \
++                              i128 NscDriver \
                                ati i810 AgpGartDrivers DevelDrivers ark \
-                               cyrix siliconmotion ViaDriver \
-                               vesa vga \
+                               cyrix siliconmotion via \
+                               fbdev vesa vga \