From 6abbbf7fbd3dd34ac95918e90ab92b11bdb84dd2 Mon Sep 17 00:00:00 2001 From: yaro Date: Tue, 3 Jul 2001 09:12:36 +0000 Subject: [PATCH] *** empty log message *** Changed files: XFree86-config-s3.patch -> 1.1 XFree86-makefile-s3.patch -> 1.3 --- XFree86-config-s3.patch | 49 +++++++++++++++++++++++++++++++++++++++ XFree86-makefile-s3.patch | 11 --------- 2 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 XFree86-config-s3.patch delete mode 100644 XFree86-makefile-s3.patch diff --git a/XFree86-config-s3.patch b/XFree86-config-s3.patch new file mode 100644 index 0000000..5097107 --- /dev/null +++ b/XFree86-config-s3.patch @@ -0,0 +1,49 @@ +--- XFree86-4.1.0/xc/config/cf/xf86site.def.orig Tue Jul 3 08:44:25 2001 ++++ XFree86-4.1.0/xc/config/cf/xf86site.def Tue Jul 3 08:44:36 2001 +@@ -251,7 +251,7 @@ + * will be included in it. When building the loadable server each of these + * modules will be built. + * +-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ ++#define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver fbdev i128 \ +--- XFree86-4.1.0/xc/config/cf/xfree86.cf.orig Tue Jul 3 10:10:40 2001 ++++ XFree86-4.1.0/xc/config/cf/xfree86.cf Tue Jul 3 10:10:42 2001 +@@ -302,7 +302,7 @@ + + /* Pure PCI drivers should go first */ + # ifndef XF86CardDrivers +-# define XF86CardDrivers mga glint nv tga s3virge sis rendition \ ++# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver fbdev i128 \ +@@ -472,7 +472,7 @@ + # endif + + # ifndef XF86CardDrivers +-# define XF86CardDrivers mga glint nv s3virge sis savage \ ++# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ + trident chips tdfx fbdev ati \ + DevelDrivers newport \ + XF86OSCardDrivers XF86ExtraCardDrivers +@@ -555,7 +555,7 @@ + + /* Pure PCI drivers should go first */ + # ifndef XF86CardDrivers +-# define XF86CardDrivers mga tdfx glint s3virge rendition tga \ ++# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga \ + savage nv DevelDrivers siliconmotion vga \ + XF86OSCardDrivers XF86ExtraCardDrivers + # endif +@@ -648,7 +648,7 @@ + + /* Pure PCI drivers should go first */ + # ifndef XF86CardDrivers +-# define XF86CardDrivers mga glint s3virge sis savage\ ++# define XF86CardDrivers mga glint s3 s3virge sis savage\ + trident chips tdfx fbdev \ + DevelDrivers vga \ + XF86OSCardDrivers XF86ExtraCardDrivers diff --git a/XFree86-makefile-s3.patch b/XFree86-makefile-s3.patch deleted file mode 100644 index af364c0..0000000 --- a/XFree86-makefile-s3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/Imakefile.orig Tue Jul 3 07:14:52 2001 -+++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/Imakefile Tue Jul 3 07:15:23 2001 -@@ -13,7 +13,7 @@ - OBJS = apm/?*_drv.o ati/?*_drv.o chips/?*_drv.o cirrus/?*_drv.o \ - cyrix/?*_drv.o glint/?*_drv.o i128/?*_drv.o i740/?*_drv.o \ - i810/?*_drv.o imstt/?*_drv.o mga/?*_drv.o neomagic/?*_drv.o \ -- nv/?*_drv.o rendition/?*_drv.o s3virge/?*_drv.o sis/?*_drv.o \ -+ nv/?*_drv.o rendition/?*_drv.o s3/?*_drv.o s3virge/?*_drv.o sis/?*_drv.o \ - tdfx/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \ - vesa/?*_drv.o vga/?*_drv.o siliconmotion/?*.drv.o vmware/?*_drv.o - -- 2.44.0