X Strike Force X.Org X11 SVN commit: r532 - in branches/6.9/debian: . patches patches/general
Author: dnusinow
Date: 2005-08-16 11:08:57 -0500 (Tue, 16 Aug 2005)
New Revision: 532
Added:
branches/6.9/debian/patches/general/032_static_dbg_server_hackfixes.diff
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/series
Log:
Add patch general/032_static_dbg_server_hackfixes.diff. Note that this
patch does not yet fix all FTBFS causes, but it makes a dent. I'd like to
possibly find a better way than the hacks in here.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-16 15:25:54 UTC (rev 531)
+++ branches/6.9/debian/changelog 2005-08-16 16:08:57 UTC (rev 532)
@@ -50,6 +50,7 @@
0.6.8 of xf86Wacom.c to get the patch to apply
- Add new patches:
- general/018_fix_mesa_build_issues.diff to fix FTBFS
+ - general/032_static_dbg_server_hackfixes.diff
-- David Nusinow <dnusinow@debian.org> Sat, 23 Jul 2005 17:40:13 -0400
Added: branches/6.9/debian/patches/general/032_static_dbg_server_hackfixes.diff
===================================================================
--- branches/6.9/debian/patches/general/032_static_dbg_server_hackfixes.diff 2005-08-16 15:25:54 UTC (rev 531)
+++ branches/6.9/debian/patches/general/032_static_dbg_server_hackfixes.diff 2005-08-16 16:08:57 UTC (rev 532)
@@ -0,0 +1,48 @@
+$Id$
+
+The static debuggable server fails to build in 6.9 because $(LIBSRC)/GL/glx
+is now empty and filled with symlinks by an Imakefile in that dir. Since we
+only build the server in the static debuggable portion of the build, this
+Imakefile never sets up the symlinks, so instead we go straight to the
+source for them.
+
+Index: 6.9/xc/programs/Xserver/GL/dri/Imakefile
+===================================================================
+--- 6.9.orig/xc/programs/Xserver/GL/dri/Imakefile 2005-08-15 23:50:47.000000000 -0400
++++ 6.9/xc/programs/Xserver/GL/dri/Imakefile 2005-08-15 23:51:18.000000000 -0400
+@@ -19,8 +19,8 @@
+ -I$(SERVERSRC)/mi -I$(FONTINCSRC)
+ DEFINES = $(GLX_DEFINES)
+
+-LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/glx)
+-LinkSourceFile(xf86dristr.h,$(LIBSRC)/GL/glx)
++LinkSourceFile(xf86dri.h, $(MESASRCDIR)/src/glx/x11)
++LinkSourceFile(xf86dristr.h, $(MESASRCDIR)/src/glx/x11)
+
+ ModuleObjectRule()
+ LibraryModuleTarget(dri,$(OBJS))
+Index: 6.9/xc/programs/Xserver/GL/mesa/X/Imakefile
+===================================================================
+--- 6.9.orig/xc/programs/Xserver/GL/mesa/X/Imakefile 2005-08-02 22:05:31.000000000 -0400
++++ 6.9/xc/programs/Xserver/GL/mesa/X/Imakefile 2005-08-15 23:53:19.000000000 -0400
+@@ -22,7 +22,7 @@
+ #endif
+
+
+-LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx)
++LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)
+
+ DRIVER_SRCS = $(XMESA_SRCS)
+ DRIVER_OBJS = $(XMESA_OBJS)
+Index: 6.9/xc/lib/X11/Xlibint.h
+===================================================================
+--- 6.9.orig/xc/lib/X11/Xlibint.h 2005-08-02 22:08:30.000000000 -0400
++++ 6.9/xc/lib/X11/Xlibint.h 2005-08-16 01:51:30.000000000 -0400
+@@ -42,7 +42,6 @@
+
+ #include <X11/Xlib.h>
+ #include <X11/Xproto.h> /* to declare xEvent */
+-#include <X11/XlibConf.h> /* for configured options like XTHREADS */
+
+ #ifdef WIN32
+ #define _XFlush _XFlushIt
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-08-16 15:25:54 UTC (rev 531)
+++ branches/6.9/debian/patches/series 2005-08-16 16:08:57 UTC (rev 532)
@@ -38,6 +38,7 @@
general/029_only_open_proc_bus_pci_devices_once.diff -p0
general/030_libvgahw_gcc4_volatile_fix.diff -p0
general/031_disable_libXft1.diff
+general/032_static_dbg_server_hackfixes.diff
general/032_fix_html_specs_generation.diff
general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
general/040_extend_netmouse_support.diff -p0
Reply to: