X Strike Force X.Org X11 SVN commit: r138 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-04 11:25:28 -0500 (Sat, 04 Jun 2005)
New Revision: 138
Added:
trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
Log:
Replace messed up patches from audit against other source tree.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-04 16:14:05 UTC (rev 137)
+++ trunk/debian/changelog 2005-06-04 16:25:28 UTC (rev 138)
@@ -79,10 +79,6 @@
- Deleted 0000_backport_from_upstream.diff (obsolete)
- Edited 000_stolen_from_HEAD.diff
- Re-diffed Xpm's create.c fix to get it to apply properly
- - Deleted 003_linux.cf_and_xfree86.cf.diff (obsolete)
- - Delete first hunk for linux.cf in
- 099c_support_loadable_external_Xcursor_lib.diff because nothing in
- this hunk is present in the file any more.
Changes by Branden Robinson:
Added: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-04 16:14:05 UTC (rev 137)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-04 16:25:28 UTC (rev 138)
@@ -0,0 +1,625 @@
+$Id: 003_linux.cf_and_xfree86.cf.diff 1681 2004-07-21 19:20:49Z branden $
+
+Various Debian changes to xfree86.cf and linux.cf, including better
+support for GCC flags, including tweakability of optimization level.
+
+Support building with fonts and specs docs turned off (for
+architecture-specific-only package builds).
+
+This patch mostly by Branden Robinson.
+
+FontLibSharedFreeType disabled by ISHIKAWA Mutsumi; this change should be
+dropped when we can build the module-loading XFree86 X server linked
+against an external FreeType2 library.
+
+External Xrender, Xft and Xcursor support by ISHIKAWA Mutsumi.
+
+Enhanced Glide3 support in part by Guillem Jover.
+
+Reworked for cleanliness and correctness by Daniel Stone. Submitted to X.Org,
+but later withdrawn: consensus reached that Debian-specific changes should be
+removed from linux.cf, and maintained in an external host.def file or such,
+as they had no place in the upstream tree, per the policy of not placing
+debian/ and the like in upstream trees. Due to be maintained externally.
+
+diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf 2005-02-01 23:06:25.646175640 +1100
++++ xc/config/cf/linux.cf 2005-02-01 23:52:27.998234296 +1100
+@@ -101,12 +101,22 @@
+ #endif
+
+ #if LinuxDistribution == LinuxDebian
++
++/* Path setup. */
++# ifndef NothingOutsideProjectRoot
++# define NothingOutsideProjectRoot NO
++# endif
+ # if !NothingOutsideProjectRoot
+ # define SystemManDirectory /usr/share/man
+ # endif
++
++/* Default GCC options. */
++# ifndef DefaultGcc2OptimizeOpt
++# define DefaultGcc2OptimizeOpt -O2
++# endif
++
+ # define HasPam YES
+-/* un-comment this when it is un-broken */
+-/* # define JoystickSupport YES */
++
+ # if !NothingOutsideProjectRoot
+ # define XAppLoadDir EtcX11Directory/app-defaults
+ # define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+@@ -119,12 +129,10 @@
+ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+ # endif /* InstallAppDefFiles */
+ # endif /* !NothingOutsideProjectRoot */
++
+ # define SharedLibXdmGreet NO
+ # define LinkGLToUsrInclude NO
+ # define LinkGLToUsrLib NO
+-# define SharedLibFont NO
+-# define SharedLibGlu YES
+-# define NormalLibGlu YES
+ # define FSUseSyslog YES
+
+ # define DriverManSuffix 4x
+@@ -142,53 +150,120 @@
+ */
+
+ # ifdef DebianMaintainer
++
+ # ifndef XorgCustomVersion
+ # define XorgCustomVersion "Debian"
+ # endif
+ # ifndef BuilderEMailAddr
+ # define BuilderEMailAddr "debian-x@lists.debian.org"
+ # endif
++
+ # define XFree86Devel YES
+-# define BuildAllSpecsDocs YES
+ # define InstallXinitConfig YES
+ # define InstallXdmConfig YES
+ # define InstallFSConfig YES
+ # define DebuggableLibraries YES
+ # define ForceNormalLib YES
+-# define BuildSpecsDocs YES
+-# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
+-# define BuildRman NO
++# define SharedLibFont NO
++# define SharedLibGlu YES
++# define NormalLibGlu YES
++# define BuildFontCache YES
++
++# define BuildAllSpecsDocs NO
++# ifndef BuildSpecsDocs
++# define BuildSpecsDocs YES
++# endif
++# define SpecsDocDirs BDF CTEXT FSProtocol GL ICCCM ICE PM \
++ Render SM X11 XDMCP XIM XLFD XProtocol \
++ Xaw Xext Xi Xmu Xserver Xt Xv XvMC \
++ i18n rstart xfs xterm xtrans
++# define XkbServerDefines -DNOISY
+ # define BuildHtmlManPages NO
+
+-/* we build-depend on libfreetype6-dev (FreeType 2.x) */
+-# define BuildFreetype2Library NO
+-# define HasFreetype2 YES
+-/* m68k has no 2.4 kernel yet */
+-# ifndef Mc68020Architecture
+-# define HasLinuxInput YES
+-# endif
+-# define HasXdmAuth YES
+-# define HasLatex YES
+-/* at present, glide2 only works on i386 */
+-# ifdef i386Architecture
+-# define HasGlide2 YES
+-# define Glide2IncDir /usr/include/glide
+-# endif /* i386Architecture */
+-/* at present, glide3 only works on alpha, amd64, i386 and ia64 */
+-# if defined(i386Architecture) || defined(AlphaArchitecture) || \
+- defined(ia64Architecture) || defined(AMD64Architecture)
+-# define HasGlide3 YES
+-# define Glide3IncDir /usr/include/glide3
+-# endif /* i386Architecture || AlphaArchitecture || ia64Architecture ||
+- AMD64Architecture */
+-/* extended instruction set support */
+-# ifdef i386Architecture
++# define DontPreprocessManPages NO
++
++/* We have a local patch that defines PicLibraryTarget(), instead of upstream's
++ * method. */
++# define StaticNeedsPicForShared NO
++
++# define KernelVersionInBanner YES
++
++/* We don't want XRX. */
++# define BuildPlugin NO
++
++/* The TT/Meltho fonts are all under non-free licences, except for BitStream
++ * Vera, which is provided by an external package anyway. */
++# define BuildTrueTypeFonts NO
++# define BuildBethMarduthoFonts NO
++
++/* Some day, but not yet ... */
++# define MakeDllModules NO
++
++/* All the following are fulfilled by Build-Depends. */
++# define BuildRman NO
++# define RmanCmd /usr/bin/rman
++# define RmanOptions /**/
++# define HasTk YES
++# define TkLibDir /usr/lib
++# define TkIncDir /usr/include
++# define TkLibName tk8.4
++# define XF86SetupUsesStaticTk NO
++# define HasTcl YES
++# define TclLibDir /usr/lib
++# define TclIncDir /usr/include
++# define TclLibName tcl8.4
++# define XF86SetupUsesStaticTcl NO
++# define BuildExpatLibrary NO
++# define HasExpat YES
++# define ExpatIncDirStandard YES
++# define BuildFontconfigLibrary NO
++# define HasFontconfig YES
++# define UseFontconfig YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++# define IconDir Concat(ProjectRoot,/lib/X11/icons)
++# define BuildXftLibrary NO
++# define HasXftLibrary YES
++# define BuildFreetype2Library NO
++# define HasFreetype2 YES
++# define FontLibSharedFreeType NO
++# define HasLatex YES
++
++# ifdef UseInstalled
++# define RenderLibraryDir /usr
++# define XftLibraryDir /usr
++# define XcursorLibraryDir /usr
++# else /* We have a special hack to find these. */
++# define RenderLibraryDir $(TOP)/../../imports
++# define XftLibraryDir $(TOP)/../../imports
++# define XcursorLibraryDir $(TOP)/../../imports
++# endif
++
++/* Wraphelp.c magic is supplied via a custom patch. */
++# define HasXdmAuth YES
++
++/* Glide2 only works on i386. */
++# ifdef i386Architecture
++# define HasGlide2 YES
++# define Glide2IncDir /usr/include/glide
++# endif /* i386Architecture */
++/* Glide3 only works on alpha, amd64, i386 and ia64. */
++# if defined(i386Architecture) || defined(AlphaArchitecture) || \
++ defined(ia64Architecture) || defined(AMD64Architecture)
++# define HasGlide3 YES
++# define Glide3IncDir /usr/include/glide3
++# endif /* i386Architecture || AlphaArchitecture || ia64Architecture ||
++ AMD64Architecture */
++
++/* Enable extended instruction set support. */
++# ifdef i386Architecture
+ # define HasX86Support YES
+-# define HasMMXSupport YES
+-# define Has3DNowSupport YES
+-/* 2.4 is not yet the official (or predominant) kernel in unstable */
+-# define HasSSESupport NO
+-# endif /* i386Architecture */
++# define HasMMXSupport YES
++# define Has3DNowSupport YES
++# define HasSSESupport YES
++# endif /* i386Architecture */
+ # endif /* DebianMaintainer */
+ #endif /* LinuxDebian */
+
+@@ -675,10 +750,10 @@
+ # if UseElfFormat
+ # ifdef AlphaArchitecture
+ # define CcCmd gcc -b alpha-linux
++# define CplusplusCmd c++ -b alpha-linux
+ # define AsCmd CcCmd -c -x assembler
+ # define LdCmd CcCmd -nostdlib -Wl,"-m elf64alpha"
+ # define AsmDefines -D__ELF__
+-# define CplusplusCmd c++ -b alpha-linux
+ # endif /* AlphaArchitecture */
+ # ifdef HPArchitecture
+ # define CcCmd gcc
+@@ -690,10 +765,10 @@
+ # endif /* HPArchitecture */
+ # ifdef i386Architecture
+ # define CcCmd gcc -b i486-linux
++# define CplusplusCmd c++ -b i486-linux
+ # define AsCmd CcCmd -c -x assembler
+ # define LdCmd CcCmd -nosdlib -Wl,"-m elf_i386"
+ # define AsmDefines -D__ELF__
+-# define CplusplusCmd c++ -b i486-linux
+ # endif /* i386Architecture */
+ # ifdef ia64Architecture
+ # define CcCmd gcc
+@@ -704,10 +779,10 @@
+ # endif /* ia64Architecture */
+ # ifdef Mc68020Architecture
+ # define CcCmd gcc -b m68k-linux
++# define CplusplusCmd c++ -b m68k-linux
+ # define AsCmd CcCmd -c -x assembler
+ # define LdCmd CcCmd -nostdlib -W,l"-m m68kelf"
+ # define AsmDefines -D__ELF__
+-# define CplusplusCmd c++ -b m68k-linux
+ # endif /* Mc68020Architecture */
+ # ifdef AMD64Architecture
+ # define CcCmd gcc
+@@ -720,13 +795,14 @@
+ # define CcCmd gcc
+ # define AsCmd CcCmd -c -x assembler
+ # define LdCmd CcCmd -nostdlib
+-# define AsmDefines -DUSE_GAS
++# define AsmDefines -DUSE_GAS -D__ELF__
+ # endif
+ #endif
+
+ #if UseElfFormat
+ # ifndef DoLoadableServer
+-# ifdef HPArchitecture
++# if (defined(HPArchitecture) || defined(MIPSArchitecture) || \
++ defined(SuperHArchitecture)) && !defined(MakeDllModules)
+ # define DoLoadableServer NO
+ # else
+ # define DoLoadableServer YES
+@@ -793,7 +869,7 @@
+
+ #ifdef AlphaArchitecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags DefaultGcc2AxpOpt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__alpha__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -806,7 +882,7 @@
+ #ifdef Arm32Architecture
+ # define DefaultCCOptions -fsigned-char
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O3
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -814,7 +890,9 @@
+ #endif /* Arm32Achitecture */
+
+ #ifdef HPArchitecture
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# endif
+ # define LinuxMachineDefines -D__hppa__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+ # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+@@ -822,7 +900,7 @@
+
+ #ifdef i386Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__i386__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -831,7 +909,7 @@
+
+ #ifdef ia64Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__ia64__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -840,7 +918,7 @@
+
+ #ifdef Mc68020Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__mc68000__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -849,7 +927,7 @@
+
+ #ifdef MipsArchitecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__mips__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -859,7 +937,7 @@
+ #ifdef Ppc64Architecture
+ # define DefaultCCOptions -fsigned-char -mminimal-toc
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+@@ -869,7 +947,7 @@
+ #ifdef PpcArchitecture
+ # define DefaultCCOptions -fsigned-char
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags DefaultGcc2PpcOpt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__powerpc__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -878,7 +956,7 @@
+
+ #ifdef s390Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__s390__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -886,16 +964,17 @@
+ #endif /* s390Architecture */
+
+ #ifdef s390xArchitecture
+-/*#define DefaultCCOptions -fsigned-char */
+-#define OptimizedCDebugFlags -O3 -fomit-frame-pointer
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# endif
+ #define LinuxMachineDefines -D__s390x__
+-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+ #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+ #endif /* s390xArchitecture */
+
+ #ifdef SparcArchitecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__sparc__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -926,7 +1005,7 @@
+ # endif
+ # endif
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__sh__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -938,7 +1017,7 @@
+
+ #ifdef AMD64Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__amd64__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf 2005-02-01 23:06:25.784154664 +1100
++++ xc/config/cf/xfree86.cf 2005-02-01 23:19:28.856109632 +1100
+@@ -233,6 +233,11 @@
+ #define GlideDriver /**/
+ #endif
+
++/* The tdfx DRI driver can only be built if glide3 is available. */
++#ifndef HasGlide3
++#define HasGlide3 NO
++#endif
++
+ /*
+ * There are three parameters that determine where and how the Matrox HAL
+ * library is used:
+@@ -477,8 +482,11 @@
+ vga dummy fbdev vesa
+ # endif
+
+-/* DRI tdfx driver needs Glide, which is not available for AMD64 */
+-# define TdfxDriDriver /**/
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++#endif
+
+ # define DevelDRIDrivers /**/
+
+@@ -848,8 +856,14 @@
+ savage nv cirrus DevelDrivers siliconmotion \
+ vga XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/
++# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ \
++ TdfxDriDriver
+ # endif
+ #endif
+
+@@ -940,8 +954,13 @@
+ DevelDrivers vga \
+ XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
+ # endif
+ #endif
+
+@@ -1034,7 +1053,7 @@
+ # define TdfxDriDriver /**/
+ # endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
+ # endif
+ #endif
+
+@@ -1891,27 +1910,33 @@
+ # define GccAliasingArgs /* */
+ #endif
+
++#if HasGcc2
++# ifndef DefaultGcc2OptimizeOpt
++# define DefaultGcc2OptimizeOpt -O2
++# endif
++#endif
++
+ #if HasGcc2 && defined(i386Architecture)
+ # ifndef DefaultGcc2i386Opt
+-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AMD64Architecture)
+ # ifndef DefaultGcc2AMD64Opt
+-# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2AMD64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+-# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
++# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(PpcArchitecture)
+ # ifndef DefaultGcc2PpcOpt
+-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
++# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
+--- xc.orig/config/cf/xorg.cf 2005-02-01 23:06:25.623179136 +1100
++++ xc/config/cf/xorg.cf 2005-02-01 23:58:47.067606992 +1100
+@@ -257,6 +257,11 @@
+ #define GlideDriver /**/
+ #endif
+
++/* The tdfx DRI driver can only be built if glide3 is available. */
++#ifndef HasGlide3
++#define HasGlide3 NO
++#endif
++
+ /*
+ * There are three parameters that determine where and how the Matrox HAL
+ * library is used:
+@@ -420,7 +425,13 @@
+ /* SiS is 64-bit unclean as of this writing. */
+ # define i386DRIDrivers /**/
+ # endif
+-# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 tdfx
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
++# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \
++ TdfxDriDriver
+ # endif
+ #endif /* i386Architecture || ia64Architecture */
+
+@@ -446,8 +457,13 @@
+ # endif
+
+ /* SiS is 64-bit unclean as of this writing. */
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers i915 gamma mga r128 radeon r200 tdfx
++# define DriDrivers i915 gamma mga r128 radeon r200 TdfxDriDriver
+ # endif
+ #endif /*AMD64Arcitecture*/
+
+@@ -586,8 +602,13 @@
+ * Glide is available for Alpha, therefore build tdfx DRM module.
+ * SiS is 64-bit unclean as of this writing.
+ */
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
+ # endif
+ #endif /* AlphaArchitecture */
+
+@@ -755,7 +776,7 @@
+ # define TdfxDriDriver /**/
+ # endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma r128
++# define DriDrivers gamma r128 TdfxDriDriver
+ # endif
+ #endif /* Ppc64Architecture */
+
+@@ -1557,33 +1578,39 @@
+ # define GccAliasingArgs /* */
+ #endif
+
++#if HasGcc2
++# ifndef DefaultGcc2OptimizeOpt
++# define DefaultGcc2OptimizeOpt -O2
++# endif
++#endif
++
+ #if HasGcc2 && defined(i386Architecture)
+ # ifndef DefaultGcc2i386Opt
+-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AMD64Architecture)
+ # ifndef DefaultGcc2AMD64Opt
+-# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2AMD64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+-# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
++# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(Ppc64Architecture)
+ # ifndef DefaultGcc2Ppc64Opt
+-# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
++# define DefaultGcc2Ppc64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(PpcArchitecture)
+ # ifndef DefaultGcc2PpcOpt
+-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
++# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-04 16:14:05 UTC (rev 137)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-04 16:25:28 UTC (rev 138)
@@ -10,6 +10,18 @@
Not submitted upstream.
+diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc-old/config/cf/linux.cf 2004-10-27 08:40:39.015486000 +0000
++++ xc/config/cf/linux.cf 2004-10-27 08:41:15.188986920 +0000
+@@ -228,6 +228,8 @@
+ # define HasRenderLibrary YES
+ # define BuildXcursorLibrary NO
+ # define HasXcursorLibrary YES
++/* Xlib needs to know the available version of Xcursor. */
++# define SharedXcursorRev 1
+ # define IconDir Concat(ProjectRoot,/lib/X11/icons)
+ # define BuildXftLibrary NO
+ # define HasXftLibrary YES
diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
--- xc-old/lib/X11/Imakefile 2004-10-27 08:40:37.114775000 +0000
+++ xc/lib/X11/Imakefile 2004-10-27 08:41:15.188986920 +0000
Reply to: