X Strike Force X.Org X11 SVN commit: r526 - in branches/6.9/debian: . patches patches/general
Author: dnusinow
Date: 2005-08-12 18:31:33 -0500 (Fri, 12 Aug 2005)
New Revision: 526
Added:
branches/6.9/debian/patches/general/018_fix_mesa_build_issues.diff
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/series
Log:
Note that we're still FTBFS'ing, but this is one more issue down.
- Add new patches:
- general/018_fix_mesa_build_issues.diff to fix FTBFS
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-12 02:05:39 UTC (rev 525)
+++ branches/6.9/debian/changelog 2005-08-12 23:31:33 UTC (rev 526)
@@ -47,6 +47,8 @@
- debian/908_debian_exclude_non-free_fonts_and_docs.diff
- Update 000_stolen_from_linuxwacom_wacom_driver.diff to have version
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
-- David Nusinow <dnusinow@debian.org> Sat, 23 Jul 2005 17:40:13 -0400
Added: branches/6.9/debian/patches/general/018_fix_mesa_build_issues.diff
===================================================================
--- branches/6.9/debian/patches/general/018_fix_mesa_build_issues.diff 2005-08-12 02:05:39 UTC (rev 525)
+++ branches/6.9/debian/patches/general/018_fix_mesa_build_issues.diff 2005-08-12 23:31:33 UTC (rev 526)
@@ -0,0 +1,26 @@
+Index: 6.9/xc/lib/GL/mesa/shader/grammar/Imakefile
+===================================================================
+--- 6.9.orig/xc/lib/GL/mesa/shader/grammar/Imakefile 2005-08-12 11:37:20.000000000 -0400
++++ 6.9/xc/lib/GL/mesa/shader/grammar/Imakefile 2005-08-12 11:37:33.000000000 -0400
+@@ -31,7 +31,7 @@
+ # define LargePICTable YES
+ #endif
+
+-#define MesaShaderBuildDir /**/
++#define MesaGrammarBuildDir /**/
+ #define NeedToLinkMesaSrc
+ #include "Imakefile.inc"
+
+Index: 6.9/xc/lib/GL/mesa/shader/slang/Imakefile
+===================================================================
+--- 6.9.orig/xc/lib/GL/mesa/shader/slang/Imakefile 2005-08-02 22:08:40.000000000 -0400
++++ 6.9/xc/lib/GL/mesa/shader/slang/Imakefile 2005-08-12 11:37:50.000000000 -0400
+@@ -31,7 +31,7 @@
+ # define LargePICTable YES
+ #endif
+
+-#define MesaShaderBuildDir /**/
++#define MesaSlangBuildDir /**/
+ #define NeedToLinkMesaSrc
+ #include "Imakefile.inc"
+
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-08-12 02:05:39 UTC (rev 525)
+++ branches/6.9/debian/patches/series 2005-08-12 23:31:33 UTC (rev 526)
@@ -20,6 +20,7 @@
general/015_vesa_ifdef_afb_calls.diff -p0
general/016_ICE_subprotocol_reply_fix.diff -p0
general/017_fix_Xlib_depend_target.diff -p0
+general/018_fix_mesa_build_issues.diff
general/019_iso8859-15_Compose_fix.diff -p0
general/020_add_sigusr2_signal_handler.diff -p0
general/021_riscpc_ioport_fix.diff -p0
Reply to: