X Strike Force X.Org X11 SVN commit: r1033 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-01-08 19:02:43 -0500 (Sun, 08 Jan 2006)
New Revision: 1033
Added:
trunk/debian/patches/general/018_mesa_debug_fglrx.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Add general/018_mesa_debug_fglrx.diff. The default mesa build was
generating symbols which were interfering with the use of the fglrx
drivers for some people. (closes: #274862)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-08 23:26:05 UTC (rev 1032)
+++ trunk/debian/changelog 2006-01-09 00:02:43 UTC (rev 1033)
@@ -17,8 +17,11 @@
killing xlibs-dev. Currently only three packages in Debian build-depend on
this package, so we'll target them in the same effort as getting rid of
xlibs-dev.
+ * Add general/018_mesa_debug_fglrx.diff. The default mesa build was
+ generating symbols which were interfering with the use of the fglrx
+ drivers for some people. (closes: #274862)
- -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 18:23:35 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 18:58:46 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Added: trunk/debian/patches/general/018_mesa_debug_fglrx.diff
===================================================================
--- trunk/debian/patches/general/018_mesa_debug_fglrx.diff 2006-01-08 23:26:05 UTC (rev 1032)
+++ trunk/debian/patches/general/018_mesa_debug_fglrx.diff 2006-01-09 00:02:43 UTC (rev 1033)
@@ -0,0 +1,107 @@
+--- xc-old/lib/GL/mesa/math/Imakefile.inc 2005-02-28 18:35:18.000000000 +0100
++++ xc/lib/GL/mesa/math/Imakefile.inc 2005-12-09 23:57:30.271787512 +0100
+@@ -6,24 +6,29 @@
+
+ MESAMATHBUILDDIR = MesaMathBuildDir
+
+- MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \
+- $(MESAMATHBUILDDIR)m_debug_norm.c \
+- $(MESAMATHBUILDDIR)m_debug_xform.c \
+- $(MESAMATHBUILDDIR)m_eval.c \
++ MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_eval.c \
+ $(MESAMATHBUILDDIR)m_matrix.c \
+ $(MESAMATHBUILDDIR)m_translate.c \
+ $(MESAMATHBUILDDIR)m_vector.c \
+ $(MESAMATHBUILDDIR)m_xform.c
+
++#if DoDebugLib
++ MESA_MATH_SRCS += $(MESAMATHBUILDDIR)m_debug_clip.c \
++ $(MESAMATHBUILDDIR)m_debug_norm.c \
++ $(MESAMATHBUILDDIR)m_debug_xform.c
++#endif
++
+ #ifdef NeedToLinkMesaSrc
+ LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math)
++#if DoDebugLib
+ LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math)
++#endif
+ LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math)
+ LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math)
+@@ -40,43 +45,53 @@
+ LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math)
+ #endif
+
+- MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
+- $(MESAMATHBUILDDIR)m_debug_norm.o \
+- $(MESAMATHBUILDDIR)m_debug_xform.o \
+- $(MESAMATHBUILDDIR)m_eval.o \
++ MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_eval.o \
+ $(MESAMATHBUILDDIR)m_matrix.o \
+ $(MESAMATHBUILDDIR)m_translate.o \
+ $(MESAMATHBUILDDIR)m_vector.o \
+ $(MESAMATHBUILDDIR)m_xform.o
+
++#if DoDebugLib
++ MESA_MATH_OBJS += $(MESAMATHBUILDDIR)m_debug_clip.o \
++ $(MESAMATHBUILDDIR)m_debug_norm.o \
++ $(MESAMATHBUILDDIR)m_debug_xform.o
++#endif
++
+ #if defined(DoSharedLib) && DoSharedLib
+- MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
+- $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
+- $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
+- $(MESAMATHBUILDDIR)unshared/m_eval.o \
++ MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_eval.o \
+ $(MESAMATHBUILDDIR)unshared/m_matrix.o \
+ $(MESAMATHBUILDDIR)unshared/m_translate.o \
+ $(MESAMATHBUILDDIR)unshared/m_vector.o \
+ $(MESAMATHBUILDDIR)unshared/m_xform.o
++#if DoDebugLib
++ MESA_MATH_UOBJS += $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
++ $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
++ $(MESAMATHBUILDDIR)unshared/m_debug_xform.o
++#endif
+ #else
+ MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
+ #endif
+
+- MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
+- $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
+- $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
+- $(MESAMATHBUILDDIR)debugger/m_eval.o \
++ MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_eval.o \
+ $(MESAMATHBUILDDIR)debugger/m_matrix.o \
+ $(MESAMATHBUILDDIR)debugger/m_translate.o \
+ $(MESAMATHBUILDDIR)debugger/m_vector.o \
+ $(MESAMATHBUILDDIR)debugger/m_xform.o
+
+- MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
+- $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
+- $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
+- $(MESAMATHBUILDDIR)profiled/m_eval.o \
++#if DoDebugLib
++ MESA_MATH_DOBJS += $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
++ $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
++ $(MESAMATHBUILDDIR)debugger/m_debug_xform.o
++#endif
++
++ MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_eval.o \
+ $(MESAMATHBUILDDIR)profiled/m_matrix.o \
+ $(MESAMATHBUILDDIR)profiled/m_translate.o \
+ $(MESAMATHBUILDDIR)profiled/m_vector.o \
+ $(MESAMATHBUILDDIR)profiled/m_xform.o
+
++#if DoDebugLib
++ MESA_MATH_POBJS += $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
++ $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
++ $(MESAMATHBUILDDIR)profiled/m_debug_xform.o
++#endif
+
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-08 23:26:05 UTC (rev 1032)
+++ trunk/debian/patches/series 2006-01-09 00:02:43 UTC (rev 1033)
@@ -17,6 +17,7 @@
general/015_startx_dummy_fix.diff
general/016_czech_include_location.diff
general/017_fix_Xlib_depend_target.diff -p0
+general/018_mesa_debug_fglrx.diff -p0
general/019_iso8859-15_Compose_fix.diff -p0
general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
Reply to: