X Strike Force X.Org X11 SVN commit: r222 - trunk/debian/patches
Author: branden
Date: 2005-06-15 16:22:04 -0500 (Wed, 15 Jun 2005)
New Revision: 222
Added:
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
Removed:
trunk/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
Log:
Rename patch file to reflect its broader scope.
Deleted: trunk/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
===================================================================
--- trunk/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff 2005-06-15 21:21:17 UTC (rev 221)
+++ trunk/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff 2005-06-15 21:22:04 UTC (rev 222)
@@ -1,491 +0,0 @@
-$Id$
-
-This patch enables the usage of external Xrender, Xft, and Xcursor libraries.
-
-xc/config/cf/X11.tmpl:
-* Add Has{Render,Xft,Xcursor}Library defines.
-* Render, Xft, and Xcursor library defines are changed to be able to use
- external libraries, consistent with the existing logic for the
- FreeType2, Expat, and Zlib compression libraries. This adds/updates
- definitions for the XCURSORINCLUDES, XFTINCLUDES, and XRENDERINCLUDES
- symbols.
-
-xc/includes/extensions/Imakefile:
-* Only install renderproto.h as part of the SDK if we're building the
- extension.
-
-xc/lib/Imakefile:
-* Expand Imake variable namespace to be able to distinguish Xcursor, Xft,
- and Xrender build directories from system directories where those
- libraries may be found (already installed).
-
-xc/lib/Xft1/Imakefile:
-* Give Xft1 its own Imake variable names, distinct from Xft, to
- disambiguate them.
-
-xc/lib/Xrandr/Imakefile:
-* Add XRENDERINCLUDES to the definition of INCLUDES.
-
-xc/programs/x11perf/Imakefile:
-* Support the Xrender and Xft libraries if they are available, not just if
- they are being built.
-
-xc/programs/{xclock,xdpyinfo,xfd,xlogo}/Imakefile:
-* Use the Xrender library if it is available, not just if it is being
- built.
-
-xc/programs/xcursorgen/Imakefile:
-* Add XCURSORINCLUDES to the definition of INCLUDES.
-
-xc/programs/{xditview,xterm}/Imakefile:
-* Use the Xft library if it is available, not just if it is being built.
-
-xc/programs/xrandr/Imakefile:
-* Define INCLUDES as XRENDERINCLUDES.
-
-This patch by ISHIKAWA Mutsumi and Branden Robinson.
-
-Not submitted upstream.
-
---- xc.orig/config/cf/X11.tmpl 2004-12-16 11:43:47.693789216 +0100
-+++ xc/config/cf/X11.tmpl 2004-12-16 11:44:21.190696912 +0100
-@@ -609,23 +609,29 @@
- #ifndef BuildRender
- #define BuildRender YES
- #endif
-+#ifndef HasRenderLibrary
-+#define HasRenderLibrary NO
-+#endif
- #ifndef BuildRenderLibrary
--#define BuildRenderLibrary (XdmxServer || !BuildServersOnly)
-+#define BuildRenderLibrary (XdmxServer || (!HasRenderLibrary && BuildLibraries))
-+#endif
-+#ifndef HasXftLibrary
-+#define HasXftLibrary NO
- #endif
- #ifndef BuildXftLibrary
--#define BuildXftLibrary BuildRenderLibrary
-+#define BuildXftLibrary ((BuildRenderLibrary || HasRenderLibrary) && BuildLibraries)
- #endif
- #ifndef BuildXft1Library
- #define BuildXft1Library BuildRenderLibrary
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig BuildXftLibrary
-+#define UseFontconfig (BuildXftLibrary || HasXftLibrary)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
- #endif
- #ifndef UseFreetype2
--#define UseFreetype2 (BuildXftLibrary || BuildXft1Library || \
-+#define UseFreetype2 (BuildXftLibrary || HasXftLibrary || BuildXft1Library || \
- UseFontconfig || BuildFreeType)
- #endif
- #ifndef InstallFontconfigLibrary
-@@ -691,8 +697,12 @@
- #define BuildXterm BuildClients
- #endif
-
-+#ifndef HasXcursorLibrary
-+#define HasXcursorLibrary NO
-+#endif
-+
- #ifndef BuildXcursorLibrary
--#define BuildXcursorLibrary BuildRenderLibrary
-+#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary && BuildLibraries)
- #endif
-
- #ifndef BuildXcursorgen
-@@ -2676,6 +2686,7 @@
- ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
- #endif
-
-+#if BuildRenderLibrary
- XRENDERLIBSRC = $(LIBSRC)/Xrender
- #if SharedLibXrender
- #ifndef SharedXrenderRev
-@@ -2686,6 +2697,42 @@
- ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
- #endif
-
-+#ifdef UseInstalled
-+XRENDERINCDIR=$(INCDIR)
-+#else
-+XRENDERINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#else /* BuildRenderLibrary */
-+
-+#if HasRenderLibrary
-+
-+#ifndef RenderLibraryDir
-+#define RenderLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef RenderLibraryLibDir
-+#define RenderLibraryLibDir RenderLibraryDir/LibDirName
-+#endif
-+
-+#ifndef RenderLibraryIncDir
-+#define RenderLibraryIncDir RenderLibraryDir/include
-+#endif
-+
-+XRENDERDIR = RenderLibraryDir
-+XRENDERLIBDIR = RenderLibraryLibDir
-+XRENDERINCDIR = RenderLibraryIncDir
-+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
-+DEPXRENDERLIB =
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#endif /* HasRenderLibrary */
-+
-+#endif /* else BuildRenderLibrary */
-+
- XRANDRLIBSRC = $(LIBSRC)/Xrandr
- #if SharedLibXrandr
- #ifndef SharedXrandrRev
-@@ -2736,6 +2783,7 @@
- ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
- #endif
-
-+#if BuildXcursorLibrary
- XCURSORLIBSRC = $(LIBSRC)/Xcursor
- #if SharedLibXcursor
- #ifndef SharedXcursorRev
-@@ -2746,6 +2794,41 @@
- ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
- #endif
-
-+#ifdef UseInstalled
-+XCURSORINCDIR=$(INCDIR)
-+#else
-+XCURSORINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#else /* BuildXcursorLibrary */
-+
-+#if HasXcursorLibrary
-+
-+#ifndef XcursorLibraryDir
-+#define XcursorLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XcursorLibraryLibDir
-+#define XcursorLibraryLibDir XcursorLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XcursorLibraryIncDir
-+#define XcursorLibraryIncDir XcursorLibraryDir/include
-+#endif
-+
-+XCURSORDIR = XcursorLibraryDir
-+XCURSORLIBDIR = XcursorLibraryLibDir
-+XCURSORINCDIR = XcursorLibraryIncDir
-+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#endif /* HasXcursorLibrary */
-+
-+#endif /* else BuildXcursorLibrary */
-+
- APPLEWMLIBSRC = $(LIBSRC)/apple
- #if SharedLibAppleWM
- #ifndef SharedAppleWMRev
-@@ -3551,6 +3634,7 @@
-
- #endif /* UseExpat */
-
-+#if BuildXftLibrary
- #ifndef SharedLibXft1
- #define SharedLibXft1 HasSharedLibraries
- #endif
-@@ -3563,6 +3647,18 @@
- #ifndef ProfileLibXft1
- #define ProfileLibXft1 NO
- #endif
-+#else
-+#undef SharedLibXft
-+#define SharedLibXft NO
-+#undef NormalLibXft
-+#define NormalLibXft NO
-+#undef DebugLibXft
-+#define DebugLibXft NO
-+#undef ProfileLibXft
-+#define ProfileLibXft NO
-+#endif
-+
-+#if BuildXftLibrary
- XFT1LIBSRC = $(LIBSRC)/Xft1
- #if SharedLibXft1
- #ifndef SharedXft1Rev
-@@ -3617,6 +3713,42 @@
- #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
- #endif
-
-+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#else /* BuildXftLibrary */
-+
-+#if HasXftLibrary
-+
-+#ifndef XftLibraryDir
-+#define XftLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XftLibraryLibDir
-+#define XftLibraryLibDir XftLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XftLibraryIncDir
-+#define XftLibraryIncDir XftLibraryDir/include
-+#endif
-+
-+XFTDIR = XftLibraryDir
-+XFTLIBDIR = XftLibraryLibDir
-+XFTINCDIR = XftLibraryIncDir
-+XFTLIB = -L$(XFTLIBDIR) -lXft
-+
-+#ifndef XftClientDepLibs
-+#define XftClientDepLibs FontconfigClientDepLibs $(DEPXRENDERLIB)
-+#endif
-+#ifndef XftClientLibs
-+#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
-+#endif
-+
-+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#endif /* HasXftLibrary */
-+
-+#endif /* else BuildXftLibrary */
-+
- #if UseFontconfig
-
- #if BuildFontconfigLibrary
-@@ -3732,8 +3864,6 @@
-
- #endif /* UseFontconfig */
-
--XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
--
- #ifdef HasLibpng
-
- /*
---- xc/include/extensions/Imakefile~ 2005-06-14 17:47:53.185848707 -0500
-+++ xc/include/extensions/Imakefile 2005-06-14 17:48:57.272320612 -0500
-@@ -118,7 +118,9 @@
- InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions)
- InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
- InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
-+#if BuildRender
- InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
-+#endif
- InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
- InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
- InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
-diff -ruN xc-old/lib/Imakefile xc/lib/Imakefile
---- xc-old/lib/Imakefile 2004-09-02 01:10:28.000000000 +0000
-+++ xc/lib/Imakefile 2004-10-26 10:44:00.107145664 +0000
-@@ -102,7 +102,7 @@
- #endif
-
- #if BuildRenderLibrary
--RENDERLIBDIR = Xrender
-+RENDERLIBBUILDDIR = Xrender
- #endif
-
- #if BuildExpatLibrary
-@@ -118,7 +118,7 @@
- #endif
-
- #if BuildXftLibrary
--XFTLIBDIR = Xft
-+XFTBUILDDIR = Xft
- #endif
-
- #if BuildXft1Library
-@@ -146,7 +146,7 @@
- #endif
-
- #if BuildXcursorLibrary
--XCURSORLIBDIR = Xcursor
-+XCURSORBUILDDIR = Xcursor
- #endif
-
- #if BuildXTrapLibrary
-@@ -232,10 +232,10 @@
- $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
- $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
- $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
-- $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
-+ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBBUILDDIR) $(FREETYPE2BUILDDIR) \
- $(FONTCONFIGBUILDDIR) $(XFT1LIBDIR) \
-- $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
-- $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) \
-+ $(XFTBUILDDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
-+ $(XRESLIBDIR) $(XCURSORBUILDDIR) $(APPLELIBDIR) $(DMXLIBDIR) \
- $(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) $(COMPOSITELIBDIR)
-
- SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
-diff -ruN xc-old/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
---- xc-old/lib/Xft1/Imakefile 2004-04-23 18:43:44.000000000 +0000
-+++ xc/lib/Xft1/Imakefile 2004-10-26 10:46:37.519215392 +0000
-@@ -79,13 +79,13 @@
-
- YFLAGS = -d
-
--#ifndef XftLibDir
--#define XftLibDir $(LIBDIR)
-+#ifndef Xft1LibDir
-+#define Xft1LibDir $(LIBDIR)
- #endif
-
--XFTLIBDIR=XftLibDir
-+XFT1LIBDIR=Xft1LibDir
-
--INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR)
-+INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(XRENDERINCLUDES)
- DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2
-
- #if UseFreetype2
-@@ -142,7 +142,7 @@
- InstallNamedTargetRelated(install,file,$(INSTDATFLAGS),dest,file,rel)
- #endif /* InstallNonExecFileBackup */
-
--InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFTLIBDIR),XftConfig)
-+InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFT1LIBDIR),XftConfig)
- InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
-
- MANSUFFIX = $(LIBMANSUFFIX)
-diff -ruN xc-old/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
---- xc-old/lib/Xrandr/Imakefile 2004-05-24 19:06:58.000000000 +0000
-+++ xc/lib/Xrandr/Imakefile 2004-10-26 10:46:59.594859384 +0000
-@@ -21,7 +21,7 @@
- #endif
-
- DEFINES = $(ALLOC_DEFINES)
-- INCLUDES = -I. -I$(XLIBSRC) -I$(EXTINCSRC)
-+ INCLUDES = -I. -I$(XLIBSRC) -I$(EXTINCSRC) $(XRENDERINCLUDES)
- SRCS = Xrandr.c
- OBJS = Xrandr.o
- LINTLIBS = $(LINTXLIB)
-diff -ruN xc-old/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
---- xc-old/programs/x11perf/Imakefile 2004-08-11 08:05:31.000000000 +0000
-+++ xc/programs/x11perf/Imakefile 2004-10-26 10:30:48.721454576 +0000
-@@ -12,13 +12,13 @@
- #if HasShm
- SHMDEFS = -DMITSHM
- #endif
--#if BuildRenderLibrary
-+#if (BuildRenderLibrary || HasRenderLibrary)
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = $(DEPXRENDERLIB)
- XRENDERLIBS = $(XRENDERLIB)
- XRENDERINCS = $(XRENDERINCLUDES)
- #endif
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- XFTDEFS = -DXFT -DXFREE86_FT2
- XFTDEPS = XftClientDepLibs
- XFTLIBS = XftClientLibs
-diff -ruN xc-old/programs/xclock/Imakefile xc/programs/xclock/Imakefile
---- xc-old/programs/xclock/Imakefile 2004-04-23 19:54:39.000000000 +0000
-+++ xc/programs/xclock/Imakefile 2004-10-26 09:59:37.320950696 +0000
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.8tsi Exp $
-
- #ifndef XClockUseRender
--#define XClockUseRender BuildRenderLibrary
-+#define XClockUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if XClockUseRender
-diff -ruN xc-old/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
---- xc-old/programs/xcursorgen/Imakefile 2004-04-23 19:54:41.000000000 +0000
-+++ xc/programs/xcursorgen/Imakefile 2004-10-26 09:59:37.320950696 +0000
-@@ -6,7 +6,7 @@
- DEFAULT_THEME = DefaultCursorTheme
- ICONDIR = $(LIBDIR)/icons
- THEMEDIR = $(ICONDIR)/default
-- INCLUDES = $(LIBPNGINC)
-+ INCLUDES = $(LIBPNGINC) $(XCURSORINCLUDES)
- DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
- MathLibrary GzipLibrary
-diff -ruN xc-old/programs/xditview/Imakefile xc/programs/xditview/Imakefile
---- xc-old/programs/xditview/Imakefile 2004-04-23 19:54:42.000000000 +0000
-+++ xc/programs/xditview/Imakefile 2004-10-26 09:59:37.321950544 +0000
-@@ -7,7 +7,7 @@
-
-
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- DEPFONTLIBS = XftClientDepLibs
- FONTLIBS = XftClientLibs
- FONTDEFS = -DUSE_XFT -DXFREE86_FT2
-diff -ruN xc-old/programs/xdpyinfo/Imakefile xc/programs/xdpyinfo/Imakefile
---- xc-old/programs/xdpyinfo/Imakefile 2004-09-02 05:50:38.000000000 +0000
-+++ xc/programs/xdpyinfo/Imakefile 2004-10-26 09:59:37.321950544 +0000
-@@ -34,7 +34,7 @@
- XINPUTLIBS = $(XILIB)
- #endif
-
--#if BuildRenderLibrary
-+#if (BuildRenderLibrary || HasRenderLibrary)
- XRENDERDEFINES = -DXRENDER
- XRENDERDEPLIBS = $(DEPXRENDERLIB)
- XRENDERLIBS = $(XRENDERLIB)
-diff -ruN xc-old/programs/xfd/Imakefile xc/programs/xfd/Imakefile
---- xc-old/programs/xfd/Imakefile 2004-04-23 19:54:47.000000000 +0000
-+++ xc/programs/xfd/Imakefile 2004-10-26 09:59:37.321950544 +0000
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.5tsi Exp $
-
- #ifndef XFdUseRender
--#define XFdUseRender BuildRenderLibrary
-+#define XFdUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if XFdUseRender
-diff -ruN xc-old/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
---- xc-old/programs/xlogo/Imakefile 2004-09-02 05:50:38.000000000 +0000
-+++ xc/programs/xlogo/Imakefile 2004-10-26 09:59:37.321950544 +0000
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.5tsi Exp $
-
- #ifndef XLogoUseRender
--#define XLogoUseRender BuildRenderLibrary
-+#define XLogoUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if BuildXprintLib && BuildXprintClients && BuildXaw
-diff -ruN xc-old/programs/xrandr/Imakefile xc/programs/xrandr/Imakefile
---- xc-old/programs/xrandr/Imakefile 2004-04-23 19:55:03.000000000 +0000
-+++ xc/programs/xrandr/Imakefile 2004-10-26 09:59:37.322950392 +0000
-@@ -2,6 +2,7 @@
-
- DEFINES=$(RANDRDEFINES)
- DEPLIBS=$(DEPXRANDRLIB) $(DEPXLIB)
-+INCLUDES=$(XRENDERINCLUDES)
- LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
-
- SRCS=xrandr.c
-diff -ruN xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc-old/programs/xterm/Imakefile 2004-08-13 12:57:19.000000000 +0000
-+++ xc/programs/xterm/Imakefile 2004-10-26 09:59:37.322950392 +0000
-@@ -97,7 +97,7 @@
- UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
- UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
- #endif
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- #define XRenderSupport
- #endif
- #ifdef XRenderSupport
Copied: trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff (from rev 221, trunk/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff)
Reply to: