Author: ishikawa Date: 2003-06-05 22:26:44 -0500 (Thu, 05 Jun 2003) New Revision: 153
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff 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 Log: update comments Modified: 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-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A03_external_XrenderXftXcursor_lib.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -1,3 +1,15 @@ +patch to be able to use external Xrender/Xft/Xcursor libraries + + * namespace conflicts in xc/lib/Imakefile fix + * namespace conflicts in xc/lib/Xft1/Imakefile fix + * check Has{Render,Xft,Xcursor}Library to use them + * some INCLUDES added to be able to refer external + Xrender,Xft,Xcursor libraries' header + + This patch contains xc/lib/*/Imakefile parts + +ISHIKAWA Mutsumi <[EMAIL PROTECTED]> + diff -x '*~' -urN xc.orig/lib/Imakefile xc/lib/Imakefile --- xc.orig/lib/Imakefile 2003-02-21 14:31:24.000000000 +0900 +++ xc/lib/Imakefile 2003-06-04 06:18:08.000000000 +0900 Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff ============================================================================== --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff 2003-06-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/842_netbsd_NetBSD.cf_fixes.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -4,7 +4,8 @@ separate patch). Origionally written by Joel Baker <[EMAIL PROTECTED]>, -update by ISHIKAWA Mutsumi <[EMAIL PROTECTED]> +update by ISHIKAWA Mutsumi <[EMAIL PROTECTED]> to be able to use +external Xrender,Xft and Xcursor. --- xc/config/cf/NetBSD.cf~ 2002-10-16 00:52:50.000000000 -0500 +++ xc/config/cf/NetBSD.cf 2002-10-16 01:00:33.000000000 -0500 Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff ============================================================================== --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff 2003-06-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/800_gnu_config.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -5,7 +5,8 @@ Original patch by Marcus Brinkmann <[EMAIL PROTECTED]>, updated by Robert Millan <[EMAIL PROTECTED]>, Daniel Stone <[EMAIL PROTECTED]>, -ISHIKAWA Mutsumi <[EMAIL PROTECTED]> +ISHIKAWA Mutsumi <[EMAIL PROTECTED]> (to be able to use external +Xrender,Xft and Xcursor) --- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001 +++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003 Modified: 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-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A01_external_XrenderXftXcursor_X11.tmpl.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -1,3 +1,15 @@ +patch to be able to use external Xrender/Xft/Xcursor libraries + + * add Has{Render,Xft,Xcursor}Library defines + * Some defines related {Render,Xft,Xcursor}Library are changed + to be able to use external Xrender,Xft,Xcursor libraries + (likes freetype2, expat, libz etc...) + + This patch contains X11.tmpl part only (some xc/lib/*/Imakefile +and xc/programs/*/Imakefile should adapt this change) + +ISHIKAWA Mutsumi <[EMAIL PROTECTED]> + 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 @@ -62,9 +74,9 @@ #endif +#ifdef UseInstalled -+XRENDERINCDIR=$(INCDIR)/X11 ++XRENDERINCDIR=$(INCDIR) +#else -+XRENDERINCDIR=$(BUILDINCDIR)/X11 ++XRENDERINCDIR=$(BUILDINCDIR) +#endif + +XRENDERINCLUDES = -I$(XRENDERINCDIR) @@ -113,9 +125,9 @@ #endif +#ifdef UseInstalled -+XCURSORINCDIR=$(INCDIR)/X11 ++XCURSORINCDIR=$(INCDIR) +#else -+XCURSORINCDIR=$(BUILDINCDIR)/X11 ++XCURSORINCDIR=$(BUILDINCDIR) +#endif + +XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES) Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff ============================================================================== --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -1,7 +1,7 @@ Various Debian changes to xfree86.cf and linux.cf, including better support for gcc flags. Forward-ported with some updates from 4.2.1. This patch originally by Branden Robinson, forward-ported with a few -updates by Daniel Stone. Build with external Xrender and Xcursor +updates by Daniel Stone. Build with external Xrender,Xft and Xcursor by ISHIKAWA Mutsumi. --- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003 Modified: 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-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/A02_external_XrenderXftXcursor_programs.diff 2003-06-06 03:26:44 UTC (rev 153) @@ -1,3 +1,13 @@ +patch to be able to use external Xrender/Xft/Xcursor libraries + + * check HasRenderLibrary to use Render or not + * some INCLUDES added to be able to refer external + Xrender,Xft,Xcursor libraries' header + + This patch contains xc/programs/*/Imakefile parts + +ISHIKAWA Mutsumi <[EMAIL PROTECTED]> + 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 Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog ============================================================================== --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog 2003-06-06 03:24:14 UTC (rev 152) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog 2003-06-06 03:26:44 UTC (rev 153) @@ -11,39 +11,48 @@ the dependency, and thus allowing gcc3.2 to be removed. (closes: #194136) - New xlibmesa-drm-src package. (closes: #139817) - - remove description about libXrender (for separating) - [ISHIKAWA Mutsumi] + - remove description about libXrender [ISHIKAWA Mutsumi] - add Build-Depends: libxcursor-dev, libxrender-dev [ISHIKAWA Mutsumi] - * patch #003_linux.cf_and_xfree86.cf: - - add `#define HasXftLibrary YES' [ISHIKAWA Mutsumi] - - add `#define BuildXcursorLibrary NO' [ISHIKAWA Mutsumi] - - add `#define HasXcursorLibrary YES' [ISHIKAWA Mutsumi] - - add `#define BuildRenderLibrary NO' [ISHIKAWA Mutsumi] - - add `#define HasRenderLibrary YES' [ISHIKAWA Mutsumi] + + * patch #003_linux.cf_and_xfree86.cf: [ISHIKAWA Mutsumi] + - add `#define Has{Xft,Render,Xcursor}Library YES' + - add `#define Build{Render,Xcursor}Library NO' + - add `#define RenderLibraryDir' + - add `#define XfftLibraryDir' + - add `#define XcursorLibraryDir' + * patch #800_gnu_config.diff: [ISHIKAWA Mutsumi] + - same changes as #003 + * patcj #842_netbsd_NetBSD.cf_fixes.diff: [ISHIKAWA Mutsumi] + - same changes as #003 * patch #004_imake_manpage_handling_overhaul: - update to adapt #003 change [ISHIKAWA Mutsumi] - * debian/xlibs* debian/shlibs*: + + * debian/xlibs.install{,.s390}, debian/xlibs.links, debian/xlibs.shlibs, + debian/xlibs-dbg.install, debian/xlibs-dbg.links, + debian/xlibs-dev.install{,hurd-i386,s390}, debian/xlibs-dev.links, + debian/shlibs.local, debian/xlibs.shlibs.dummy: - remove libXcursor and libXrender related files [ISHIKAWA Mutsumi] + * debian/rules: - - add symlink Xrender and Xcursor related stuff into - debian/local/exports/ in debian/rules likes Xft [ISHIKAWA Mutsumi] + - add create Xrender and Xcursor related stuff symlink into + debian/local/exports/ at build time likes Xft [ISHIKAWA Mutsumi] + * #909_debian_define_xftlibs: - - drop (to implement more generic way) [ISHIKAWA Mutsumi] + - drop (replaced by #A01, #A02 and #A03 patches) [ISHIKAWA Mutsumi] * #A01_external_XrenderXftXcursor_X11.tmpl.diff: [ISHIKAWA Mutsumi] - New patch to use external Xrender/Xft/Xcursor library - [ISHIKAWA Mutsumi] 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 + o Some defines related {Render,Xft,Xcursor}Library are changed + to be able to use external Xrender,Xft,Xcursor libraries + (likes freetype2, expat, libz etc...) * #A02_external_XrenderXftXcursor_programs.diff - New patch to use external Xrender/Xft/Xcursor library [ISHIKAWA Mutsumi] - o adapt #A01 change in programs/*/Imakefile + o adapt #A01 change for xc/programs/*/Imakefile * #A03_external_XrenderXftXcursor_lib.diff: - New patch to use external Xrender/Xft/Xcursor library [ISHIKAWA Mutsumi] - o adapt #A01 change in lib/*/Imakefile + o adapt #A01 change for xc/lib/*/Imakefile -- Branden Robinson <[EMAIL PROTECTED]> Sun, 25 May 2003 03:51:59 -0500 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]