]> git.pld-linux.org Git - packages/XFree86.git/blame - XFree86-ppc_drivers.patch
projects / packages / XFree86.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel. 0.20030207.3
[packages/XFree86.git] / XFree86-ppc_drivers.patch
CommitLineData
efe9b83e
MM		 1--- xc/programs/Xserver/hw/xfree86/drivers/Imakefile~ Mon Jul 2 12:46:04 2001
2+++ xc/programs/Xserver/hw/xfree86/drivers/Imakefile Tue Apr 30 21:07:40 2002
3@@ -14,7 +14,7 @@
4 cyrix/?*_drv.o glint/?*_drv.o i128/?*_drv.o i740/?*_drv.o \
5 i810/?*_drv.o imstt/?*_drv.o mga/?*_drv.o neomagic/?*_drv.o \
6 nv/?*_drv.o rendition/?*_drv.o s3/?*_drv.o s3virge/?*_drv.o \
7- sis/?*_drv.o tdfx/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \
8+ sis/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \
9 vesa/?*_drv.o vga/?*_drv.o siliconmotion/?*.drv.o vmware/?*_drv.o
10
11 #endif
12--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel~ Thu Oct 4 20:28:22 2001
13+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel Tue Apr 30 21:17:02 2002
14@@ -3,10 +3,9 @@
15 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
16
17 O_TARGET := drm.o
18-list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o
19+list-multi := gamma.o r128.o mga.o i810.o i830.o ffb.o radeon.o
20
21 gamma-objs := gamma_drv.o gamma_dma.o
22-tdfx-objs := tdfx_drv.o
23 r128-objs := r128_drv.o r128_cce.o r128_state.o
24 mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o
25 i810-objs := i810_drv.o i810_dma.o
26@@ -15,7 +14,6 @@
27 ffb-objs := ffb_drv.o ffb_context.o
28
29 obj-$(CONFIG_DRM_GAMMA) += gamma.o
30-obj-$(CONFIG_DRM_TDFX) += tdfx.o
31 obj-$(CONFIG_DRM_R128) += r128.o
32 obj-$(CONFIG_DRM_RADEON)+= radeon.o
33 obj-$(CONFIG_DRM_MGA) += mga.o
34@@ -28,9 +26,6 @@
35 gamma.o: $(gamma-objs) $(lib)
36 $(LD) -r -o $@ $(gamma-objs) $(lib)
37
38-tdfx.o: $(tdfx-objs) $(lib)
39- $(LD) -r -o $@ $(tdfx-objs) $(lib)
40-
41 mga.o: $(mga-objs) $(lib)
42 $(LD) -r -o $@ $(mga-objs) $(lib)
43
44--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux~ Wed Jan 16 16:36:43 2002
45+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux Tue Apr 30 21:19:44 2002
46@@ -38,7 +38,7 @@
47
48 # **** End of SMP/MODVERSIONS detection
49
50-MODS = gamma.o tdfx.o r128.o radeon.o
51+MODS = gamma.o r128.o radeon.o
52 LIBS =
53
54 DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
55@@ -49,9 +49,6 @@
56 GAMMAOBJS = gamma_drv.o gamma_dma.o
57 GAMMAHEADERS = gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
58
59-TDFXOBJS = tdfx_drv.o
60-TDFXHEADERS = tdfx.h $(DRMHEADERS) $(DRMTEMPLATES)
61-
62 R128OBJS = r128_drv.o r128_cce.o r128_state.o
63 R128HEADERS = r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
64
65@@ -203,11 +200,6 @@
66 gamma.o: $(GAMMAOBJS)
67 $(LD) -r $^ -o $@
68
69-tdfx_drv.o: tdfx_drv.c
70- $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
71-tdfx.o: $(TDFXOBJS) $(LIBS)
72- $(LD) -r $^ -o $@
73-
74 sis.o: $(SISOBJS) $(LIBS)
75 $(LD) -r $^ -o $@
76
77@@ -253,7 +245,6 @@
78 $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
79
80 $(GAMMAOBJS): $(GAMMAHEADERS)
81-$(TDFXOBJS): $(TDFXHEADERS)
82 ifeq ($(AGP),1)
83 $(MGAOBJS): $(MGAHEADERS)
84 $(I810OBJS): $(I810HEADERS)
85--- ./xc/config/cf/xfree86.cf~ Tue Apr 30 21:46:25 2002
86+++ ./xc/config/cf/xfree86.cf Tue Apr 30 21:52:58 2002
87@@ -306,7 +306,7 @@
88 /* Pure PCI drivers should go first */
89 # ifndef XF86CardDrivers
90 # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
91- neomagic i740 tdfx savage \
92+ neomagic i740 savage \
93 cirrus vmware tseng trident chips apm \
94 GlideDriver fbdev i128 \
95 ati AgpGartDrivers DevelDrivers ark cyrix \
96@@ -319,7 +319,7 @@
97 # define TdfxDriDriver /**/
98 # endif
99 # ifndef DriDrivers
100-# define DriDrivers gamma TdfxDriDriver mga i810 i830 r128 radeon sis
101+# define DriDrivers gamma mga i810 i830 r128 radeon sis
102 # endif
103 #endif
104
105@@ -475,7 +475,7 @@
106
107 # ifndef XF86CardDrivers
108 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
109- trident chips tdfx fbdev ati \
110+ trident chips fbdev ati \
111 DevelDrivers newport \
112 XF86OSCardDrivers XF86ExtraCardDrivers
113 # endif
114@@ -557,7 +557,7 @@
115
116 /* Pure PCI drivers should go first */
117 # ifndef XF86CardDrivers
118-# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \
119+# define XF86CardDrivers mga glint s3 s3virge rendition tga ati \
120 savage nv DevelDrivers siliconmotion vga \
121 XF86OSCardDrivers XF86ExtraCardDrivers
122 # endif
123@@ -567,7 +567,7 @@
124 # define TdfxDriDriver /**/
125 # endif
126 # ifndef DriDrivers
127-# define DriDrivers gamma TdfxDriDriver mga r128 radeon sis
128+# define DriDrivers gamma mga r128 radeon sis
129 # endif
130 #endif
131
132@@ -653,7 +653,7 @@
133 /* Pure PCI drivers should go first */
134 # ifndef XF86CardDrivers
135 # define XF86CardDrivers ati mga glint s3 s3virge sis savage\
136- trident chips fbdev \
137+ trident chips fbdev nv \
138 DevelDrivers vga \
139 XF86OSCardDrivers XF86ExtraCardDrivers
140 # endif
141@@ -663,7 +663,7 @@
142 # define TdfxDriDriver /**/
143 # endif
144 # ifndef DriDrivers
145-# define DriDrivers gamma TdfxDriDriver mga r128 radeon
146+# define DriDrivers gamma mga r128 radeon
147 # endif
148 #endif
149
150
XFree86 Window System servers and basic programs
This page took 0.087017 seconds and 4 git commands to generate.