separate drivers set per architecture into XF86CardDrivers-cfg patch.

Changed files:
    XFree86-PLD.patch -> 1.5
    XFree86-XF86CardDrivers-cfg.patch -> 1.1

diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch
index 3e4033d5de816163901e227e688766ec01214a9b..e76f3878f6609518e797ae17aeecdf9073d1511e 100644 (file)
--- a/XFree86-PLD.patch
+++ b/XFree86-PLD.patch
@@ -386,20 +386,6 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/x
  #endif
  #ifndef XLogFile
  #define XLogFile              XFree86
-@@ -520,9 +520,10 @@
- 
- /* Pure PCI drivers should go first */
- # ifndef XF86CardDrivers
--#  define XF86CardDrivers     mga glint s3virge sis savage\
--                              trident chips fbdev \
--                              DevelDrivers vga \
-+#  define XF86CardDrivers     mga glint nv tga s3virge sis savage\
-+                              neomagic i740 tdfx trident chips fbdev \
-+                              DevelDrivers vga cirrus tseng apm ati\
-+                              r128 ati v4l vga\
-                               XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- #endif
 diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c
 --- XFree86-4.0.2.org/xc/config/imake/imake.c  Wed Nov 29 17:33:50 2000
 +++ XFree86-4.0.2/xc/config/imake/imake.c      Wed Dec 20 13:41:03 2000

diff --git a/XFree86-XF86CardDrivers-cfg.patch b/XFree86-XF86CardDrivers-cfg.patch
new file mode 100644 (file)
index 0000000..3d8d2bb
--- /dev/null
+++ b/XFree86-XF86CardDrivers-cfg.patch
@@ -0,0 +1,30 @@
+diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
+--- XFree86-4.0.2.org/xc/config/cf/xfree86.cf  Thu Dec 14 20:24:17 2000
++++ XFree86-4.0.2/xc/config/cf/xfree86.cf      Wed Dec 20 13:52:03 2000
+@@ -435,9 +435,9 @@
+ 
+ /* Pure PCI drivers should go first */
+ # ifndef XF86CardDrivers
+-#  define XF86CardDrivers     mga tdfx glint s3virge rendition tga \
+-                              savage nv DevelDrivers siliconmotion vga \
+-                              XF86OSCardDrivers XF86ExtraCardDrivers
++#define XF86CardDrivers               mga tdfx glint s3virge rendition tga \
++                              nv sis neomagic i740 cirrus tseng \
++                              trident chips apm fbdev ati vga v4l
+ # endif
+ #endif
+ 
+@@ -520,9 +520,10 @@
+ 
+ /* Pure PCI drivers should go first */
+ # ifndef XF86CardDrivers
+-#  define XF86CardDrivers     mga glint s3virge sis savage\
+-                              trident chips fbdev \
+-                              DevelDrivers vga \
++#  define XF86CardDrivers     mga glint nv tga s3virge sis savage\
++                              neomagic i740 tdfx trident chips fbdev \
++                              DevelDrivers vga cirrus tseng apm ati\
++                              r128 ati v4l vga\
+                               XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
+ #endif