Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.2.0-mesa-6.5.3.patch

    Contents of /trunk/xorg-server/patches/xorg-server-1.2.0-mesa-6.5.3.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 238 - (show annotations) (download)
    Sun Jul 1 02:19:11 2007 UTC (16 years, 10 months ago) by niro
    File size: 14044 byte(s) 
    -patches for xorg-server-1.2.0-r4
    1 diff -Naur xorg-server-X11R7.2-1.2.0/configure.ac xorg-server-X11R7.2-1.2.0-p/configure.ac
    2 --- xorg-server-X11R7.2-1.2.0/configure.ac 2007-01-23 05:53:24.000000000 +0100
    3 +++ xorg-server-X11R7.2-1.2.0-p/configure.ac 2007-06-02 03:23:55.000000000 +0200
    4 @@ -1690,6 +1690,7 @@
    5 GL/mesa/swrast/Makefile
    6 GL/mesa/swrast_setup/Makefile
    7 GL/mesa/tnl/Makefile
    8 +GL/mesa/vbo/Makefile
    9 GL/mesa/X/Makefile
    10 include/Makefile
    11 afb/Makefile
    12 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/glapi/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/glapi/Makefile.am
    13 --- xorg-server-X11R7.2-1.2.0/GL/mesa/glapi/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    14 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/glapi/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    15 @@ -7,7 +7,6 @@
    16
    17 INCLUDES = -I@MESA_SOURCE@/include \
    18 -I../X \
    19 - -I../array_cache \
    20 -I../glapi \
    21 -I../main \
    22 -I../math \
    23 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/main/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/main/Makefile.am
    24 --- xorg-server-X11R7.2-1.2.0/GL/mesa/main/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    25 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/main/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    26 @@ -7,7 +7,6 @@
    27
    28 INCLUDES = -I@MESA_SOURCE@/include \
    29 -I../X \
    30 - -I../array_cache \
    31 -I../glapi \
    32 -I../main \
    33 -I../math \
    34 @@ -62,13 +61,14 @@
    35 matrix.c \
    36 mipmap.c \
    37 mm.c \
    38 - occlude.c \
    39 pixel.c \
    40 points.c \
    41 polygon.c \
    42 + queryobj.c \
    43 rastpos.c \
    44 rbadaptors.c \
    45 renderbuffer.c \
    46 + shaders.c \
    47 state.c \
    48 stencil.c \
    49 texcompress.c \
    50 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/Makefile.am
    51 --- xorg-server-X11R7.2-1.2.0/GL/mesa/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    52 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    53 @@ -1,15 +1,15 @@
    54 -SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
    55 +SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
    56
    57 noinst_LTLIBRARIES = libGLcore.la
    58
    59 libGLcore_la_SOURCES = dummy.c
    60 libGLcore_la_LIBADD = main/libmain.la \
    61 math/libmath.la \
    62 - array_cache/libac.la \
    63 swrast/libswrast.la \
    64 swrast_setup/libss.la \
    65 tnl/libtnl.la \
    66 shader/libshader.la \
    67 shader/grammar/libgrammar.la \
    68 shader/slang/libslang.la \
    69 + vbo/libvbo.la \
    70 X/libX.la
    71 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/math/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/math/Makefile.am
    72 --- xorg-server-X11R7.2-1.2.0/GL/mesa/math/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    73 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/math/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    74 @@ -7,7 +7,6 @@
    75
    76 INCLUDES = -I@MESA_SOURCE@/include \
    77 -I../X \
    78 - -I../array_cache \
    79 -I../glapi \
    80 -I../main \
    81 -I../math \
    82 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/shader/grammar/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/grammar/Makefile.am
    83 --- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/grammar/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    84 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/grammar/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    85 @@ -7,7 +7,6 @@
    86
    87 INCLUDES = -I@MESA_SOURCE@/include \
    88 -I../../X \
    89 - -I../../array_cache \
    90 -I../../glapi \
    91 -I../../main \
    92 -I../../math \
    93 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/shader/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/Makefile.am
    94 --- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    95 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    96 @@ -9,7 +9,6 @@
    97
    98 INCLUDES = -I@MESA_SOURCE@/include \
    99 -I../X \
    100 - -I../array_cache \
    101 -I../glapi \
    102 -I../main \
    103 -I../math \
    104 @@ -28,8 +27,13 @@
    105 atifragshader.c \
    106 nvfragparse.c \
    107 nvprogram.c \
    108 - nvvertexec.c \
    109 - nvvertparse.c \
    110 + nvvertparse.c \
    111 + prog_debug.c \
    112 + prog_execute.c \
    113 + prog_instruction.c \
    114 + prog_parameter.c \
    115 + prog_print.c \
    116 program.c \
    117 - shaderobjects.c \
    118 - shaderobjects_3dlabs.c
    119 + programopt.c \
    120 + prog_statevars.c \
    121 + shader_api.c
    122 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/shader/slang/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/slang/Makefile.am
    123 --- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/slang/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    124 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/slang/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    125 @@ -8,7 +8,6 @@
    126 INCLUDES = -I@MESA_SOURCE@/include \
    127 -I../grammar \
    128 -I../../X \
    129 - -I../../array_cache \
    130 -I../../glapi \
    131 -I../../main \
    132 -I../../math \
    133 @@ -19,23 +18,24 @@
    134 -I../.. \
    135 -I$(top_srcdir)/hw/xfree86/os-support
    136
    137 -nodist_libslang_la_SOURCES = slang_analyse.c \
    138 - slang_assemble_assignment.c \
    139 - slang_assemble.c \
    140 - slang_assemble_conditional.c \
    141 - slang_assemble_constructor.c \
    142 - slang_assemble_typeinfo.c \
    143 +nodist_libslang_la_SOURCES = slang_builtin.c \
    144 + slang_codegen.c \
    145 slang_compile.c \
    146 slang_compile_function.c \
    147 slang_compile_operation.c \
    148 slang_compile_struct.c \
    149 slang_compile_variable.c \
    150 - slang_execute.c \
    151 - slang_execute_x86.c \
    152 - slang_export.c \
    153 - slang_library_texsample.c \
    154 + slang_emit.c \
    155 + slang_ir.c \
    156 + slang_label.c \
    157 slang_library_noise.c \
    158 slang_link.c \
    159 + slang_log.c \
    160 + slang_mem.c \
    161 slang_preprocess.c \
    162 + slang_print.c \
    163 + slang_simplify.c \
    164 slang_storage.c \
    165 - slang_utility.c
    166 + slang_typeinfo.c \
    167 + slang_utility.c \
    168 + slang_vartable.c
    169 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/swrast/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast/Makefile.am
    170 --- xorg-server-X11R7.2-1.2.0/GL/mesa/swrast/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    171 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    172 @@ -7,7 +7,6 @@
    173
    174 INCLUDES = -I@MESA_SOURCE@/include \
    175 -I../X \
    176 - -I../array_cache \
    177 -I../glapi \
    178 -I../main \
    179 -I../math \
    180 @@ -24,7 +23,6 @@
    181 s_aatriangle.c \
    182 s_accum.c \
    183 s_alpha.c \
    184 - s_arbshader.c \
    185 s_atifragshader.c \
    186 s_bitmap.c \
    187 s_blend.c \
    188 @@ -36,11 +34,11 @@
    189 s_drawpix.c \
    190 s_feedback.c \
    191 s_fog.c \
    192 + s_fragprog.c \
    193 s_imaging.c \
    194 s_lines.c \
    195 s_logic.c \
    196 s_masking.c \
    197 - s_nvfragprog.c \
    198 s_points.c \
    199 s_readpix.c \
    200 s_span.c \
    201 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/swrast_setup/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast_setup/Makefile.am
    202 --- xorg-server-X11R7.2-1.2.0/GL/mesa/swrast_setup/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    203 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast_setup/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    204 @@ -7,7 +7,6 @@
    205
    206 INCLUDES = -I@MESA_SOURCE@/include \
    207 -I../X \
    208 - -I../array_cache \
    209 -I../glapi \
    210 -I../main \
    211 -I../math \
    212 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/tnl/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/tnl/Makefile.am
    213 --- xorg-server-X11R7.2-1.2.0/GL/mesa/tnl/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    214 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/tnl/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    215 @@ -7,7 +7,6 @@
    216
    217 INCLUDES = -I@MESA_SOURCE@/include \
    218 -I../X \
    219 - -I../array_cache \
    220 -I../glapi \
    221 -I../main \
    222 -I../math \
    223 @@ -19,16 +18,9 @@
    224 -I.. \
    225 -I$(top_srcdir)/hw/xfree86/os-support
    226
    227 -nodist_libtnl_la_SOURCES = t_array_api.c \
    228 - t_array_import.c \
    229 - t_context.c \
    230 +nodist_libtnl_la_SOURCES = t_context.c \
    231 + t_draw.c \
    232 t_pipeline.c \
    233 - t_save_api.c \
    234 - t_save_loopback.c \
    235 - t_save_playback.c \
    236 - t_vb_arbprogram.c \
    237 - t_vb_arbprogram_sse.c \
    238 - t_vb_arbshader.c \
    239 t_vb_cull.c \
    240 t_vb_fog.c \
    241 t_vb_light.c \
    242 @@ -42,9 +34,4 @@
    243 t_vertex.c \
    244 t_vertex_generic.c \
    245 t_vertex_sse.c \
    246 - t_vp_build.c \
    247 - t_vtx_api.c \
    248 - t_vtx_eval.c \
    249 - t_vtx_exec.c \
    250 - t_vtx_generic.c \
    251 - t_vtx_x86.c
    252 + t_vp_build.c
    253 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/vbo/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/vbo/Makefile.am
    254 --- xorg-server-X11R7.2-1.2.0/GL/mesa/vbo/Makefile.am 1970-01-01 01:00:00.000000000 +0100
    255 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/vbo/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    256 @@ -0,0 +1,35 @@
    257 +noinst_LTLIBRARIES = libvbo.la
    258 +
    259 +AM_CFLAGS = \
    260 + $(DIX_CFLAGS) \
    261 + -DXFree86Server \
    262 + @GLX_DEFINES@
    263 +
    264 +INCLUDES = -I@MESA_SOURCE@/include \
    265 + -I../X \
    266 + -I../glapi \
    267 + -I../main \
    268 + -I../math \
    269 + -I../shader \
    270 + -I../shader/slang \
    271 + -I../shader/slang \
    272 + -I../swrast \
    273 + -I../swrast_setup \
    274 + -I../tnl \
    275 + -I.. \
    276 + -I$(top_srcdir)/hw/xfree86/os-support
    277 +
    278 +nodist_libvbo_la_SOURCES = vbo_context.c \
    279 + vbo_exec_api.c \
    280 + vbo_exec_array.c \
    281 + vbo_exec.c \
    282 + vbo_exec_draw.c \
    283 + vbo_exec_eval.c \
    284 + vbo_rebase.c \
    285 + vbo_save_api.c \
    286 + vbo_save.c \
    287 + vbo_save_draw.c \
    288 + vbo_save_loopback.c \
    289 + vbo_split.c \
    290 + vbo_split_copy.c \
    291 + vbo_split_inplace.c
    292 diff -Naur xorg-server-X11R7.2-1.2.0/GL/mesa/X/Makefile.am xorg-server-X11R7.2-1.2.0-p/GL/mesa/X/Makefile.am
    293 --- xorg-server-X11R7.2-1.2.0/GL/mesa/X/Makefile.am 2007-01-23 04:13:14.000000000 +0100
    294 +++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/X/Makefile.am 2007-06-02 03:23:55.000000000 +0200
    295 @@ -2,7 +2,6 @@
    296
    297 INCLUDES = -I@MESA_SOURCE@/include \
    298 -I../X \
    299 - -I../array_cache \
    300 -I../glapi \
    301 -I../main \
    302 -I../math \
    303 @@ -21,18 +20,15 @@
    304 AM_CFLAGS = \
    305 $(DIX_CFLAGS) \
    306 -DXFree86Server \
    307 - @GLX_DEFINES@ \
    308 - -DXFree86Server
    309 + @GLX_DEFINES@
    310
    311 -libX_la_SOURCES = xf86glx.c \
    312 - xf86glx_util.c \
    313 - xf86glx_util.h \
    314 - xf86glxint.h
    315 +libX_la_SOURCES = xf86glx.c
    316
    317 nodist_libX_la_SOURCES = \
    318 xm_api.c \
    319 xm_buffer.c \
    320 xm_dd.c \
    321 + xm_image.c \
    322 xm_line.c \
    323 xm_span.c \
    324 xm_tri.c \
    325 diff -Naur xorg-server-X11R7.2-1.2.0/GL/symlink-mesa.sh xorg-server-X11R7.2-1.2.0-p/GL/symlink-mesa.sh
    326 --- xorg-server-X11R7.2-1.2.0/GL/symlink-mesa.sh 2007-01-23 04:13:14.000000000 +0100
    327 +++ xorg-server-X11R7.2-1.2.0-p/GL/symlink-mesa.sh 2007-06-02 03:23:55.000000000 +0200
    328 @@ -85,15 +85,6 @@
    329 done
    330 }
    331
    332 -symlink_mesa_ac() {
    333 - src_dir src/mesa/array_cache
    334 - dst_dir mesa/array_cache
    335 -
    336 - for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
    337 - action `basename $src`
    338 - done
    339 -}
    340 -
    341 symlink_mesa_swrast() {
    342 src_dir src/mesa/swrast
    343 dst_dir mesa/swrast
    344 @@ -157,6 +148,15 @@
    345 done
    346 }
    347
    348 +symlink_mesa_vbo() {
    349 + src_dir src/mesa/vbo
    350 + dst_dir mesa/vbo
    351 +
    352 + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
    353 + action `basename $src`
    354 + done
    355 +}
    356 +
    357 symlink_mesa_x() {
    358 src_dir src/mesa/drivers/x11
    359 dst_dir mesa/X
    360 @@ -168,6 +168,8 @@
    361 action xm_api.c
    362 action xm_buffer.c
    363 action xm_dd.c
    364 + action xm_image.c
    365 + action xm_image.h
    366 action xm_line.c
    367 action xm_span.c
    368 action xm_tri.c
    369 @@ -203,7 +205,6 @@
    370 symlink_mesa() {
    371 symlink_mesa_main
    372 symlink_mesa_math
    373 - symlink_mesa_ac
    374 symlink_mesa_swrast
    375 symlink_mesa_ss
    376 symlink_mesa_tnl
    377 @@ -215,6 +216,7 @@
    378 symlink_mesa_glapi
    379 symlink_mesa_ppc
    380 symlink_mesa_sparc
    381 + symlink_mesa_vbo
    382 symlink_mesa_x86
    383 symlink_mesa_x8664
    384 }
    385 @@ -225,9 +227,6 @@
    386 dst_dir glx
    387
    388 action indirect_size.h
    389 -
    390 - src_dir src/mesa/drivers/dri/common
    391 -
    392 action glcontextmodes.c
    393 action glcontextmodes.h
    394
    395 @@ -289,9 +288,9 @@
    396 }
    397
    398 usage() {
    399 - echo symlink.sh src-dir dst-dir
    400 - echo src-dir: the xc directory of the monolithic source tree
    401 - echo dst-dir: the modular source tree containing proto, app, lib, ...
    402 + echo symlink-mesa.sh src-dir dst-dir
    403 + echo src-dir: the Mesa source directory
    404 + echo dst-dir: the GL subdirectory of the Xserver modular tree
    405 }
    406
    407 # Check commandline args