[Frugalware-darcs] upstart-mess: xorg-server-1.2.0-4-i686

AlexExtreme alex at alex-smith.me.uk
Sun Jun 3 10:33:43 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=upstart-mess;a=darcs_commitdiff;h=20070603083223-46e39-c1ce9a4799be76a4b5b1b7832a3f7c058ca13809.gz;

[xorg-server-1.2.0-4-i686
AlexExtreme <alex at alex-smith.me.uk>**20070603083223
  * Sync with -current. So that's why X was crashing =D
] {
hunk ./source/x11/xorg-server/FrugalBuild 8
-pkgrel=3
-mesaver=6.5.2
+pkgrel=4
+mesaver=6.5.3
hunk ./source/x11/xorg-server/FrugalBuild 15
-	'libxi>=1.1.0' 'freetype2>=2.3.1' 'mesa>=6.5.2-1' 'font-cursor-misc' 'font-misc-misc' \
+	'libxi>=1.1.0' 'freetype2>=2.3.1' 'mesa>=6.5.3-1' 'font-cursor-misc' 'font-misc-misc' \
hunk ./source/x11/xorg-server/FrugalBuild 23
-	'glproto' 'xf86driproto' 'libdrm>=2.3.0' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.3' \
+	'glproto' 'xf86driproto' 'libdrm>=2.3.0-2' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.3' \
hunk ./source/x11/xorg-server/FrugalBuild 39
-	i915tex.patch \
-	bug-9045.patch \
-	bug-9237.patch \
hunk ./source/x11/xorg-server/FrugalBuild 41
+	mesa-6.5.3.patch \
+	remove__GLinterface.patch \
hunk ./source/x11/xorg-server/FrugalBuild 51
-sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106'\
-          'ba860bb6ee57c02202342dfd5927464a068ea18f'\
-          'f31702e0029b2d68018598e73ed55c4d6c58367b'\
-          '859b98a4049400be152032fc09ceff2afe9e6dcf'\
-          '863ad92892785c3785b122bf54d0def4d4d2732c'\
-          '426b0b08617ec19cba41ab20f3891cab82f205a2'\
-          'b49bb4f22426fd0dab7551ef8907276214c9a3fa'\
-          '2937d6a50155cc16f73ae44b1e5b6e26cabbb86a'\
-          '31938c89a107ce89b06287b28c6d355ecaa13217'\
-          '0eb64d46172b6f2f4462c02dad7964c6d7656076'\
-          '067931e73ffd718f0715ddd69040c660821083d8'\
-          'af385a1f28afb4368719c634b4fb5d3991e9e432'\
-          '9d0d4102b26962cc453c4d66f5638f0cfb33c4fd'\
-          'f53de93da5e110867db8b1655b5798d2049f43ae'\
-          '22025bd7b96deec8cd31f24fe87a170f1c7898d1'\
+sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \
+          '8ab86e54976752028fbffcc21a9e0d2ebefeeff4' \
+          'f31702e0029b2d68018598e73ed55c4d6c58367b' \
+          '859b98a4049400be152032fc09ceff2afe9e6dcf' \
+          '863ad92892785c3785b122bf54d0def4d4d2732c' \
+          '426b0b08617ec19cba41ab20f3891cab82f205a2' \
+          'b49bb4f22426fd0dab7551ef8907276214c9a3fa' \
+          '2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
+          '31938c89a107ce89b06287b28c6d355ecaa13217' \
+          '0eb64d46172b6f2f4462c02dad7964c6d7656076' \
+          'f53de93da5e110867db8b1655b5798d2049f43ae' \
+          '22025bd7b96deec8cd31f24fe87a170f1c7898d1' \
+          'f257b56953e9756d38aa01c7f7f5d9a13160576c' \
+          '6473a13b65db3e44ba8b369a6a9c667887c41a52' \
hunk ./source/x11/xorg-server/FrugalBuild 72
-	Fpatch i915tex.patch
-        Fpatch bug-9045.patch
-        Fpatch bug-9237.patch
hunk ./source/x11/xorg-server/FrugalBuild 82
-	## this disables AIGLX by default , comment it to enable 
+	## this disables AIGLX by default , uncomment it to enable 
hunk ./source/x11/xorg-server/FrugalBuild 89
+	## as always xorg devels -> <-mesa devels mess ..
+	Fpatch mesa-6.5.3.patch
+	Fpatch remove__GLinterface.patch
+	## GCC 4.2.0 bug do **NOT** remove this hack or it will kill your box!!
+	## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
+	echo 'CFLAGS = @CFLAGS@ -O0' >> hw/xfree86/scanpci/Makefile.am
hunk ./source/x11/xorg-server/bug-9045.patch 1
-From: Xiang, Haihao <haihao.xiang at intel.com>
-Date: Fri, 8 Dec 2006 09:00:59 +0000 (+0800)
-Subject: fix bug#9045
-X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=5449f5a97524cb21194b20d05449d7211faaa51c
-
-fix bug#9045
----
-
---- a/src/mesa/drivers/dri/i965/intel_ioctl.c
-+++ b/src/mesa/drivers/dri/i965/intel_ioctl.c
-@@ -75,7 +75,7 @@ void intelWaitIrq( struct intel_context 
- {
-    if (!intel->no_hw) {
-       drmI830IrqWait iw;
--      int ret;
-+      int ret, lastdispatch;
-       
-       if (0)
- 	 fprintf(stderr, "%s %d\n", __FUNCTION__, seq );
-@@ -83,11 +83,12 @@ void intelWaitIrq( struct intel_context 
-       iw.irq_seq = seq;
- 	
-       do {
-+	 lastdispatch = intel->sarea->last_dispatch;
- 	 ret = drmCommandWrite( intel->driFd, DRM_I830_IRQ_WAIT, &iw, sizeof(iw) );
- 
- 	 /* This seems quite often to return before it should!?! 
- 	  */
--      } while (ret == -EAGAIN || ret == -EINTR || (ret == 0 && seq > intel->sarea->last_dispatch));
-+      } while (ret == -EAGAIN || ret == -EINTR || (ret == -EBUSY && lastdispatch != intel->sarea->last_dispatch) || (ret == 0 && seq > intel->sarea->last_dispatch));
-       
- 
-       if ( ret ) {
-
rmfile ./source/x11/xorg-server/bug-9045.patch
hunk ./source/x11/xorg-server/bug-9237.patch 1
-From: Xiang, Haihao <haihao.xiang at intel.com>
-Date: Fri, 8 Dec 2006 09:05:14 +0000 (+0800)
-Subject: fix bug#9237
-X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=f79360858d4c94629ef543a35e4e44a13419ac0e
-
-fix bug#9237
----
-
---- a/src/mesa/drivers/dri/i965/brw_misc_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
-@@ -88,10 +88,10 @@ static void upload_drawing_rect(struct b
-    if (brw->intel.numClipRects > 1) 
-       return; 
-  
--   x1 = dPriv->x;
--   y1 = dPriv->y;      
--   x2 = dPriv->x + dPriv->w;
--   y2 = dPriv->y + dPriv->h;
-+   x1 = brw->intel.pClipRects[0].x1;
-+   y1 = brw->intel.pClipRects[0].y1;
-+   x2 = brw->intel.pClipRects[0].x2;
-+   y2 = brw->intel.pClipRects[0].y2;
- 	 
-    if (x1 < 0) x1 = 0;
-    if (y1 < 0) y1 = 0;
-
rmfile ./source/x11/xorg-server/bug-9237.patch
hunk ./source/x11/xorg-server/i915tex.patch 1
-From: Michel DÃ?nzer <michel at tungstengraphics.com>
-Date: Thu, 7 Dec 2006 10:03:48 +0000 (+0100)
-Subject: i915tex: Recalculate viewport related hardware state in intelWindowMoved().
-X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=7a10d66590a4cebd2b453218e75fe82b02a3edcc
-
-i915tex: Recalculate viewport related hardware state in intelWindowMoved().
-
-This fixes vertically displaced rendering with some apps like Google Earth.
-
-Simplify other parts of the function somewhat.
----
-
---- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
-+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
-@@ -36,6 +36,7 @@
- #include "intel_batchbuffer.h"
- #include "context.h"
- #include "utils.h"
-+#include "drirenderbuffer.h"
- #include "framebuffer.h"
- #include "swrast/swrast.h"
- #include "vblank.h"
-@@ -183,6 +184,8 @@ void
- intelWindowMoved(struct intel_context *intel)
- {
-    GLcontext *ctx = &intel->ctx;
-+   __DRIdrawablePrivate *dPriv = intel->driDrawable;
-+   GLframebuffer *drawFb = (GLframebuffer *) dPriv->driverPrivate;
- 
-    if (!intel->ctx.DrawBuffer) {
-       /* when would this happen? -BP */
-@@ -194,7 +197,7 @@ intelWindowMoved(struct intel_context *i
-    }
-    else {
-       /* drawing to a window */
--      switch (intel->ctx.DrawBuffer->_ColorDrawBufferMask[0]) {
-+      switch (drawFb->_ColorDrawBufferMask[0]) {
-       case BUFFER_BIT_FRONT_LEFT:
-          intelSetFrontClipRects(intel);
-          break;
-@@ -207,14 +210,11 @@ intelWindowMoved(struct intel_context *i
-       }
-    }
- 
--   /* this update Mesa's notion of window size */
--   if (ctx->WinSysDrawBuffer) {
--      _mesa_resize_framebuffer(ctx, ctx->WinSysDrawBuffer,
--                               intel->driDrawable->w, intel->driDrawable->h);
--   }
-+   /* Update Mesa's notion of window size */
-+   driUpdateFramebufferSize(ctx, dPriv);
-+   drawFb->Initialized = GL_TRUE; /* XXX remove someday */
- 
--   if (intel->intelScreen->driScrnPriv->ddxMinor >= 7 && intel->driDrawable) {
--      __DRIdrawablePrivate *dPriv = intel->driDrawable;
-+   if (intel->intelScreen->driScrnPriv->ddxMinor >= 7) {
-       drmI830Sarea *sarea = intel->sarea;
-       drm_clip_rect_t drw_rect = { .x1 = dPriv->x, .x2 = dPriv->x + dPriv->w,
- 				   .y1 = dPriv->y, .y2 = dPriv->y + dPriv->h };
-@@ -245,6 +245,9 @@ intelWindowMoved(struct intel_context *i
-    /* Update hardware scissor */
-    ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
-                        ctx->Scissor.Width, ctx->Scissor.Height);
-+
-+   /* Re-calculate viewport related state */
-+   ctx->Driver.DepthRange( ctx, ctx->Viewport.Near, ctx->Viewport.Far );
- }
rmfile ./source/x11/xorg-server/i915tex.patch
addfile ./source/x11/xorg-server/mesa-6.5.3.patch
hunk ./source/x11/xorg-server/mesa-6.5.3.patch 1
+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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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 = -I at 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
addfile ./source/x11/xorg-server/remove__GLinterface.patch
hunk ./source/x11/xorg-server/remove__GLinterface.patch 1
+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*);
}


More information about the Frugalware-darcs mailing list