]> git.pld-linux.org Git - packages/X11.git/blob - X11-r300.patch
- added x11r6.9.0-mitri.diff (official CVE-2006-1525 fix)
[packages/X11.git] / X11-r300.patch
1 diff -urN X11-6.9.0/xc/config/cf/xfree86.cf.orig X11-6.9.0/xc/config/cf/xfree86.cf
2 --- X11-6.9.0/xc/config/cf/xfree86.cf.orig      2005-10-03 18:08:44.000000000 +0200
3 +++ X11-6.9.0/xc/config/cf/xfree86.cf   2005-12-27 21:28:39.000000000 +0100
4 @@ -398,7 +398,7 @@
5  # endif
6  
7  # ifndef DriDrivers
8 -#  define DriDrivers           gamma i810 i830 mga r128 radeon r200 \
9 +#  define DriDrivers           gamma i810 i830 mga r128 radeon r200 r300 \
10                                 sis tdfx DevelDRIDrivers
11  # endif
12  #endif
13 @@ -490,7 +490,7 @@
14  
15  # define DevelDRIDrivers       /**/
16  
17 -# define DriDrivers            gamma i810 mga r128 radeon r200 \
18 +# define DriDrivers            gamma i810 mga r128 radeon r200 r300 \
19                                 TdfxDriDriver DevelDRIDrivers
20  #endif /*AMD64Arcitecture*/
21  
22 @@ -873,7 +873,7 @@
23                                 vga XF86OSCardDrivers XF86ExtraCardDrivers
24  # endif
25  # ifndef DriDrivers
26 -#  define DriDrivers           gamma tdfx mga r128 radeon r200 /*sis*/
27 +#  define DriDrivers           gamma tdfx mga r128 radeon r200 r300 /*sis*/
28  # endif
29  #endif
30  
31 @@ -969,7 +969,7 @@
32                                 XF86OSCardDrivers XF86ExtraCardDrivers
33  # endif
34  # ifndef DriDrivers
35 -#  define DriDrivers           gamma tdfx mga r128 radeon r200
36 +#  define DriDrivers           gamma tdfx mga r128 radeon r200 r300
37  # endif
38  #endif
39  
40 @@ -1066,7 +1066,7 @@
41  #  define TdfxDriDriver                /**/
42  # endif
43  # ifndef DriDrivers
44 -#  define DriDrivers           gamma tdfx mga r128 radeon r200
45 +#  define DriDrivers           gamma tdfx mga r128 radeon r200 r300
46  # endif
47  #endif
48  
49 @@ -1443,7 +1443,7 @@
50  #      define DriDrivers radeon
51  #    endif
52  #    if GlxBuiltInR200
53 -#      define DriDrivers r200
54 +#      define DriDrivers r200 r300
55  #    endif
56  #    if GlxBuiltInSIS
57  #      define DriDrivers sis
58 diff -urN X11-6.9.0/xc/config/cf/xorg.cf.orig X11-6.9.0/xc/config/cf/xorg.cf
59 --- X11-6.9.0/xc/config/cf/xorg.cf.orig 2005-12-27 23:20:10.000000000 +0100
60 +++ X11-6.9.0/xc/config/cf/xorg.cf      2005-12-27 23:19:52.000000000 +0100
61 @@ -425,7 +425,7 @@
62     /* SiS is 64-bit unclean as of this writing. */
63  #   define i386DRIDrivers /**/
64  #  endif
65 -#  define DriDrivers           i386DRIDrivers mga r128 radeon r200 tdfx
66 +#  define DriDrivers           i386DRIDrivers mga r128 radeon r200 r300 tdfx
67  # endif
68  #endif /* i386Architecture || ia64Architecture */
69  
70 @@ -462,7 +462,7 @@
71  
72  /* SiS is 64-bit unclean as of this writing. */
73  # ifndef DriDrivers
74 -#  define DriDrivers           i915 mga r128 radeon r200 tdfx
75 +#  define DriDrivers           i915 mga r128 radeon r200 r300 tdfx
76  # endif
77  #endif /*AMD64Arcitecture*/
78  
79 @@ -603,7 +603,7 @@
80   *  SiS is 64-bit unclean as of this writing. 
81   */  
82  # ifndef DriDrivers
83 -#  define DriDrivers           tdfx mga r128 radeon r200
84 +#  define DriDrivers           tdfx mga r128 radeon r200 r300
85  # endif
86  #endif /* AlphaArchitecture */
87  
88 @@ -637,7 +637,7 @@
89  # endif
90  /*  The tdfx driver needs Glide, which is not available for PPC. */
91  # ifndef DriDrivers
92 -#  define DriDrivers           mga r128 radeon r200
93 +#  define DriDrivers           mga r128 radeon r200 r300
94  # endif
95  #endif  /* PpcArchitecture || Mc68020Architecture */
96  
97 @@ -666,7 +666,7 @@
98                                 XF86OSCardDrivers XF86ExtraCardDrivers
99  # endif
100  # ifndef DriDrivers
101 -#  define DriDrivers           mga r128 radeon r200
102 +#  define DriDrivers           mga r128 radeon r200 r300
103  # endif
104  #endif
105  
106 @@ -985,7 +985,7 @@
107  #      define DriDrivers radeon
108  #    endif
109  #    if GlxBuiltInR200
110 -#      define DriDrivers r200
111 +#      define DriDrivers r200 r300
112  #    endif
113  #    if GlxBuiltInSIS
114  #      define DriDrivers sis
115 --- X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.mesa-   2005-11-15 01:09:43.000000000 +0100
116 +++ X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile 2005-11-15 01:09:43.000000000 +0100
117 @@ -0,0 +1,76 @@
118 +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile,v 1.9 3002/02/23 00:45:50 dawes Exp $
119 +
120 +#include <Threads.tmpl>
121 +
122 +#if GlxUseBuiltInDRIDriver
123 +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
124 +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
125 +#define DoExtraLib SharedLibGlx
126 +#define DoDebugLib DebugLibGlx
127 +#define DoProfileLib ProfileLibGlx
128 +#else
129 +#define DoNormalLib SharedLibGlxWithoutPIC
130 +#define DoSharedLib !SharedLibGlxWithoutPIC
131 +#define DoExtrasLib NO
132 +#define DoDebugLib NO
133 +#define DoProfileLib NO
134 +#endif
135 +
136 +#define MesaDrvCommonBuildDir ../common/
137 +#include "../common/Imakefile.inc"
138 +#include "../../../array_cache/Imakefile.inc"
139 +#include "../../../main/Imakefile.inc"
140 +#include "../../../math/Imakefile.inc"
141 +#include "../../../shader/Imakefile.inc"
142 +#include "../../../shader/grammar/Imakefile.inc"
143 +#include "../../../shader/slang/Imakefile.inc"
144 +#include "../../../shader/slang/library/Imakefile.inc"
145 +#include "../../../swrast/Imakefile.inc"
146 +#include "../../../swrast_setup/Imakefile.inc"
147 +#include "../../../tnl/Imakefile.inc"
148 +#include "../../../tnl_dd/Imakefile.inc"
149 +#include "../../../Imakefile.inc"
150 +#if defined(i386Architecture) && MesaUseX86Asm
151 +#include "../../../x86/Imakefile.inc"
152 +#endif
153 +#ifdef SparcArchitecture
154 +#include "../../../sparc/Imakefile.inc"
155 +#endif
156 +#define NeedToLinkMesaSrc
157 +#include "Imakefile.inc"
158 +
159 +      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
160 +     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
161 +
162 +      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
163 +               $(GLXLIBSRC)/dri/drm/xf86drmHash.o \
164 +               $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
165 +               $(GLXLIBSRC)/dri/drm/xf86drmSL.o
166 +
167 +         SRCS = $(R300SRCS)
168 +         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
169 +               $(MESA_ASM_OBJS) $(COMMONOBJS) $(R300OBJS) 
170 +
171 +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
172 +
173 +#include <Library.tmpl>
174 +
175 +LibraryObjectRule()
176 +
177 +SubdirLibraryRule($(R300OBJS))
178 +NormalLintTarget($(SRCS))
179 +
180 +#if !GlxUseBuiltInDRIDriver
181 +LIBNAME = r300_dri.so
182 +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
183 +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
184 +
185 +#ifdef GlxSoProf
186 +SOPROF_LIBNAME = _r300_dri_p
187 +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
188 +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
189 +#endif
190 +#endif
191 +
192 +DependTarget()
193 +
194 --- X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc.mesa-       2005-11-15 01:09:43.000000000 +0100
195 +++ X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc     2005-11-15 01:42:48.000000000 +0100
196 @@ -0,0 +1,188 @@
197 +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile.inc,v 1.2 3001/05/02 15:06:04 dawes Exp $
198 +
199 +#ifndef MesaDrvSrcDir
200 +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
201 +#endif
202 +
203 +MESADRVSRCDIR = MesaDrvSrcDir
204 +
205 +#ifndef MesaDrvR300BuildDir
206 +#define MesaDrvR300BuildDir /**/
207 +#endif
208 +MESADRVR300BUILDDIR = MesaDrvR300BuildDir
209 +
210 +#if Malloc0ReturnsNull
211 +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
212 +#endif
213 +
214 +#if BuildXF86DRI
215 +  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
216 + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
217 +               -I$(XINCLUDESRC) \
218 +               -I$(GLXLIBSRC)/glx \
219 +               -I$(GLXLIBSRC)/include \
220 +               -I$(SERVERSRC)/GL/dri \
221 +               -I$(XF86COMSRC) \
222 +               -I$(XF86OSSRC) \
223 +               -I$(DRMSRCDIR)/shared-core \
224 +               -I$(XF86DRIVERSRC)/ati \
225 +               -I$(GLXLIBSRC)/dri/drm
226 +#endif
227 +
228 +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
229 +               -I$(MESASRCDIR)/src/mesa/main \
230 +               -I$(MESASRCDIR)/src/mesa/glapi \
231 +               -I$(MESASRCDIR)/src/mesa/shader \
232 +               -I$(MESASRCDIR)/include \
233 +               -I$(MESADRVSRCDIR)/common \
234 +               -I$(MESADRVSRCDIR)/r300 \
235 +               -I$(MESADRVSRCDIR)/radeon \
236 +                -I$(MESADRVSRCDIR)/radeon/server
237 +   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
238 +
239 +   R300SRCS =  $(MESADRVR300BUILDDIR)r300_cmdbuf.c \
240 +               $(MESADRVR300BUILDDIR)r300_context.c \
241 +               $(MESADRVR300BUILDDIR)r300_fragprog.c \
242 +               /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.c */ \
243 +               $(MESADRVR300BUILDDIR)r300_ioctl.c \
244 +               $(MESADRVR300BUILDDIR)r300_maos.c \
245 +               $(MESADRVR300BUILDDIR)r300_render.c \
246 +               $(MESADRVR300BUILDDIR)r300_shader.c \
247 +               $(MESADRVR300BUILDDIR)r300_state.c \
248 +               $(MESADRVR300BUILDDIR)r300_tex.c \
249 +               $(MESADRVR300BUILDDIR)r300_texmem.c \
250 +               $(MESADRVR300BUILDDIR)r300_texprog.c \
251 +               $(MESADRVR300BUILDDIR)r300_texstate.c \
252 +               $(MESADRVR300BUILDDIR)r300_vertexprog.c \
253 +               $(MESADRVR300BUILDDIR)radeon_context.c \
254 +               $(MESADRVR300BUILDDIR)radeon_ioctl.c \
255 +               $(MESADRVR300BUILDDIR)radeon_lock.c \
256 +               $(MESADRVR300BUILDDIR)radeon_span.c \
257 +               $(MESADRVR300BUILDDIR)radeon_screen.c \
258 +               $(MESADRVR300BUILDDIR)radeon_state.c
259 +
260 +   R300OBJS =  $(MESADRVR300BUILDDIR)r300_cmdbuf.o \
261 +               $(MESADRVR300BUILDDIR)r300_context.o \
262 +               $(MESADRVR300BUILDDIR)r300_fragprog.o \
263 +               /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.o */ \
264 +               $(MESADRVR300BUILDDIR)r300_ioctl.o \
265 +               $(MESADRVR300BUILDDIR)r300_maos.o \
266 +               $(MESADRVR300BUILDDIR)r300_render.o \
267 +               $(MESADRVR300BUILDDIR)r300_shader.o \
268 +               $(MESADRVR300BUILDDIR)r300_state.o \
269 +               $(MESADRVR300BUILDDIR)r300_tex.o \
270 +               $(MESADRVR300BUILDDIR)r300_texmem.o \
271 +               $(MESADRVR300BUILDDIR)r300_texprog.o \
272 +               $(MESADRVR300BUILDDIR)r300_texstate.o \
273 +               $(MESADRVR300BUILDDIR)r300_vertexprog.o \
274 +               $(MESADRVR300BUILDDIR)radeon_context.o \
275 +               $(MESADRVR300BUILDDIR)radeon_ioctl.o \
276 +               $(MESADRVR300BUILDDIR)radeon_lock.o \
277 +               $(MESADRVR300BUILDDIR)radeon_span.o \
278 +               $(MESADRVR300BUILDDIR)radeon_screen.o \
279 +               $(MESADRVR300BUILDDIR)radeon_state.o
280 +
281 +   R300UOBJS = $(MESADRVR300BUILDDIR)unshared/r300_cmdbuf.o \
282 +               $(MESADRVR300BUILDDIR)unshared/r300_context.o \
283 +               $(MESADRVR300BUILDDIR)unshared/r300_fragprog.o \
284 +               /* broken? $(MESADRVR300BUILDDIR)unshared/r300_fragprog_swz.o */ \
285 +               $(MESADRVR300BUILDDIR)unshared/r300_ioctl.o \
286 +               $(MESADRVR300BUILDDIR)unshared/r300_maos.o \
287 +               $(MESADRVR300BUILDDIR)unshared/r300_render.o \
288 +               $(MESADRVR300BUILDDIR)unshared/r300_shader.o \
289 +               $(MESADRVR300BUILDDIR)unshared/r300_state.o \
290 +               $(MESADRVR300BUILDDIR)unshared/r300_tex.o \
291 +               $(MESADRVR300BUILDDIR)unshared/r300_texmem.o \
292 +               $(MESADRVR300BUILDDIR)unshared/r300_texprog.o \
293 +               $(MESADRVR300BUILDDIR)unshared/r300_texstate.o \
294 +               $(MESADRVR300BUILDDIR)unshared/r300_vertexprog.o \
295 +               $(MESADRVR300BUILDDIR)unshared/radeon_context.o \
296 +               $(MESADRVR300BUILDDIR)unshared/radeon_ioctl.o \
297 +               $(MESADRVR300BUILDDIR)unshared/radeon_lock.o \
298 +               $(MESADRVR300BUILDDIR)unshared/radeon_span.o \
299 +               $(MESADRVR300BUILDDIR)unshared/radeon_screen.o \
300 +               $(MESADRVR300BUILDDIR)unshared/radeon_state.o
301 +
302 +   R300DOBJS = $(MESADRVR300BUILDDIR)debugger/r300_cmdbuf.o \
303 +               $(MESADRVR300BUILDDIR)debugger/r300_context.o \
304 +               $(MESADRVR300BUILDDIR)debugger/r300_fragprog.o \
305 +               /* broken? $(MESADRVR300BUILDDIR)debugger/r300_fragprog_swz.o */ \
306 +               $(MESADRVR300BUILDDIR)debugger/r300_ioctl.o \
307 +               $(MESADRVR300BUILDDIR)debugger/r300_maos.o \
308 +               $(MESADRVR300BUILDDIR)debugger/r300_render.o \
309 +               $(MESADRVR300BUILDDIR)debugger/r300_shader.o \
310 +               $(MESADRVR300BUILDDIR)debugger/r300_state.o \
311 +               $(MESADRVR300BUILDDIR)debugger/r300_tex.o \
312 +               $(MESADRVR300BUILDDIR)debugger/r300_texmem.o \
313 +               $(MESADRVR300BUILDDIR)debugger/r300_texprog.o \
314 +               $(MESADRVR300BUILDDIR)debugger/r300_texstate.o \
315 +               $(MESADRVR300BUILDDIR)debugger/r300_vertexprog.o \
316 +               $(MESADRVR300BUILDDIR)debugger/radeon_context.o \
317 +               $(MESADRVR300BUILDDIR)debugger/radeon_ioctl.o \
318 +               $(MESADRVR300BUILDDIR)debugger/radeon_lock.o \
319 +               $(MESADRVR300BUILDDIR)debugger/radeon_span.o \
320 +               $(MESADRVR300BUILDDIR)debugger/radeon_screen.o \
321 +               $(MESADRVR300BUILDDIR)debugger/radeon_state.o
322 +
323 +   R300POBJS = $(MESADRVR300BUILDDIR)profiled/r300_cmdbuf.o \
324 +               $(MESADRVR300BUILDDIR)profiled/r300_context.o \
325 +               $(MESADRVR300BUILDDIR)profiled/r300_fragprog.o \
326 +               /* broken? $(MESADRVR300BUILDDIR)profiled/r300_fragprog_swz.o */ \
327 +               $(MESADRVR300BUILDDIR)profiled/r300_ioctl.o \
328 +               $(MESADRVR300BUILDDIR)profiled/r300_maos.o \
329 +               $(MESADRVR300BUILDDIR)profiled/r300_render.o \
330 +               $(MESADRVR300BUILDDIR)profiled/r300_shader.o \
331 +               $(MESADRVR300BUILDDIR)profiled/r300_state.o \
332 +               $(MESADRVR300BUILDDIR)profiled/r300_tex.o \
333 +               $(MESADRVR300BUILDDIR)profiled/r300_texmem.o \
334 +               $(MESADRVR300BUILDDIR)profiled/r300_texprog.o \
335 +               $(MESADRVR300BUILDDIR)profiled/r300_texstate.o \
336 +               $(MESADRVR300BUILDDIR)profiled/r300_vertexprog.o \
337 +               $(MESADRVR300BUILDDIR)profiled/radeon_context.o \
338 +               $(MESADRVR300BUILDDIR)profiled/radeon_ioctl.o \
339 +               $(MESADRVR300BUILDDIR)profiled/radeon_lock.o \
340 +               $(MESADRVR300BUILDDIR)profiled/radeon_span.o \
341 +               $(MESADRVR300BUILDDIR)profiled/radeon_screen.o \
342 +               $(MESADRVR300BUILDDIR)profiled/radeon_state.o
343 +
344 +#ifdef NeedToLinkMesaSrc
345 +LinkSourceFile(r300_context.c, $(MESADRVSRCDIR)/r300)
346 +LinkSourceFile(r300_context.h, $(MESADRVSRCDIR)/r300)
347 +LinkSourceFile(r300_cmdbuf.c, $(MESADRVSRCDIR)/r300)
348 +LinkSourceFile(r300_cmdbuf.h, $(MESADRVSRCDIR)/r300)
349 +LinkSourceFile(r300_emit.h, $(MESADRVSRCDIR)/r300)
350 +LinkSourceFile(r300_fixed_pipelines.h, $(MESADRVSRCDIR)/r300)
351 +LinkSourceFile(r300_ioctl.c, $(MESADRVSRCDIR)/r300)
352 +LinkSourceFile(r300_ioctl.h, $(MESADRVSRCDIR)/r300)
353 +LinkSourceFile(r300_maos.c, $(MESADRVSRCDIR)/r300)
354 +LinkSourceFile(r300_maos.h, $(MESADRVSRCDIR)/r300)
355 +LinkSourceFile(r300_program.h, $(MESADRVSRCDIR)/r300)
356 +LinkSourceFile(r300_render.c, $(MESADRVSRCDIR)/r300)
357 +LinkSourceFile(r300_reg.h, $(MESADRVSRCDIR)/r300)
358 +LinkSourceFile(r300_fragprog.c, $(MESADRVSRCDIR)/r300)
359 +LinkSourceFile(r300_fragprog.h, $(MESADRVSRCDIR)/r300)
360 +LinkSourceFile(r300_fragprog_swz.c, $(MESADRVSRCDIR)/r300)
361 +LinkSourceFile(r300_shader.c, $(MESADRVSRCDIR)/r300)
362 +LinkSourceFile(r300_state.c, $(MESADRVSRCDIR)/r300)
363 +LinkSourceFile(r300_state.h, $(MESADRVSRCDIR)/r300)
364 +LinkSourceFile(r300_tex.c, $(MESADRVSRCDIR)/r300)
365 +LinkSourceFile(r300_tex.h, $(MESADRVSRCDIR)/r300)
366 +LinkSourceFile(r300_texmem.c, $(MESADRVSRCDIR)/r300)
367 +LinkSourceFile(r300_texprog.c, $(MESADRVSRCDIR)/r300)
368 +LinkSourceFile(r300_texstate.c, $(MESADRVSRCDIR)/r300)
369 +LinkSourceFile(r300_vertexprog.c, $(MESADRVSRCDIR)/r300)
370 +LinkSourceFile(radeon_context.c, $(MESADRVSRCDIR)/r300)
371 +LinkSourceFile(radeon_context.h, $(MESADRVSRCDIR)/r300)
372 +LinkSourceFile(radeon_ioctl.c, $(MESADRVSRCDIR)/r300)
373 +LinkSourceFile(radeon_ioctl.h, $(MESADRVSRCDIR)/r300)
374 +LinkSourceFile(radeon_lock.c, $(MESADRVSRCDIR)/r300)
375 +LinkSourceFile(radeon_lock.h, $(MESADRVSRCDIR)/r300)
376 +LinkSourceFile(radeon_screen.c, $(MESADRVSRCDIR)/r300)
377 +LinkSourceFile(radeon_screen.h, $(MESADRVSRCDIR)/r300)
378 +LinkSourceFile(radeon_span.c, $(MESADRVSRCDIR)/r300)
379 +LinkSourceFile(radeon_span.h, $(MESADRVSRCDIR)/r300)
380 +LinkSourceFile(radeon_state.c, $(MESADRVSRCDIR)/r300)
381 +LinkSourceFile(radeon_state.h, $(MESADRVSRCDIR)/r300)
382 +LinkSourceFile(pixel_shader.h, $(MESADRVSRCDIR)/r300)
383 +LinkSourceFile(vertex_shader.h, $(MESADRVSRCDIR)/r300)
384 +#endif
This page took 0.052386 seconds and 3 git commands to generate.