X Strike Force SVN commit: rev 134 - in people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split: . patches
Author: ishikawa
Date: 2003-06-03 15:41:02 -0500 (Tue, 03 Jun 2003)
New Revision: 134
Added:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A01_external_XrenderXftXcursor_X11.tmpl.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A02_external_XrenderXftXcursor_programs.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff
Removed:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/909_debian_define_xftlibs.diff
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules
Log:
(NOT WELL TESTED YET)
Render,Xft,Xcursor separation
add some patches and update rules
perhaps I should update #003 patch, but not yet.
* debian/rules:
- add symlink Xrender and Xcursor related stuff into
debian/local/exports/ in debian/rules likes Xft
* #909_debian_define_xftlibs:
- drop (to implement more generic way)
* #A01_external_XrenderXftXcursor_X11.tmpl.diff:
- New patch to use external Xrender/Xft/Xcursor library
o add Has{Render,Xft,Xcursor}Library defines
o defined Build{Render,Xft,Xcursor}Librariy as NO and defined
Has{Render,Xft,Xcursor}Library as YES. Some defines as change to
use external these libraries
* #A02_external_XrenderXftXcursor_programs.diff
- New patch to use external Xrender/Xft/Xcursor library
o adapt #A01 change in programs/*/Imakefile
* #A03_external_XrenderXftXcursor_lib.diff:
- New patch to use external Xrender/Xft/Xcursor library
o adapt #A01 change in lib/*/Imakefile
Added: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff 2003-06-03 20:41:02 UTC (rev 134)
@@ -0,0 +1,66 @@
+diff -x '*~' -urN xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
+--- xc.orig/lib/Xcursor/Imakefile 2003-06-04 02:19:50.000000000 +0900
++++ xc/lib/Xcursor/Imakefile 2003-06-04 05:00:17.000000000 +0900
+@@ -34,6 +34,8 @@
+
+ DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS)
+
++INCLUDES=$(XRENDERINCLUDES)
++
+ SRCS = cursor.c display.c file.c library.c xlib.c
+
+ OBJS = cursor.o display.o file.o library.o xlib.o
+diff -x '*~' -urN xc.orig/lib/Xft/Imakefile xc/lib/Xft/Imakefile
+--- xc.orig/lib/Xft/Imakefile 2003-02-26 07:18:03.000000000 +0900
++++ xc/lib/Xft/Imakefile 2003-06-04 05:10:49.000000000 +0900
+@@ -43,7 +43,7 @@
+ #if HasGcc2 || HasGcc3
+ WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+ #endif
+-INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(WARNINGS)
++INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES) $(WARNINGS)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
+
+ XFT_REVISION=0
+diff -x '*~' -urN xc.orig/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
+--- xc.orig/lib/Xft1/Imakefile 2002-11-15 06:01:18.000000000 +0900
++++ xc/lib/Xft1/Imakefile 2003-06-04 05:00:01.000000000 +0900
+@@ -79,13 +79,13 @@
+
+ YFLAGS = -d
+
+-#ifndef XftLibDir
+-#define XftLibDir $(LIBDIR)
++#ifndef Xft1LibDir
++#define Xft1LibDir $(LIBDIR)
+ #endif
+
+-XFTLIBDIR=XftLibDir
++XFT1LIBDIR=Xft1LibDir
+
+-INCLUDES=$(FREETYPE2INCLUDES)
++INCLUDES=$(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
+
+ #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 -x '*~' -urN xc.orig/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
+--- xc.orig/lib/Xrandr/Imakefile 2002-10-03 01:55:41.000000000 +0900
++++ xc/lib/Xrandr/Imakefile 2003-06-04 05:05:41.000000000 +0900
+@@ -21,7 +21,7 @@
+ #endif
+
+ DEFINES = $(ALLOC_DEFINES)
+- INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
++ INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(XRENDERINCLUDES)
+ SRCS = Xrandr.c
+ OBJS = Xrandr.o
+ LINTLIBS = $(LINTXLIB)
Added: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A01_external_XrenderXftXcursor_X11.tmpl.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A01_external_XrenderXftXcursor_X11.tmpl.diff 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A01_external_XrenderXftXcursor_X11.tmpl.diff 2003-06-03 20:41:02 UTC (rev 134)
@@ -0,0 +1,222 @@
+diff -x '*~' -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl 2003-06-04 05:16:04.000000000 +0900
++++ xc/config/cf/X11.tmpl 2003-06-04 05:12:39.000000000 +0900
+@@ -565,23 +565,29 @@
+ #ifndef BuildRender
+ #define BuildRender YES
+ #endif
++#ifndef HasRenderLibrary
++#define HasRenderLibrary NO
++#endif
+ #ifndef BuildRenderLibrary
+-#define BuildRenderLibrary !BuildServersOnly
++#define BuildRenderLibrary (!BuildServersOnly && !HasRenderLibrary)
++#endif
++#ifndef HasXftLibrary
++#define HasXftLibrary NO
+ #endif
+ #ifndef BuildXftLibrary
+-#define BuildXftLibrary BuildRenderLibrary
++#define BuildXftLibrary (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+ #ifndef BuildXft1Library
+-#define BuildXft1Library BuildRenderLibrary
++#define BuildXft1Library (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig BuildXftLibrary
++#define UseFontconfig (BuildXftLibrary || HasXftLibrary)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
+ #endif
+ #ifndef UseFreetype2
+-#define UseFreetype2 (BuildXftLibrary || BuildXft1Library || UseFontconfig)
++#define UseFreetype2 (BuildXftLibrary || HasXftLibrary || BuildXft1Library || UseFontconfig)
+ #endif
+ #ifndef HasExpat
+ #define HasExpat NO
+@@ -603,8 +609,11 @@
+ #define BuildRandRLibrary !BuildServersOnly
+ #endif
+
++#ifndef HasXcursorLibrary
++#define HasXcursorLibrary NO
++#endif
+ #ifndef BuildXcursorLibrary
+-#define BuildXcursorLibrary BuildRenderLibrary
++#define BuildXcursorLibrary (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #ifndef BuildXcursorgen
+@@ -2374,6 +2383,7 @@
+ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
+ #endif
+
++#if BuildRenderLibrary
+ XRENDERLIBSRC = $(LIBSRC)/Xrender
+ #if SharedLibXrender
+ #ifndef SharedXrenderRev
+@@ -2384,6 +2394,42 @@
+ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
+ #endif
+
++#ifdef UseInstalled
++XRENDERINCDIR=$(INCDIR)/X11
++#else
++XRENDERINCDIR=$(BUILDINCDIR)/X11
++#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 */
++
+ XRANDRRLIBSRC = $(LIBSRC)/Xrandr
+ #if SharedLibXrandr
+ #ifndef SharedXrandrRev
+@@ -2394,6 +2440,7 @@
+ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
+ #endif
+
++#if BuildXcursorLibrary
+ XCURSORRLIBSRC = $(LIBSRC)/Xcursor
+ #if SharedLibXcursor
+ #ifndef SharedXcursorRev
+@@ -2404,6 +2451,41 @@
+ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
+ #endif
+
++#ifdef UseInstalled
++XCURSORINCDIR=$(INCDIR)/X11
++#else
++XCURSORINCDIR=$(BUILDINCDIR)/X11
++#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 */
++
+ # ifndef SharedLibXfontcache
+ # define SharedLibXfontcache NO
+ # endif
+@@ -3164,6 +3246,7 @@
+ #endif
+ #endif
+
++#if BuildXftLibrary
+ #ifndef SharedLibXft
+ #define SharedLibXft HasSharedLibraries
+ #endif
+@@ -3176,6 +3259,18 @@
+ #ifndef ProfileLibXft
+ #define ProfileLibXft 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
+ XFTLIBSRC = $(LIBSRC)/Xft
+ #if SharedLibXft
+ #ifndef SharedXftRev
+@@ -3193,7 +3288,41 @@
+ #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
+ #endif
+
+-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
++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
+
Added: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A02_external_XrenderXftXcursor_programs.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A02_external_XrenderXftXcursor_programs.diff 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A02_external_XrenderXftXcursor_programs.diff 2003-06-03 20:41:02 UTC (rev 134)
@@ -0,0 +1,114 @@
+diff -x '*~' -urN xc.orig/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
+--- xc.orig/programs/x11perf/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/x11perf/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -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
+ XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
+ XFTLIBS = XftClientLibs $(XRENDERLIB)
+diff -x '*~' -urN xc.orig/programs/xclock/Imakefile xc/programs/xclock/Imakefile
+--- xc.orig/programs/xclock/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xclock/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.4 2002/07/01 02:26:00 tsi Exp $
+
+ #ifndef XClockUseRender
+-#define XClockUseRender BuildRenderLibrary
++#define XClockUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XClockUseRender
+diff -x '*~' -urN xc.orig/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
+--- xc.orig/programs/xcursorgen/Imakefile 2003-06-04 02:19:50.000000000 +0900
++++ xc/programs/xcursorgen/Imakefile 2003-06-04 05:02:16.000000000 +0900
+@@ -5,7 +5,7 @@
+ SUBDIRS = redglass whiteglass handhelds
+ DEFAULT_THEME = DefaultCursorTheme
+ THEMEDIR = $(ICONDIR)/default
+- INCLUDES = $(LIBPNGINC)
++ INCLUDES = $(LIBPNGINC) $(XCURSORINCLUDES)
+ DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
+ MathLibrary GzipLibrary
+diff -x '*~' -urN xc.orig/programs/xditview/Imakefile xc/programs/xditview/Imakefile
+--- xc.orig/programs/xditview/Imakefile 2003-06-04 05:15:58.000000000 +0900
++++ xc/programs/xditview/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -7,7 +7,7 @@
+
+
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ DEPFONTLIBS = XftClientDepLibs
+ FONTLIBS = XftClientLibs
+ FONTDEFS = -DUSE_XFT
+diff -x '*~' -urN xc.orig/programs/xdpyinfo/Imakefile xc/programs/xdpyinfo/Imakefile
+--- xc.orig/programs/xdpyinfo/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xdpyinfo/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -40,7 +40,7 @@
+ XINPUTLIBS = $(XILIB)
+ #endif
+
+-#if BuildRenderLibrary
++#if (BuildRenderLibrary || HasRenderLibrary)
+ XRENDERDEFINES = -DXRENDER
+ XRENDERDEPLIBS = $(DEPXRENDERLIB)
+ XRENDERLIBS = $(XRENDERLIB)
+diff -x '*~' -urN xc.orig/programs/xfd/Imakefile xc/programs/xfd/Imakefile
+--- xc.orig/programs/xfd/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xfd/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.3 2002/07/23 01:45:41 tsi Exp $
+
+ #ifndef XFdUseRender
+-#define XFdUseRender BuildRenderLibrary
++#define XFdUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XFdUseRender
+diff -x '*~' -urN xc.orig/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
+--- xc.orig/programs/xlogo/Imakefile 2003-06-04 05:16:04.000000000 +0900
++++ xc/programs/xlogo/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.3 2002/07/01 02:26:04 tsi Exp $
+
+ #ifndef XLogoUseRender
+-#define XLogoUseRender BuildRenderLibrary
++#define XLogoUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XLogoUseRender
+diff -x '*~' -urN xc.orig/programs/xrandr/Imakefile xc/programs/xrandr/Imakefile
+--- xc.orig/programs/xrandr/Imakefile 2002-09-30 08:39:47.000000000 +0900
++++ xc/programs/xrandr/Imakefile 2003-06-04 05:08:22.000000000 +0900
+@@ -2,6 +2,7 @@
+
+ DEFINES=$(RANDRDEFINES)
+ DEPLIBS=$(DEPXRANDRLIB) $(DEPXLIB)
++INCLUDES=$(XRENDERINCLUDES)
+ LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
+
+ SRCS=xrandr.c
+diff -x '*~' -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.orig/programs/xterm/Imakefile 2003-06-04 05:15:58.000000000 +0900
++++ xc/programs/xterm/Imakefile 2003-06-04 02:19:52.000000000 +0900
+@@ -92,7 +92,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
Deleted: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/909_debian_define_xftlibs.diff
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/909_debian_define_xftlibs.diff 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/909_debian_define_xftlibs.diff 2003-06-03 20:41:02 UTC (rev 134)
@@ -1,122 +0,0 @@
-This patch defines XFTLIBS unconditionally, so we can use Xft stuff, and
-makes x11perf use $(XFTINCLUDES) instead of $(XFTINCS), always.
-
-This hack by Daniel Stone.
-
---- xc/config/cf/X11.tmpl.orig 2003-01-20 10:53:52.000000000 +1100
-+++ xc/config/cf/X11.tmpl 2003-01-20 10:55:27.000000000 +1100
-@@ -3193,7 +3193,8 @@
- #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
- #endif
-
--XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
-+XFTLIBS=-lXft -L$(TOP)/../../debian/local/exports/lib $(FONTCONFIGLIB) $(FREETYPE2LIB) $(EXPATLIB) $(XRENDERLIB)
-+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(TOP)/../../debian/local/exports/include
-
- #if UseFontconfig
-
- #if BuildFontconfigLibrary
---- xc/programs/x11perf/Imakefile.orig 2003-01-20 13:51:30.000000000 +1100
-+++ xc/programs/x11perf/Imakefile 2003-01-20 13:59:32.000000000 +1100
-@@ -18,12 +18,9 @@
- XRENDERLIBS = $(XRENDERLIB)
- XRENDERINCS = $(XRENDERINCLUDES)
- #endif
--#if BuildXftLibrary
- XFTDEFS = -DXFT
- XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
-- XFTLIBS = XftClientLibs $(XRENDERLIB)
- XFTINCS = $(XFTINCLUDES)
--#endif
- DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS) $(XRENDERDEFS)
- INCLUDES = $(XFTINCS) $(XRENDERINCS)
- PERFLIB = X11perfcompLib
---- xc/programs/xditview/Imakefile.orig 2003-01-20 13:57:33.000000000 +1100
-+++ xc/programs/xditview/Imakefile 2003-01-20 13:58:53.000000000 +1100
-@@ -7,12 +7,10 @@
-
-
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
--#if BuildXftLibrary
- DEPFONTLIBS = XftClientDepLibs
-- FONTLIBS = XftClientLibs
-+ FONTLIBS = $(XFTLIBS)
- FONTDEFS = -DUSE_XFT
- INCLUDES = $(XFTINCLUDES)
--#endif
- #if HasMkstemp
- TEMPDEFS = -DHAS_MKSTEMP
- #endif
---- xc/programs/xterm/Imakefile.orig 2003-01-20 15:23:27.000000000 +1100
-+++ xc/programs/xterm/Imakefile 2003-01-20 15:23:51.000000000 +1100
-@@ -92,12 +92,10 @@
- UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
- UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
- #endif
--#if BuildXftLibrary
- #define XRenderSupport
--#endif
- #ifdef XRenderSupport
- XRFDEF = -DXRENDERFONT
-- XRFLIBS = XftClientLibs $(XRENDERLIB)
-+ XRFLIBS = $(XFTLIBS)
- XRFDEPLIBS = XftClientDepLibs $(DEPXRENDERLIB)
- XRFINCLUDES = $(XFTINCLUDES)
- #endif
---- xc/programs/xclock/Imakefile.orig 2003-01-21 08:07:23.000000000 +1100
-+++ xc/programs/xclock/Imakefile 2003-01-21 08:08:17.000000000 +1100
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.4 2002/07/01 02:26:00 tsi Exp $
-
--#ifndef XClockUseRender
--#define XClockUseRender BuildRenderLibrary
--#endif
-+#define XClockUseRender YES
-
- #if XClockUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
- DEPLIBS = $(XRENDERDEPS) XkbClientDepLibs XawClientDepLibs
---- xc/programs/xfd/Imakefile.orig 2003-01-21 10:10:54.000000000 +1100
-+++ xc/programs/xfd/Imakefile 2003-01-21 10:11:07.000000000 +1100
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.3 2002/07/23 01:45:41 tsi Exp $
-
--#ifndef XFdUseRender
--#define XFdUseRender BuildRenderLibrary
--#endif
-+#define XFdUseRender YES
-
- #if XFdUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
- DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs
---- xc/programs/xlogo/Imakefile.orig Tue Jan 21 12:35:12 2003
-+++ xc/programs/xlogo/Imakefile Tue Jan 21 12:35:29 2003
-@@ -4,14 +4,12 @@
-
- XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.3 2002/07/01 02:26:04 tsi Exp $
-
--#ifndef XLogoUseRender
--#define XLogoUseRender BuildRenderLibrary
--#endif
-+#define XLogoUseRender YES
-
- #if XLogoUseRender
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB)
-- XRENDERLIBS = XftClientLibs $(XRENDERLIB) -lm
-+ XRENDERLIBS = $(XFTLIBS) $(XRENDERLIB) -lm
- XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
- #endif
-
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control 2003-06-03 20:41:02 UTC (rev 134)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
-Standards-Version: 3.5.8
+Standards-Version: 3.5.10
Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libstdc++5-dev | libstdc++-dev, libxcursor-dev, libxrender-dev
Package: lbxproxy
@@ -275,7 +275,7 @@
Architecture: any
Depends: cpp, debconf (>= 1.2.9), xbase-clients, ${shlibs:Depends}, ${misc:Depends}
Suggests: xutils
-Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
+Replaces: xbase (<< 3.3.2.3a-2), cpp-3.2, xbase-clients (<< 4.0)
Provides: x-display-manager
Description: X display manager
xdm manages a collection of X servers, which may be on the local host or
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules 2003-06-03 18:37:48 UTC (rev 133)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/rules 2003-06-03 20:41:02 UTC (rev 134)
@@ -203,10 +203,17 @@
# in -L/usr/include and other, similarly ugly, stuff (including, but
# not limited to, -I/usr/include).
mkdir -p debian/local/exports/lib
- mkdir -p debian/local/exports/include/X11
+ mkdir -p debian/local/exports/include/X11/extensions
ln -s /usr/X11R6/lib/libXft* debian/local/exports/lib
rm -f debian/local/exports/lib/libXft.so.1* debian/local/exports/lib/libXft1*
ln -s /usr/include/X11/Xft debian/local/exports/include/X11
+ # Xrender
+ ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib
+ ln -s /usr/include/X11/extentions/Xrender.h debian/local/exports/include/X11/extentions
+ # Xcursor
+ ln -s /usr/lib/libXcursor.* debian/local/exports/lib
+ ln -s /usr/include/X11/Xcursor debian/local/exports/include/X11
+
ifndef NOT_BUILDING_X_SERVER
# create source tree for static, debuggable XFree86 server
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
Reply to: