Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2b32fd09b7bbbced64a39b4b73cf1d120442934
commit f2b32fd09b7bbbced64a39b4b73cf1d120442934
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Jun 28 15:26:24 2009 +0200
xorg-server-1.6.1-8-i686
- drop unused patches
diff --git
a/source/x11/xorg-server/F-xorg-x11-server-1.1.1-graphics-expose.patch
b/source/x11/xorg-server/F-xorg-x11-server-1.1.1-graphics-expose.patch
deleted file mode 100644
index 4cebe16..0000000
--- a/source/x11/xorg-server/F-xorg-x11-server-1.1.1-graphics-expose.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-07-05
20:23:57.000000000 -0400
-+++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 23:54:03.000000000
-0400
-@@ -30,6 +30,7 @@
- #include "gcstruct.h"
- #include "pixmapstr.h"
- #include "cw.h"
-+#include "mi.h"
-
- #define SETUP_BACKING_DST(_pDst, _pGC) \
- cwGCPtr pGCPrivate = getCwGC (_pGC); \
-@@ -185,7 +186,7 @@
- int w, int h, int dstx, int dsty)
- {
- int odstx, odsty;
-- RegionPtr exposed = NULL;
-+ int osrcx, osrcy;
- SETUP_BACKING_DST(pDst, pGC);
- SETUP_BACKING_SRC(pSrc, pGC);
-
-@@ -193,19 +194,20 @@
-
- odstx = dstx;
- odsty = dsty;
-+ osrcx = srcx;
-+ osrcy = srcy;
- CW_OFFSET_XY_DST(dstx, dsty);
- CW_OFFSET_XY_SRC(srcx, srcy);
-
-- exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
-- pBackingGC, srcx, srcy, w, h,
-- dstx, dsty);
--
-- if (exposed != NULL)
-- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
--
-+ (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
-+ pBackingGC, srcx, srcy, w, h,
-+ dstx, dsty);
-+
- EPILOGUE(pGC);
-
-- return exposed;
-+ return miHandleExposures(pSrc, pDst, pGC,
-+ osrcx, osrcy, w, h,
-+ odstx, odsty, 0);
- }
-
- static RegionPtr
-@@ -213,7 +215,7 @@
- int w, int h, int dstx, int dsty, unsigned long plane)
- {
- int odstx, odsty;
-- RegionPtr exposed = NULL;
-+ int osrcx, osrcy;
- SETUP_BACKING_DST(pDst, pGC);
- SETUP_BACKING_SRC(pSrc, pGC);
-
-@@ -221,19 +223,20 @@
-
- odstx = dstx;
- odsty = dsty;
-+ osrcx = srcx;
-+ osrcy = srcy;
- CW_OFFSET_XY_DST(dstx, dsty);
- CW_OFFSET_XY_SRC(srcx, srcy);
-
-- exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
-- pBackingGC, srcx, srcy, w, h,
-- dstx, dsty, plane);
--
-- if (exposed != NULL)
-- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
-+ (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
-+ pBackingGC, srcx, srcy, w, h,
-+ dstx, dsty, plane);
-
- EPILOGUE(pGC);
-
-- return exposed;
-+ return miHandleExposures(pSrc, pDst, pGC,
-+ osrcx, osrcy, w, h,
-+ odstx, odsty, plane);
- }
-
- static void
diff --git a/source/x11/xorg-server/mesa-6.5.3.patch
b/source/x11/xorg-server/mesa-6.5.3.patch
deleted file mode 100644
index bb3e0cd..0000000
--- a/source/x11/xorg-server/mesa-6.5.3.patch
+++ /dev/null
@@ -1,407 +0,0 @@
-diff -Naur xorg-server-X11R7.2-1.2.0/configure.ac
xorg-server-X11R7.2-1.2.0-p/configure.ac
---- xorg-server-X11R7.2-1.2.0/configure.ac 2007-01-23 05:53:24.000000000
+0100
-+++ xorg-server-X11R7.2-1.2.0-p/configure.ac 2007-06-02 03:23:55.000000000
+0200
-@@ -1690,6 +1690,7 @@
- GL/mesa/swrast/Makefile
- GL/mesa/swrast_setup/Makefile
- GL/mesa/tnl/Makefile
-+GL/mesa/vbo/Makefile
- GL/mesa/X/Makefile
- include/Makefile
- afb/Makefile
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/glapi/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/glapi/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/main/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/main/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-@@ -62,13 +61,14 @@
- matrix.c \
- mipmap.c \
- mm.c \
-- occlude.c \
- pixel.c \
- points.c \
- polygon.c \
-+ queryobj.c \
- rastpos.c \
- rbadaptors.c \
- renderbuffer.c \
-+ shaders.c \
- state.c \
- stencil.c \
- texcompress.c \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -1,15 +1,15 @@
--SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
-+SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
-
- noinst_LTLIBRARIES = libGLcore.la
-
- libGLcore_la_SOURCES = dummy.c
- libGLcore_la_LIBADD = main/libmain.la \
- math/libmath.la \
-- array_cache/libac.la \
- swrast/libswrast.la \
- swrast_setup/libss.la \
- tnl/libtnl.la \
- shader/libshader.la \
- shader/grammar/libgrammar.la \
- shader/slang/libslang.la \
-+ vbo/libvbo.la \
- X/libX.la
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/math/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/math/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/grammar/Makefile.am
2007-01-23 04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/grammar/Makefile.am
2007-06-02 03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../../X \
-- -I../../array_cache \
- -I../../glapi \
- -I../../main \
- -I../../math \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -9,7 +9,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-@@ -28,8 +27,13 @@
- atifragshader.c \
- nvfragparse.c \
- nvprogram.c \
-- nvvertexec.c \
-- nvvertparse.c \
-+ nvvertparse.c \
-+ prog_debug.c \
-+ prog_execute.c \
-+ prog_instruction.c \
-+ prog_parameter.c \
-+ prog_print.c \
- program.c \
-- shaderobjects.c \
-- shaderobjects_3dlabs.c
-+ programopt.c \
-+ prog_statevars.c \
-+ shader_api.c
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/shader/slang/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/shader/slang/Makefile.am
2007-06-02 03:23:55.000000000 +0200
-@@ -8,7 +8,6 @@
- INCLUDES = -...@mesa_source@/include \
- -I../grammar \
- -I../../X \
-- -I../../array_cache \
- -I../../glapi \
- -I../../main \
- -I../../math \
-@@ -19,23 +18,24 @@
- -I../.. \
- -I$(top_srcdir)/hw/xfree86/os-support
-
--nodist_libslang_la_SOURCES = slang_analyse.c \
-- slang_assemble_assignment.c \
-- slang_assemble.c \
-- slang_assemble_conditional.c \
-- slang_assemble_constructor.c \
-- slang_assemble_typeinfo.c \
-+nodist_libslang_la_SOURCES = slang_builtin.c \
-+ slang_codegen.c \
- slang_compile.c \
- slang_compile_function.c \
- slang_compile_operation.c \
- slang_compile_struct.c \
- slang_compile_variable.c \
-- slang_execute.c \
-- slang_execute_x86.c \
-- slang_export.c \
-- slang_library_texsample.c \
-+ slang_emit.c \
-+ slang_ir.c \
-+ slang_label.c \
- slang_library_noise.c \
- slang_link.c \
-+ slang_log.c \
-+ slang_mem.c \
- slang_preprocess.c \
-+ slang_print.c \
-+ slang_simplify.c \
- slang_storage.c \
-- slang_utility.c
-+ slang_typeinfo.c \
-+ slang_utility.c \
-+ slang_vartable.c
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/swrast/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-@@ -24,7 +23,6 @@
- s_aatriangle.c \
- s_accum.c \
- s_alpha.c \
-- s_arbshader.c \
- s_atifragshader.c \
- s_bitmap.c \
- s_blend.c \
-@@ -36,11 +34,11 @@
- s_drawpix.c \
- s_feedback.c \
- s_fog.c \
-+ s_fragprog.c \
- s_imaging.c \
- s_lines.c \
- s_logic.c \
- s_masking.c \
-- s_nvfragprog.c \
- s_points.c \
- s_readpix.c \
- s_span.c \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/swrast_setup/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/swrast_setup/Makefile.am
2007-06-02 03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/tnl/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/tnl/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -7,7 +7,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-@@ -19,16 +18,9 @@
- -I.. \
- -I$(top_srcdir)/hw/xfree86/os-support
-
--nodist_libtnl_la_SOURCES = t_array_api.c \
-- t_array_import.c \
-- t_context.c \
-+nodist_libtnl_la_SOURCES = t_context.c \
-+ t_draw.c \
- t_pipeline.c \
-- t_save_api.c \
-- t_save_loopback.c \
-- t_save_playback.c \
-- t_vb_arbprogram.c \
-- t_vb_arbprogram_sse.c \
-- t_vb_arbshader.c \
- t_vb_cull.c \
- t_vb_fog.c \
- t_vb_light.c \
-@@ -42,9 +34,4 @@
- t_vertex.c \
- t_vertex_generic.c \
- t_vertex_sse.c \
-- t_vp_build.c \
-- t_vtx_api.c \
-- t_vtx_eval.c \
-- t_vtx_exec.c \
-- t_vtx_generic.c \
-- t_vtx_x86.c
-+ t_vp_build.c
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/vbo/Makefile.am 1970-01-01
01:00:00.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/vbo/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -0,0 +1,35 @@
-+noinst_LTLIBRARIES = libvbo.la
-+
-+AM_CFLAGS = \
-+ $(DIX_CFLAGS) \
-+ -DXFree86Server \
-+ @GLX_DEFINES@
-+
-+INCLUDES = -...@mesa_source@/include \
-+ -I../X \
-+ -I../glapi \
-+ -I../main \
-+ -I../math \
-+ -I../shader \
-+ -I../shader/slang \
-+ -I../shader/slang \
-+ -I../swrast \
-+ -I../swrast_setup \
-+ -I../tnl \
-+ -I.. \
-+ -I$(top_srcdir)/hw/xfree86/os-support
-+
-+nodist_libvbo_la_SOURCES = vbo_context.c \
-+ vbo_exec_api.c \
-+ vbo_exec_array.c \
-+ vbo_exec.c \
-+ vbo_exec_draw.c \
-+ vbo_exec_eval.c \
-+ vbo_rebase.c \
-+ vbo_save_api.c \
-+ vbo_save.c \
-+ vbo_save_draw.c \
-+ vbo_save_loopback.c \
-+ vbo_split.c \
-+ vbo_split_copy.c \
-+ vbo_split_inplace.c
-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
---- xorg-server-X11R7.2-1.2.0/GL/mesa/X/Makefile.am 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/mesa/X/Makefile.am 2007-06-02
03:23:55.000000000 +0200
-@@ -2,7 +2,6 @@
-
- INCLUDES = -...@mesa_source@/include \
- -I../X \
-- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
-@@ -21,18 +20,15 @@
- AM_CFLAGS = \
- $(DIX_CFLAGS) \
- -DXFree86Server \
-- @GLX_DEFINES@ \
-- -DXFree86Server
-+ @GLX_DEFINES@
-
--libX_la_SOURCES = xf86glx.c \
-- xf86glx_util.c \
-- xf86glx_util.h \
-- xf86glxint.h
-+libX_la_SOURCES = xf86glx.c
-
- nodist_libX_la_SOURCES = \
- xm_api.c \
- xm_buffer.c \
- xm_dd.c \
-+ xm_image.c \
- xm_line.c \
- xm_span.c \
- xm_tri.c \
-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
---- xorg-server-X11R7.2-1.2.0/GL/symlink-mesa.sh 2007-01-23
04:13:14.000000000 +0100
-+++ xorg-server-X11R7.2-1.2.0-p/GL/symlink-mesa.sh 2007-06-02
03:23:55.000000000 +0200
-@@ -85,15 +85,6 @@
- done
- }
-
--symlink_mesa_ac() {
-- src_dir src/mesa/array_cache
-- dst_dir mesa/array_cache
--
-- for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
-- action `basename $src`
-- done
--}
--
- symlink_mesa_swrast() {
- src_dir src/mesa/swrast
- dst_dir mesa/swrast
-@@ -157,6 +148,15 @@
- done
- }
-
-+symlink_mesa_vbo() {
-+ src_dir src/mesa/vbo
-+ dst_dir mesa/vbo
-+
-+ for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
-+ action `basename $src`
-+ done
-+}
-+
- symlink_mesa_x() {
- src_dir src/mesa/drivers/x11
- dst_dir mesa/X
-@@ -168,6 +168,8 @@
- action xm_api.c
- action xm_buffer.c
- action xm_dd.c
-+ action xm_image.c
-+ action xm_image.h
- action xm_line.c
- action xm_span.c
- action xm_tri.c
-@@ -203,7 +205,6 @@
- symlink_mesa() {
- symlink_mesa_main
- symlink_mesa_math
-- symlink_mesa_ac
- symlink_mesa_swrast
- symlink_mesa_ss
- symlink_mesa_tnl
-@@ -215,6 +216,7 @@
- symlink_mesa_glapi
- symlink_mesa_ppc
- symlink_mesa_sparc
-+ symlink_mesa_vbo
- symlink_mesa_x86
- symlink_mesa_x8664
- }
-@@ -225,9 +227,6 @@
- dst_dir glx
-
- action indirect_size.h
--
-- src_dir src/mesa/drivers/dri/common
--
- action glcontextmodes.c
- action glcontextmodes.h
-
-@@ -289,9 +288,9 @@
- }
-
- usage() {
-- echo symlink.sh src-dir dst-dir
-- echo src-dir: the xc directory of the monolithic source tree
-- echo dst-dir: the modular source tree containing proto, app, lib, ...
-+ echo symlink-mesa.sh src-dir dst-dir
-+ echo src-dir: the Mesa source directory
-+ echo dst-dir: the GL subdirectory of the Xserver modular tree
- }
-
- # Check commandline args
diff --git a/source/x11/xorg-server/remove__GLinterface.patch
b/source/x11/xorg-server/remove__GLinterface.patch
deleted file mode 100644
index 600bac2..0000000
--- a/source/x11/xorg-server/remove__GLinterface.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur GL.orig/glx/glxext.c GL/glx/glxext.c
---- GL.orig/glx/glxext.c 2006-12-01 03:40:10.000000000 +0200
-+++ GL/glx/glxext.c 2007-04-23 01:23:39.900111785 +0300
-@@ -275,7 +275,7 @@
- /*
- ** The GL was will call this routine if an error occurs.
- */
--void __glXErrorCallBack(__GLinterface *gc, GLenum code)
-+void __glXErrorCallBack(GLenum code)
- {
- errorOccured = GL_TRUE;
- }
-diff -Nur GL.orig/glx/glxext.h GL/glx/glxext.h
---- GL.orig/glx/glxext.h 2006-09-18 09:04:17.000000000 +0300
-+++ GL/glx/glxext.h 2007-04-23 01:23:39.900111785 +0300
-@@ -66,7 +66,7 @@
- extern GLboolean __glXFreeContext(__GLXcontext *glxc);
- extern void __glXFlushContextCache(void);
-
--extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
-+extern void __glXErrorCallBack(GLenum code);
- extern void __glXClearErrorOccured(void);
- extern GLboolean __glXErrorOccured(void);
- extern void __glXResetLargeCommandStatus(__GLXclientState*);
-diff -Nur hw.orig/dmx/glxProxy/glxext.h hw/dmx/glxProxy/glxext.h
---- hw.orig/dmx/glxProxy/glxext.h 2006-09-18 09:04:17.000000000 +0300
-+++ hw/dmx/glxProxy/glxext.h 2006-09-18 09:04:17.000000000 +0300
-@@ -67,7 +67,7 @@
-
- extern void __glXNoSuchRenderOpcode(GLbyte*);
- extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
--extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
-+extern void __glXErrorCallBack(GLenum code);
- extern void __glXClearErrorOccured(void);
- extern GLboolean __glXErrorOccured(void);
- extern void __glXResetLargeCommandStatus(__GLXclientState*);
diff --git a/source/x11/xorg-server/xorg-x11-server-1.1.1-mesa-6.5.1.patch
b/source/x11/xorg-server/xorg-x11-server-1.1.1-mesa-6.5.1.patch
deleted file mode 100644
index ae6c1a8..0000000
--- a/source/x11/xorg-server/xorg-x11-server-1.1.1-mesa-6.5.1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Naur xorg-server-1.1.1.orig/GL/mesa/main/Makefile.am
xorg-server-1.1.1/GL/mesa/main/Makefile.am
---- xorg-server-1.1.1.orig/GL/mesa/main/Makefile.am 2006-09-25
10:49:54.000000000 +0200
-+++ xorg-server-1.1.1/GL/mesa/main/Makefile.am 2006-09-25 10:50:44.000000000
+0200
-@@ -29,6 +29,7 @@
- api_loopback.c \
- api_noop.c \
- api_validate.c \
-+ arrayobj.c \
- attrib.c \
- blend.c \
- bufferobj.c \
-@@ -67,6 +68,7 @@
- points.c \
- polygon.c \
- rastpos.c \
-+ rbadaptors.c \
- renderbuffer.c \
- state.c \
- stencil.c \
-diff -Naur xorg-server-1.1.1.orig/GL/mesa/main/Makefile.in
xorg-server-1.1.1/GL/mesa/main/Makefile.in
---- xorg-server-1.1.1.orig/GL/mesa/main/Makefile.in 2006-09-25
10:49:54.000000000 +0200
-+++ xorg-server-1.1.1/GL/mesa/main/Makefile.in 2006-09-25 10:52:17.000000000
+0200
-@@ -57,14 +57,14 @@
- libmain_la_LIBADD =
- @need_vsnprintf_t...@am__objects_1 = vsnprintf.lo
- nodist_libmain_la_OBJECTS = accum.lo api_arrayelt.lo api_loopback.lo \
-- api_noop.lo api_validate.lo attrib.lo blend.lo bufferobj.lo \
-+ api_noop.lo api_validate.lo arrayobj.lo attrib.lo blend.lo bufferobj.lo
\
- buffers.lo clip.lo colortab.lo context.lo convolve.lo debug.lo \
- depth.lo depthstencil.lo dlist.lo drawpix.lo enable.lo \
- enums.lo eval.lo execmem.lo extensions.lo fbobject.lo \
- feedback.lo fog.lo framebuffer.lo get.lo getstring.lo hash.lo \
- hint.lo histogram.lo image.lo imports.lo light.lo lines.lo \
- matrix.lo mm.lo occlude.lo pixel.lo points.lo polygon.lo \
-- rastpos.lo renderbuffer.lo state.lo stencil.lo texcompress.lo \
-+ rastpos.lo rbadaptors.c renderbuffer.lo state.lo stencil.lo
texcompress.lo \
- texcompress_fxt1.lo texcompress_s3tc.lo texenvprogram.lo \
- texformat.lo teximage.lo texobj.lo texrender.lo texstate.lo \
- texstore.lo varray.lo $(am__objects_1) vtxfmt.lo
-@@ -563,6 +563,7 @@
- api_loopback.c \
- api_noop.c \
- api_validate.c \
-+ arrayobj.c \
- attrib.c \
- blend.c \
- bufferobj.c \
-@@ -601,6 +602,7 @@
- points.c \
- polygon.c \
- rastpos.c \
-+ rbadaptors.c \
- renderbuffer.c \
- state.c \
- stencil.c \
-@@ -674,6 +676,7 @@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/api_loopback....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/api_noop....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/api_validate....@am__quote@
-...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/arrayobj....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/attrib....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/blend....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/bufferobj....@am__quote@
-@@ -712,6 +715,7 @@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/points....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/polygon....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/rastpos....@am__quote@
-...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/rbadaptors....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/renderbuffer....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/state....@am__quote@
- @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/stencil....@am__quote@
-diff -Naur xorg-server-1.1.1.orig/GL/symlink-mesa.sh
xorg-server-1.1.1/GL/symlink-mesa.sh
---- xorg-server-1.1.1.orig/GL/symlink-mesa.sh 2006-09-25 10:49:54.000000000
+0200
-+++ xorg-server-1.1.1/GL/symlink-mesa.sh 2006-09-25 10:50:44.000000000
+0200
-@@ -88,8 +88,11 @@
- action api_noop.h
- action api_validate.c
- action api_validate.h
-+ action arrayobj.c
-+ action arrayobj.h
- action attrib.c
- action attrib.h
-+ action bitset.h
- action blend.c
- action blend.h
- action bufferobj.c
-@@ -168,6 +171,8 @@
- action polygon.h
- action rastpos.c
- action rastpos.h
-+ action rbadaptors.c
-+ action rbadaptors.h
- action renderbuffer.c
- action renderbuffer.h
- action simple_list.h
-@@ -463,7 +468,7 @@
- action slang_core_gc.h
- action slang_fragment_builtin_gc.h
- action slang_shader_syn.h
-- action slang_version_syn.h
-+ action slang_pp_version_syn.h
- action slang_vertex_builtin_gc.h
- }
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
