diff --git a/debian/patches/03_xutils-dev-FHS.diff b/debian/patches/03_xutils-dev-FHS.diff index f8de8bb..62f2cd3 100644 --- a/debian/patches/03_xutils-dev-FHS.diff +++ b/debian/patches/03_xutils-dev-FHS.diff @@ -1,8 +1,17 @@ -Index: xutils-dev-1.0.2/xorg-cf-files/linux.cf +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:38 +0800 +Subject: _xutils-dev-FHS + =================================================================== ---- xutils-dev-1.0.2.orig/xorg-cf-files/linux.cf 2006-04-16 16:53:09.000000000 +0800 -+++ xutils-dev-1.0.2/xorg-cf-files/linux.cf 2006-04-16 16:54:41.000000000 +0800 -@@ -86,6 +86,19 @@ +--- + xorg-cf-files/linux.cf | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf +index 3d61076..0662cdf 100644 +--- a/xorg-cf-files/linux.cf ++++ b/xorg-cf-files/linux.cf +@@ -86,6 +86,19 @@ XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi # define BuildPDFdocs NO #endif diff --git a/debian/patches/04_xutils-dev-debian.diff b/debian/patches/04_xutils-dev-debian.diff index 121bffa..4e3b3de 100644 --- a/debian/patches/04_xutils-dev-debian.diff +++ b/debian/patches/04_xutils-dev-debian.diff @@ -1,6 +1,894 @@ +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:38 +0800 +Subject: _xutils-dev-debian + +--- + xorg-cf-files/Imake.rules | 14 ++ + xorg-cf-files/Imake.tmpl | 161 ++++++++++++---- + xorg-cf-files/Library.tmpl | 32 +++- + xorg-cf-files/NetBSD.cf | 190 ++++++++++++++++++- + xorg-cf-files/X11.tmpl | 146 ++++++++++++++- + xorg-cf-files/bsdLib.rules | 34 ++++ + xorg-cf-files/gnu.cf | 454 ++++++++++++++++++++++++++++++++++++++++----- + xorg-cf-files/gnuLib.rules | 124 +++++++++++-- + xorg-cf-files/gnuLib.tmpl | 71 ++++++- + xorg-cf-files/linux.cf | 324 +++++++++++++++++++++++--------- + xorg-cf-files/sco5.cf | 2 +- + xorg-cf-files/usl.cf | 2 +- + xorg-cf-files/xfree86.cf | 81 +++++--- + xorg-cf-files/xorg.cf | 49 +++-- + 14 files changed, 1440 insertions(+), 244 deletions(-) + +diff --git a/xorg-cf-files/Imake.rules b/xorg-cf-files/Imake.rules +index 961307d..fed0ca5 100644 +--- a/xorg-cf-files/Imake.rules ++++ b/xorg-cf-files/Imake.rules +@@ -2721,6 +2721,20 @@ LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\ + #endif /* UnsharedLibraryTarget3 */ + + ++/* ++ * Rule to build libXXX_pic.a from PIC objects for a library ++ */ ++#ifndef PicLibraryTarget ++#define PicLibraryTarget(libname,objlist) @@\ ++AllTarget(LibraryTargetNameSuffix(libname,_pic)) @@\ ++ @@\ ++LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS) @@\ ++ RemoveFile($@) @@\ ++ MakeLibrary($@,objlist) @@\ ++ RanLibrary($@) @@\ ++ _LinkBuildLibrary($@) ++#endif /* PicLibraryTarget */ ++ + /* + * SubdirLibraryRule - + */ +diff --git a/xorg-cf-files/Imake.tmpl b/xorg-cf-files/Imake.tmpl +index 3f89ebf..9302a5a 100644 +--- a/xorg-cf-files/Imake.tmpl ++++ b/xorg-cf-files/Imake.tmpl +@@ -902,37 +902,82 @@ TCLIBDIR = TclLibDir + #define ManSourcePath $(MANPATH)/man + #endif + #ifndef ManDir +-#define ManDir $(MANSOURCEPATH)$(MANSUFFIX) ++#define ManDir $(MANSOURCEPATH)$(MANSECT) + #endif +-#ifndef LibmanDir +-#define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) ++#ifndef ManSuffix ++#define ManSuffix $(MANSECT)$(PROJECTMANSUFFIX) ++#endif ++#ifndef SyscallManDir ++#define SyscallManDir $(MANSOURCEPATH)$(SYSCALLMANSECT) ++#endif ++#ifndef SyscallManSuffix ++#define SyscallManSuffix $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) ++#endif ++#ifndef LibManDir ++#define LibManDir $(MANSOURCEPATH)$(LIBMANSECT) ++#endif ++#ifndef LibManSuffix ++#define LibManSuffix $(LIBMANSECT)$(PROJECTMANSUFFIX) ++#endif ++#ifndef DriverManDir ++#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSECT) ++#endif ++#ifndef DriverManSuffix ++#define DriverManSuffix $(DRIVERMANSECT)$(PROJECTMANSUFFIX) + #endif + #ifndef FileManDir +-#define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) ++#define FileManDir $(MANSOURCEPATH)$(FILEMANSECT) ++#endif ++#ifndef FileManSuffix ++#define FileManSuffix $(FILEMANSECT)$(PROJECTMANSUFFIX) ++#endif ++#ifndef GameManDir ++#define GameManDir $(MANSOURCEPATH)$(GAMEMANSECT) ++#endif ++#ifndef GameManSuffix ++#define GameManSuffix $(GAMEMANSECT)$(PROJECTMANSUFFIX) + #endif + #ifndef MiscManDir +-#define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) ++#define MiscManDir $(MANSOURCEPATH)$(MISCMANSECT) + #endif +-#ifndef DriverManDir +-#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) ++#ifndef MiscManSuffix ++#define MiscManSuffix $(MISCMANSECT)$(PROJECTMANSUFFIX) + #endif +-#ifndef AppLoadDefs +-#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) ++#ifndef AdmManDir ++#define AdmManDir $(MANSOURCEPATH)$(ADMMANSECT) ++#endif ++#ifndef AdmManSuffix ++#define AdmManSuffix $(ADMMANSECT)$(PROJECTMANSUFFIX) + #endif + #ifndef AppManDefs +-#define AppManDefs -D__appmansuffix__=$(MANSUFFIX) ++#define AppManDefs -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) ++#endif ++#ifndef ManDefs ++#define ManDefs -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) ++#endif ++#ifndef SyscallManDefs ++#define SyscallManDefs -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) + #endif + #ifndef LibManDefs +-#define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX) ++#define LibManDefs -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) ++#endif ++#ifndef DriverManDefs ++#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) + #endif + #ifndef FileManDefs +-#define FileManDefs -D__filemansuffix__=$(FILEMANSUFFIX) ++#define FileManDefs -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) ++#endif ++#ifndef GameManDefs ++#define GameManDefs -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) + #endif + #ifndef MiscManDefs +-#define MiscManDefs -D__miscmansuffix__=$(MISCMANSUFFIX) ++#define MiscManDefs -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) + #endif +-#ifndef DriverManDefs +-#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX) ++#ifndef AdmManDefs ++#define AdmManDefs -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) ++#endif ++#ifndef AppLoadDefs ++#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) + #endif + #ifndef AdminManDefs + #define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX) +@@ -963,6 +1008,21 @@ TCLIBDIR = TclLibDir + #endif + #endif + ++#ifndef IconDir ++# if !NothingOutsideProjectRoot ++# define IconDir "/usr/share/icons" ++# ifndef XcursorPath ++# define XcursorPath "~/.icons:/usr/share/icons:/usr/share/pixmaps" ++# endif ++# else ++# define IconDir Concat(ProjectRoot,/lib/X11/icons) ++# endif ++#endif ++ ++#ifndef XcursorPath ++# define XcursorPath Concat(~/.icons:/usr/share/icons:/usr/share/pixmaps:,IconDir) ++#endif ++ + #ifndef LogDirectory + #if HasVarDirectory + #define LogDirectory $(VARDIR)/log +@@ -1609,32 +1669,50 @@ TCLIBDIR = TclLibDir + #ifndef SHsuf + #define SHsuf sh + #endif +-#ifndef ManSuffix +-#define ManSuffix n /* use just one tab or cpp will die */ ++#ifndef ManSection ++#define ManSection 1 /* use just one tab or cpp will die */ + #endif +-#ifndef LibManSuffix +-#define LibManSuffix 3 /* use just one tab or cpp will die */ ++#ifndef SyscallManSection ++#define SyscallManSection 2 /* use just one tab or cpp will die */ + #endif +-#ifndef FileManSuffix ++#ifndef LibManSection ++#define LibManSection 3 /* use just one tab or cpp will die */ ++#endif ++#ifndef DriverManSection + #if SystemV || SystemV4 || defined(OSF1Architecture) +-#define FileManSuffix 4 /* use just one tab or cpp will die */ ++#define DriverManSection 7 /* use just one tab or cpp will die */ + #else +-#define FileManSuffix 5 /* use just one tab or cpp will die */ ++#define DriverManSection 4 /* use just one tab or cpp will die */ + #endif + #endif +-#ifndef MiscManSuffix ++#ifndef FileManSection + #if SystemV || SystemV4 || defined(OSF1Architecture) +-#define MiscManSuffix 5 /* use just one tab or cpp will die */ ++#define FileManSection 4 /* use just one tab or cpp will die */ + #else +-#define MiscManSuffix 7 /* use just one tab or cpp will die */ ++#define FileManSection 5 /* use just one tab or cpp will die */ + #endif + #endif +-#ifndef DriverManSuffix ++#ifndef GameManSection ++#define GameManSection 6 /* use just one tab or cpp will die */ ++#endif ++#ifndef MiscManSection + #if SystemV || SystemV4 || defined(OSF1Architecture) +-#define DriverManSuffix 7 /* use just one tab or cpp will die */ ++#define MiscManSection 5 /* use just one tab or cpp will die */ + #else +-#define DriverManSuffix 4 /* use just one tab or cpp will die */ ++#define MiscManSection 7 /* use just one tab or cpp will die */ ++#endif ++#endif ++#ifndef AdmManSection ++#define AdmManSection 8 /* use just one tab or cpp will die */ + #endif ++#ifndef ManSrcSection ++#define ManSrcSection s /* use just one tab or cpp will die */ ++#endif ++#ifndef ManNewSection ++#define ManNewSection n /* use just one tab or cpp will die */ ++#endif ++#ifndef ProjectManSuffix ++#define ProjectManSuffix X11 /* use just one tab or cpp will die */ + #endif + #ifndef AdminManSuffix + #if SystemV || SystemV4 +@@ -1763,9 +1841,15 @@ TCLIBDIR = TclLibDir + MANPATH = ManPath /* top of manual page tree */ + MANSOURCEPATH = ManSourcePath /* prefix for man page sources */ + MANDIR = ManDir /* man pages for commands */ +- LIBMANDIR = LibmanDir /* man pages for library routines */ ++ SYSCALLMANDIR = SyscallManDir /* man pages for system calls */ ++ LIBMANDIR = LibManDir /* man pages for library routines */ ++ DRIVERMANDIR = DriverManDir /* man pages for drivers */ + FILEMANDIR = FileManDir /* man pages for config files */ ++ GAMEMANDIR = GameManDir /* man pages for game commands */ + MISCMANDIR = MiscManDir /* man pages for miscellaneous files */ ++ ADMMANDIR = AdmManDir /* man pages for administrative commands */ ++ ICONDIR = IconDir /* Xcursor cursors/icon directory */ ++ XCURSORPATH = XcursorPath /* Xcursor cursors path */ + DRIVERMANDIR = DriverManDir /* man pages for drivers */ + LOGDIRECTORY = LogDirectory /* OS location of log files */ + #ifdef VarRunDirectory +@@ -1872,15 +1956,30 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes + PERL = PerlCmd + PERLOPTS = PerlOptions + PERLENVSETUP = PerlEnvSetup ++ ++ MANSECT = ManSection /* section for command man pages */ ++ SYSCALLMANSECT = SyscallManSection /* section for system call man pages */ ++ LIBMANSECT = LibManSection /* section for library man pages */ ++ DRIVERMANSECT = DriverManSection /* section for driver man pages */ ++ FILEMANSECT = FileManSection /* section for file format man pages */ ++ GAMEMANSECT = GameManSection /* section for game command man pages */ ++ MISCMANSECT = MiscManSection /* section for misc man pages */ ++ ADMMANSECT = AdmManSection /* section for administrative command man pages */ ++ MANSRCSECT = ManSrcSection /* section for man page source */ ++ MANNEWSECT = ManNewSection /* section for preprocessed man source */ ++ PROJECTMANSUFFIX = ProjectManSuffix /* man page suffix for the X11 distribution */ + MANSUFFIX = ManSuffix /* suffix for command man pages */ ++ SYSCALLMANSUFFIX = SyscallManSuffix /* suffix for system call man pages */ + LIBMANSUFFIX = LibManSuffix /* suffix for library man pages */ ++ DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ + FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */ ++ GAMEMANSUFFIX = GameManSuffix /* suffix for game command man pages */ + MISCMANSUFFIX = MiscManSuffix /* suffix for misc man pages */ +- DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ ++ ADMMANSUFFIX = AdmManSuffix /* suffix for administrative command man pages */ + ADMINMANSUFFIX = AdminManSuffix /* suffix for admin command man pages */ + MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ + MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ +- MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS) ++ MANDEFS = AppLoadDefs FileManDefs LibManDefs ManDefs SyscallManDefs GameManDefs MiscManDefs AdmManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs AppManDefs $(XORGMANDEFS) $(VENDORMANDEFS) + + COMPRESSMANCMD = CompressManCmd + +diff --git a/xorg-cf-files/Library.tmpl b/xorg-cf-files/Library.tmpl +index 95a9207..af587f0 100644 +--- a/xorg-cf-files/Library.tmpl ++++ b/xorg-cf-files/Library.tmpl +@@ -37,6 +37,14 @@ XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23tsi Exp $ + #define DoExtraLib NO + #endif + ++#ifndef DoPicLib ++# if DoNormalLib && !DoSharedLib && !StaticNeedsPicForShared ++# define DoPicLib YES ++# else ++# define DoPicLib NO ++# endif ++#endif ++ + #ifndef HasSharedData + #define HasSharedData NO + #endif +@@ -53,7 +61,7 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags + #endif + + #ifndef LibraryCplusplusOptions +-# if DoSharedLib && defined(SharedLibraryCplusplusOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) + # define LibraryCplusplusOptions SharedLibraryCplusplusOptions + # else + # define LibraryCplusplusOptions DefaultCplusplusOptions +@@ -85,14 +93,14 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags + + #ifndef CplusplusSource + # ifndef LibraryCcCmd +-# if DoSharedLib && defined(SharedLibraryCcCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd) + # define LibraryCcCmd SharedLibraryCcCmd + # else + # define LibraryCcCmd CcCmd + # endif + # endif + # ifndef LibraryCCOptions +-# if DoSharedLib && defined(SharedLibraryCCOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions) + # define LibraryCCOptions SharedLibraryCCOptions + # else + # define LibraryCCOptions DefaultCCOptions +@@ -121,7 +129,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt + #else + # ifndef CrossCompileDir + # ifndef LibraryCplusplusCmd +-# if DoSharedLib && defined(SharedLibraryCplusplusCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) + # define LibraryCplusplusCmd SharedLibraryCplusplusCmd + # else + # define LibraryCplusplusCmd CplusplusCmd +@@ -129,7 +137,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt + # endif + # else + # ifndef CrossLibraryCplusplusCmd +-# if DoSharedLib && defined(SharedLibraryCplusplusCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) + # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd)) + # else + # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd)) +@@ -138,7 +146,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt + # endif + + # ifndef LibraryCplusplusOptions +-# if DoSharedLib && defined(SharedLibraryCplusplusOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) + # define LibraryCplusplusOptions SharedLibraryCplusplusOptions + # else + # define LibraryCplusplusOptions DefaultCplusplusOptions +@@ -204,14 +212,14 @@ LIB_MT_DEFINES = LibraryMTDefines + # define _NormalObjCplusplusCompile(options) $(_NULLCMD_) + # define _NormalCleanDir() $(_NULLCMD_) + #else +-# if DoSharedLib && SeparateSharedCompile ++# if (DoSharedLib || DoPicLib) && SeparateSharedCompile + # define _NormalLibMkdir() _LibMkdir(unshared) + # define _NormalObjCompile(options) UnsharedLibObjCompile(options) + # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) + # define _NormalCleanDir() LibCleanDir(unshared) + # else + # define _NormalLibMkdir() $(_NULLCMD_) +-# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) ++# if (!DoSharedLib && !DoPicLib) && defined(IncludeSharedObjectInNormalLib) + # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) + # else + # define _NormalObjCompile(options) NormalLibObjCompile(options) +@@ -221,7 +229,7 @@ LIB_MT_DEFINES = LibraryMTDefines + # endif + #endif + +-#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile) ++#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile) + # define _SharedObjCompile(options) $(_NULLCMD_) + # define _SharedObjCplusplusCompile(options) $(_NULLCMD_) + #else +@@ -517,6 +525,12 @@ DebuggedLibraryTarget($(LIBNAME),$(OBJS) $(EXTRAUNSHAREDOBJS)) + InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) + # endif + # endif ++# if DoPicLib ++PicLibraryTarget($(LIBNAME),$(OBJS)) ++# if !defined(LibInstall) || LibInstall ++InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR)) ++# endif ++# endif + # if DoExtraLib && defined(ExtraLibRules) + ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS)) + # if !defined(LibInstall) || LibInstall +diff --git a/xorg-cf-files/NetBSD.cf b/xorg-cf-files/NetBSD.cf +index 7d9aadd..e673328 100644 +--- a/xorg-cf-files/NetBSD.cf ++++ b/xorg-cf-files/NetBSD.cf +@@ -18,12 +18,178 @@ XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.122 2003/11/18 18:09:45 da + #define OSTeenyVersion DefaultOSTeenyVersion + #endif + ++#ifndef NetBSDDistribution ++#define NetBSDDistribution DefaultNetBSDDistribution ++/* ++ Add "#define NetBSDDistribution NetBSD" to your site.def or host.def. ++ Currently only NetBSDDebian will be autodetected. ++ Valid values are: ++ NetBSDUnknown (0) ++ NetBSDNative (1) ++ NetBSDDebian (2) ++*/ ++#endif ++ ++#ifndef NetBSDDistName ++# define NetBSDDistName DefaultNetBSDDistName ++#endif + + #ifndef OSVendor +-#define OSVendor The NetBSD Foundation, Inc. ++#define OSVendor The NetBSD Foundation, Inc. ++#endif ++ ++#ifndef NetBSDBinUtilsMajorVersion ++# define NetBSDBinUtilsMajorVersion DefaultNetBSDBinUtilsMajorVersion + #endif ++ + XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + ++/* Defines for Debian GNU/NetBSD */ ++ ++#if NetBSDDistribution == NetBSDDebian ++# ifndef DefaultGcc2OptimizeOpt ++# define DefaultGcc2OptimizeOpt -O2 ++# endif ++# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs ++# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs ++# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs ++# define SystemManDirectory /usr/share/man ++# define HasPam YES ++# 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 ++/* un-comment this when it is un-broken */ ++/* # define JoystickSupport YES */ ++# 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) ++# define InstallAppDefFiles YES ++/* the relative symlink created by this rule causes problems for us */ ++# ifdef InstallAppDefFiles ++# if InstallAppDefFiles ++# define InstallAppDefaultsLong(file,class) @@\ ++InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) ++# else ++# define InstallAppDefaultsLong(file,class) @@\ ++InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) ++# endif ++# endif /* InstallAppDefFiles */ ++# define SharedLibXdmGreet NO ++# define LinkGLToUsrInclude NO ++# define LinkGLToUsrLib NO ++# define SharedLibFont NO ++# define HasZlib YES ++# define SharedLibGlu YES ++# define NormalLibGlu YES ++# define FSUseSyslog YES ++ ++# define DebianMaintainer YES ++ ++# ifdef DebianMaintainer ++# ifndef XFree86CustomVersion ++# define XFree86CustomVersion "Debian" ++# endif ++# ifndef BuilderEMailAddr ++# define BuilderEMailAddr "debian-x@lists.debian.org" ++# endif ++# define XFree86Devel YES ++# define InstallXinitConfig YES ++# define InstallXdmConfig YES ++# define InstallFSConfig YES ++# define DebuggableLibraries YES ++# define ForceNormalLib YES ++# define BuildRman NO ++# define BuildHtmlManPages NO ++/* ++ * Debian doesn't use certain parts of the tree when doing ++ * architecture-specific package builds. ++ */ ++# ifndef BuildFonts ++# define BuildFonts YES ++# endif ++# ifndef BuildSpecsDocs ++# define BuildSpecsDocs YES ++# endif ++# if BuildSpecsDocs ++# define BuildAllSpecsDocs YES ++# endif ++/* ++ * The XFree86 Debian package uses a local patch that defines a ++ * PicLibraryTarget() Imake rule, instead of using upstream's method. ++ */ ++# define StaticNeedsPicForShared NO ++# define KernelVersionInBanner YES ++# define ProjectManSuffix x ++/* The TT/Meltho fonts are all under non-free licenses. */ ++# define BuildTrueTypeFonts NO ++# define BuildBethMarduthoFonts NO ++/* ++ * The XFree86 Debian package build-depends on external Expat, Fontconfig, ++ * Freetype, Render, Xcursor, and Xft libraries. ++ */ ++# define BuildExpatLibrary NO ++# define HasExpat YES ++# define ExpatIncDirStandard YES ++# define BuildFontconfigLibrary NO ++# define HasFontconfig YES ++# define UseFontconfig YES ++# define FontconfigIncDir /usr/include/fontconfig ++# define BuildFreetype2Library NO ++# define HasFreetype2 YES ++# define BuildRenderLibrary NO ++# define HasRenderLibrary YES ++# define BuildXcursorLibrary NO ++# define HasXcursorLibrary YES ++/* Xlib needs to know the available version of Xcursor. */ ++# define SharedXcursorRev 1 ++# define BuildXftLibrary NO ++# define HasXftLibrary YES ++ ++# ifdef UseInstalled ++# define RenderLibraryDir /usr ++# define XftLibraryDir /usr ++# define XcursorLibraryDir /usr ++# else ++/* The XFree86 Debian package uses a special hack to find these libraries. */ ++# define RenderLibraryDir $(TOP)/../../imports ++# define XftLibraryDir $(TOP)/../../imports ++# define XcursorLibraryDir $(TOP)/../../imports ++# endif ++ ++/* ++ * We want to be sure that the normal XFree86 X server and the debugging X ++ * server use the same FreeType2 library. We'd *like* it if we could ++ * achieve this by both packages dynamically linking against the system's ++ * FreeType2 library; however, the normal X server package ++ * (xserver-xorg) *cannot* be built dynamically linked against the ++ * FreeType2 library when the module loader is enabled because of ++ * code/design issues. Therefore, we encapsulate XFree86's internal "fork" ++ * of the FreeType2 library into *both* xserver-xorg and ++ * xserver-xorg-dbg. When it becomes possible to build the ++ * module-loading server against an external FreeType2 shared library, we ++ * can drop this define: ++ */ ++# define FontLibSharedFreeType NO ++ ++# define HasLinuxInput YES ++# define HasXdmAuth YES ++# define HasLatex YES ++/* Enable extended instruction set support. */ ++# ifdef i386Architecture ++# define HasX86Support YES ++# define HasMMXSupport YES ++# define Has3DNowSupport YES ++# define HasSSESupport YES ++# endif /* i386Architecture */ ++# endif /* DebianMaintainer */ ++#endif /* NetBSDDebian */ ++ + /* + * C library features + */ +@@ -93,8 +259,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + + #define HasUsableFileMmap YES + +-#define HasVarRun YES ++#if NetBSDDistribution == NetBSDDebian ++#define VarDbDirectory $(VARDIR)/lib ++#else /* Debian */ + #define HasVarDb YES ++#endif /* Debian */ ++#define HasVarRun YES + + #define HasShadowPasswd NO + +@@ -207,6 +377,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + + #if UseElfFormat + #define DlLibrary -rdynamic /* no -ldl yet */ ++#define HasPlugin YES ++#define VendorHasX11R6_3libXext YES + #else + #define DlLibrary /**/ + #endif +@@ -336,6 +508,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + /* NetBSD doesn't have gperf in the base install */ + #define DontRebuildGperfOutput YES + ++#if NetBSDDistribution == NetBSDDebian ++#define HasPerl YES ++#endif ++ + /* + * NetBSD doesn't have perl in default system + * you may override this in host.def if you installed perl from the packages +@@ -355,7 +531,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + /* + * Make & install Features + */ ++ ++#if NetBSDDistribution == NetBSDDebian ++#define HasBsdMake NO ++#else + #define HasBsdMake YES ++#endif ++ + #define CompressAllFonts YES + #define GzipFontCompression YES + #define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR) +@@ -463,6 +645,8 @@ dirs: .EXEC @@\ + @@\ + .EXEC: + ++#if NetBSDDistribution != NetBSDDebian /* Debian uses ProjectManSuffix */ ++ + /* + * Man pages need to be formatted when installed, so override the default + * imake rules. +@@ -552,6 +736,8 @@ InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ + InstallManPageAliasesBase(file,destdir,aliases) + ++#endif /* NetBSDDistribution != NetBSDDebian */ ++ + /* + * Shared libraries supported starting in 1.0 on a.out platforms, + * and on all ELF platforms. +diff --git a/xorg-cf-files/X11.tmpl b/xorg-cf-files/X11.tmpl +index 4bbec82..034d88e 100644 +--- a/xorg-cf-files/X11.tmpl ++++ b/xorg-cf-files/X11.tmpl +@@ -614,23 +614,29 @@ XORGRELSTRING = XorgManVersionString + #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 +@@ -700,8 +706,12 @@ XORGRELSTRING = XorgManVersionString + #define BuildXkbcomp BuildClients + #endif + ++#ifndef HasXcursorLibrary ++#define HasXcursorLibrary NO ++#endif ++ + #ifndef BuildXcursorLibrary +-#define BuildXcursorLibrary BuildRenderLibrary ++#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary && BuildLibraries) + #endif + + #ifndef BuildXcursorgen +@@ -1170,7 +1180,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN + #endif + + #ifndef RenderDefines +-#if BuildRender ++#if BuildRender || HasRenderLibrary + #define RenderDefines -DRENDER + #else + #define RenderDefines /**/ +@@ -2669,6 +2679,7 @@ SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) + ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) + #endif + ++#if BuildRenderLibrary + XRENDERLIBSRC = $(LIBSRC)/Xrender + #if SharedLibXrender + #ifndef SharedXrenderRev +@@ -2679,6 +2690,42 @@ SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderR + 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 +@@ -2729,6 +2776,7 @@ SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) + ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) + #endif + ++#if BuildXcursorLibrary + XCURSORLIBSRC = $(LIBSRC)/Xcursor + #if SharedLibXcursor + #ifndef SharedXcursorRev +@@ -2739,6 +2787,41 @@ SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorR + 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 +@@ -3544,6 +3627,7 @@ EXPATDEFINES = -DEXPAT + + #endif /* UseExpat */ + ++#if BuildXftLibrary + #ifndef SharedLibXft1 + #define SharedLibXft1 HasSharedLibraries + #endif +@@ -3556,6 +3640,18 @@ EXPATDEFINES = -DEXPAT + #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 +@@ -3610,6 +3706,42 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) + #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 +@@ -3725,8 +3857,6 @@ FONTCONFIGDEFINES = -DFONTCONFIG + + #endif /* UseFontconfig */ + +-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) +- + #ifdef HasLibpng + + /* +diff --git a/xorg-cf-files/bsdLib.rules b/xorg-cf-files/bsdLib.rules +index 50b4fe1..8fd7364 100644 --- a/xorg-cf-files/bsdLib.rules +++ b/xorg-cf-files/bsdLib.rules -@@ -13,6 +13,12 @@ +@@ -13,6 +13,12 @@ XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.27 2003/11/20 00:41:37 dawes Exp $ #define UseElfFormat NO #endif @@ -13,7 +901,7 @@ #if !UseElfFormat /* a.out shared libs */ #ifndef HasSharedLibraries -@@ -91,6 +97,34 @@ +@@ -91,6 +97,34 @@ clean:: @@\ #endif /* SharedDepLibraryTarget */ @@ -48,17 +936,15 @@ #ifndef SharedDepModuleTarget #define SharedDepModuleTarget(name,deps,solist) @@\ AllTarget(name) @@\ +diff --git a/xorg-cf-files/gnu.cf b/xorg-cf-files/gnu.cf +index a79c427..ae767b5 100644 --- a/xorg-cf-files/gnu.cf +++ b/xorg-cf-files/gnu.cf -@@ -17,16 +17,231 @@ +@@ -17,16 +17,231 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.2 2004/04/23 18:41:58 eich Exp $ #ifndef OSTeenyVersion #define OSTeenyVersion DefaultOSTeenyVersion #endif --XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - --#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ -- -D_POSIX_SOURCE -D_XOPEN_SOURCE \ -- -D_BSD_SOURCE -D_SVID_SOURCE ++ +#ifndef HasGhostScript +# define HasGhostScript YES +#endif @@ -69,16 +955,14 @@ +#ifndef GnuBinUtilsMajorVersion +# define GnuBinUtilsMajorVersion DefaultGnuBinUtilsMajorVersion +#endif - --XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? -+XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) ++ + XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) +XCOMM libc: (GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion) +XCOMM binutils: (GnuBinUtilsMajorVersion) - --#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H ++ +#define HasDevRandom NO +#define PollDevRandom NO - ++ +/* Path setup. */ +# ifndef NothingOutsideProjectRoot +# define NothingOutsideProjectRoot NO @@ -243,13 +1127,18 @@ +# define XftLibraryDir $(TOP)/../../imports +# define XcursorLibraryDir $(TOP)/../../imports +# endif -+ + +-#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ +- -D_POSIX_SOURCE -D_XOPEN_SOURCE \ +- -D_BSD_SOURCE -D_SVID_SOURCE +/* Wraphelp.c magic is supplied via a custom patch. */ +# define HasXdmAuth YES -+ + +-XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? +# define HasGlide2 NO +# define HasGlide3 NO -+ + +-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H +/* Enable extended instruction set support. */ +# ifdef i386Architecture +# define HasX86Support YES @@ -258,7 +1147,7 @@ +# define HasSSESupport YES +# endif /* i386Architecture */ +# endif /* DebianMaintainer */ -+ + +#ifndef BinUtilsMajorVersion +# define BinUtilsMajorVersion GnuBinUtilsMajorVersion +#endif @@ -288,7 +1177,7 @@ #define HasPosixThreads YES #define ThreadedX YES #define HasThreadSafeAPI YES -@@ -36,35 +251,132 @@ +@@ -36,35 +251,132 @@ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? #ifndef HasLibCrypt #define HasLibCrypt YES #endif @@ -424,7 +1313,7 @@ #define AvoidNullMakeCommand YES #ifndef DebuggableLibraries #define DebuggableLibraries NO -@@ -84,32 +396,64 @@ +@@ -84,32 +396,64 @@ XCOMM Not implemented and will always fail. #define UseStaticTermcapLib NO #endif @@ -497,23 +1386,23 @@ #define YaccCmd bison -y #define LexCmd flex -l #define HasFlex YES -@@ -125,50 +469,68 @@ +@@ -125,50 +469,68 @@ XCOMM Not implemented and will always fail. #define StandardCppDefines StandardDefines #define HasVarRun YES +#ifndef VarDbDirectory #define VarDbDirectory $(VARDIR)/lib +#endif -+ + +-XCOMM i386Architecture +-#define OptimizedCDebugFlags DefaultGcc2i386Opt +-#define GNUMachineDefines -D__i386__ +#ifndef OSXInputDrivers +# define OSXInputDrivers1 /**/ +# define OSXInputDrivers2 /**/ +# define OSXInputDrivers OSXInputDrivers1 OSXInputDrivers2 +#endif - --XCOMM i386Architecture --#define OptimizedCDebugFlags DefaultGcc2i386Opt --#define GNUMachineDefines -D__i386__ ++ +#define HasPlugin YES +#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ + @@ -544,12 +1433,12 @@ -/* Some of these man page defaults are overriden in the above OS sections */ -#ifndef ManSuffix -# define ManSuffix 1x +-#endif +-#ifndef ManDir +-# define ManDir $(MANSOURCEPATH)1 +#ifndef PamLibraries +#define PamLibraries -lpam DlLibrary #endif --#ifndef ManDir --# define ManDir $(MANSOURCEPATH)1 --#endif -#ifndef LibManSuffix -# define LibManSuffix 3x -#endif @@ -589,16 +1478,16 @@ #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ -@@ -176,12 +538,16 @@ +@@ -176,12 +538,16 @@ XCOMM i386Architecture #define ArchitectureDefines -DGNU_ARCHITECTURE -#define XserverNeedsSetUID YES +- +-#include +#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) +#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) --#include -- -XCOMM XXX Might need this if they are not careful with slashes. -XCOMM #define DirFailPrefix - +#ifndef BuildDmx @@ -611,6 +1500,8 @@ +#ifndef XFree86ServerOSDefines +# define XFree86ServerOSDefines +#endif +diff --git a/xorg-cf-files/gnuLib.rules b/xorg-cf-files/gnuLib.rules +index 1004550..a47bce1 100644 --- a/xorg-cf-files/gnuLib.rules +++ b/xorg-cf-files/gnuLib.rules @@ -17,7 +17,6 @@ @@ -621,7 +1512,7 @@ #ifndef UseRpath #define UseRpath NO #endif -@@ -26,10 +25,13 @@ +@@ -26,10 +25,13 @@ XCOMM XXX To rpath or not to rpath... #define SharedOldX NO #endif @@ -636,7 +1527,7 @@ #ifndef SharedDataSeparation #define SharedDataSeparation NO -@@ -45,7 +47,7 @@ +@@ -45,7 +47,7 @@ XCOMM XXX To rpath or not to rpath... #endif #ifndef RpathLoadFlags #if UseRpath @@ -645,7 +1536,7 @@ #else #define RpathLoadFlags /**/ #endif -@@ -54,7 +56,7 @@ +@@ -54,7 +56,7 @@ XCOMM XXX To rpath or not to rpath... #define LibraryRpathLoadFlags RpathLoadFlags #endif #ifndef SharedLibraryLoadFlags @@ -654,7 +1545,7 @@ #endif #ifndef PositionIndependentCFlags #define PositionIndependentCFlags -fPIC -@@ -63,12 +65,13 @@ +@@ -63,12 +65,13 @@ XCOMM XXX To rpath or not to rpath... #define PositionIndependentCplusplusFlags -fPIC #endif #ifndef ExtraLoadFlags @@ -673,7 +1564,7 @@ #endif /* -@@ -87,6 +90,26 @@ +@@ -87,6 +90,26 @@ install:: Concat(lib,libname.so.rev) @@\ $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi #endif /* InstallSharedLibrary */ @@ -700,7 +1591,7 @@ /* * InstallSharedLibraryData - generate rules to install the shared library data */ -@@ -106,9 +129,9 @@ +@@ -106,9 +129,9 @@ AllTarget(Concat(lib,libname.so.rev)) @@\ @@\ Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @@ -713,7 +1604,7 @@ LinkBuildSonameLibrary($$SONAME) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ -@@ -125,6 +148,38 @@ +@@ -125,6 +148,38 @@ clean:: @@\ #endif /* SharedLibraryTarget */ @@ -752,7 +1643,7 @@ /* * SharedDepLibraryTarget - generate rules to create a shared library. */ -@@ -153,6 +208,34 @@ +@@ -153,6 +208,34 @@ clean:: @@\ #endif /* SharedDepLibraryTarget */ @@ -787,7 +1678,7 @@ #ifndef SharedDepModuleTarget #define SharedDepModuleTarget(name,deps,solist) @@\ AllTarget(name) @@\ -@@ -168,6 +251,23 @@ +@@ -168,6 +251,23 @@ clean:: @@\ #endif /* SharedDepModuleTarget */ @@ -811,6 +1702,8 @@ /* * SharedLibraryDataTarget - generate rules to create shlib data file; */ +diff --git a/xorg-cf-files/gnuLib.tmpl b/xorg-cf-files/gnuLib.tmpl +index 012277c..fadc2e4 100644 --- a/xorg-cf-files/gnuLib.tmpl +++ b/xorg-cf-files/gnuLib.tmpl @@ -1,8 +1,9 @@ @@ -828,7 +1721,7 @@ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -@@ -14,15 +15,71 @@ +@@ -14,15 +15,71 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif @@ -902,377 +1795,11 @@ +#endif + +#define NoMessageCatalog ---- a/xorg-cf-files/Imake.rules -+++ b/xorg-cf-files/Imake.rules -@@ -2722,6 +2722,20 @@ - - - /* -+ * Rule to build libXXX_pic.a from PIC objects for a library -+ */ -+#ifndef PicLibraryTarget -+#define PicLibraryTarget(libname,objlist) @@\ -+AllTarget(LibraryTargetNameSuffix(libname,_pic)) @@\ -+ @@\ -+LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS) @@\ -+ RemoveFile($@) @@\ -+ MakeLibrary($@,objlist) @@\ -+ RanLibrary($@) @@\ -+ _LinkBuildLibrary($@) -+#endif /* PicLibraryTarget */ -+ -+/* - * SubdirLibraryRule - - */ - #ifndef SubdirLibraryRule ---- a/xorg-cf-files/Imake.tmpl -+++ b/xorg-cf-files/Imake.tmpl -@@ -902,37 +902,82 @@ - #define ManSourcePath $(MANPATH)/man - #endif - #ifndef ManDir --#define ManDir $(MANSOURCEPATH)$(MANSUFFIX) -+#define ManDir $(MANSOURCEPATH)$(MANSECT) - #endif --#ifndef LibmanDir --#define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) -+#ifndef ManSuffix -+#define ManSuffix $(MANSECT)$(PROJECTMANSUFFIX) -+#endif -+#ifndef SyscallManDir -+#define SyscallManDir $(MANSOURCEPATH)$(SYSCALLMANSECT) -+#endif -+#ifndef SyscallManSuffix -+#define SyscallManSuffix $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -+#endif -+#ifndef LibManDir -+#define LibManDir $(MANSOURCEPATH)$(LIBMANSECT) -+#endif -+#ifndef LibManSuffix -+#define LibManSuffix $(LIBMANSECT)$(PROJECTMANSUFFIX) -+#endif -+#ifndef DriverManDir -+#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSECT) -+#endif -+#ifndef DriverManSuffix -+#define DriverManSuffix $(DRIVERMANSECT)$(PROJECTMANSUFFIX) - #endif - #ifndef FileManDir --#define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) -+#define FileManDir $(MANSOURCEPATH)$(FILEMANSECT) -+#endif -+#ifndef FileManSuffix -+#define FileManSuffix $(FILEMANSECT)$(PROJECTMANSUFFIX) -+#endif -+#ifndef GameManDir -+#define GameManDir $(MANSOURCEPATH)$(GAMEMANSECT) -+#endif -+#ifndef GameManSuffix -+#define GameManSuffix $(GAMEMANSECT)$(PROJECTMANSUFFIX) - #endif - #ifndef MiscManDir --#define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) -+#define MiscManDir $(MANSOURCEPATH)$(MISCMANSECT) - #endif --#ifndef DriverManDir --#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -+#ifndef MiscManSuffix -+#define MiscManSuffix $(MISCMANSECT)$(PROJECTMANSUFFIX) - #endif --#ifndef AppLoadDefs --#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) -+#ifndef AdmManDir -+#define AdmManDir $(MANSOURCEPATH)$(ADMMANSECT) -+#endif -+#ifndef AdmManSuffix -+#define AdmManSuffix $(ADMMANSECT)$(PROJECTMANSUFFIX) - #endif - #ifndef AppManDefs --#define AppManDefs -D__appmansuffix__=$(MANSUFFIX) -+#define AppManDefs -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -+#endif -+#ifndef ManDefs -+#define ManDefs -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -+#endif -+#ifndef SyscallManDefs -+#define SyscallManDefs -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) - #endif - #ifndef LibManDefs --#define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX) -+#define LibManDefs -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -+#endif -+#ifndef DriverManDefs -+#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) - #endif - #ifndef FileManDefs --#define FileManDefs -D__filemansuffix__=$(FILEMANSUFFIX) -+#define FileManDefs -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -+#endif -+#ifndef GameManDefs -+#define GameManDefs -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) - #endif - #ifndef MiscManDefs --#define MiscManDefs -D__miscmansuffix__=$(MISCMANSUFFIX) -+#define MiscManDefs -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) - #endif --#ifndef DriverManDefs --#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX) -+#ifndef AdmManDefs -+#define AdmManDefs -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -+#endif -+#ifndef AppLoadDefs -+#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) - #endif - #ifndef AdminManDefs - #define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX) -@@ -963,6 +1008,21 @@ - #endif - #endif - -+#ifndef IconDir -+# if !NothingOutsideProjectRoot -+# define IconDir "/usr/share/icons" -+# ifndef XcursorPath -+# define XcursorPath "~/.icons:/usr/share/icons:/usr/share/pixmaps" -+# endif -+# else -+# define IconDir Concat(ProjectRoot,/lib/X11/icons) -+# endif -+#endif -+ -+#ifndef XcursorPath -+# define XcursorPath Concat(~/.icons:/usr/share/icons:/usr/share/pixmaps:,IconDir) -+#endif -+ - #ifndef LogDirectory - #if HasVarDirectory - #define LogDirectory $(VARDIR)/log -@@ -1609,32 +1669,50 @@ - #ifndef SHsuf - #define SHsuf sh - #endif --#ifndef ManSuffix --#define ManSuffix n /* use just one tab or cpp will die */ -+#ifndef ManSection -+#define ManSection 1 /* use just one tab or cpp will die */ - #endif --#ifndef LibManSuffix --#define LibManSuffix 3 /* use just one tab or cpp will die */ -+#ifndef SyscallManSection -+#define SyscallManSection 2 /* use just one tab or cpp will die */ - #endif --#ifndef FileManSuffix -+#ifndef LibManSection -+#define LibManSection 3 /* use just one tab or cpp will die */ -+#endif -+#ifndef DriverManSection - #if SystemV || SystemV4 || defined(OSF1Architecture) --#define FileManSuffix 4 /* use just one tab or cpp will die */ -+#define DriverManSection 7 /* use just one tab or cpp will die */ - #else --#define FileManSuffix 5 /* use just one tab or cpp will die */ -+#define DriverManSection 4 /* use just one tab or cpp will die */ - #endif - #endif --#ifndef MiscManSuffix -+#ifndef FileManSection - #if SystemV || SystemV4 || defined(OSF1Architecture) --#define MiscManSuffix 5 /* use just one tab or cpp will die */ -+#define FileManSection 4 /* use just one tab or cpp will die */ - #else --#define MiscManSuffix 7 /* use just one tab or cpp will die */ -+#define FileManSection 5 /* use just one tab or cpp will die */ - #endif - #endif --#ifndef DriverManSuffix -+#ifndef GameManSection -+#define GameManSection 6 /* use just one tab or cpp will die */ -+#endif -+#ifndef MiscManSection - #if SystemV || SystemV4 || defined(OSF1Architecture) --#define DriverManSuffix 7 /* use just one tab or cpp will die */ -+#define MiscManSection 5 /* use just one tab or cpp will die */ - #else --#define DriverManSuffix 4 /* use just one tab or cpp will die */ -+#define MiscManSection 7 /* use just one tab or cpp will die */ -+#endif -+#endif -+#ifndef AdmManSection -+#define AdmManSection 8 /* use just one tab or cpp will die */ - #endif -+#ifndef ManSrcSection -+#define ManSrcSection s /* use just one tab or cpp will die */ -+#endif -+#ifndef ManNewSection -+#define ManNewSection n /* use just one tab or cpp will die */ -+#endif -+#ifndef ProjectManSuffix -+#define ProjectManSuffix X11 /* use just one tab or cpp will die */ - #endif - #ifndef AdminManSuffix - #if SystemV || SystemV4 -@@ -1763,9 +1841,15 @@ - MANPATH = ManPath /* top of manual page tree */ - MANSOURCEPATH = ManSourcePath /* prefix for man page sources */ - MANDIR = ManDir /* man pages for commands */ -- LIBMANDIR = LibmanDir /* man pages for library routines */ -+ SYSCALLMANDIR = SyscallManDir /* man pages for system calls */ -+ LIBMANDIR = LibManDir /* man pages for library routines */ -+ DRIVERMANDIR = DriverManDir /* man pages for drivers */ - FILEMANDIR = FileManDir /* man pages for config files */ -+ GAMEMANDIR = GameManDir /* man pages for game commands */ - MISCMANDIR = MiscManDir /* man pages for miscellaneous files */ -+ ADMMANDIR = AdmManDir /* man pages for administrative commands */ -+ ICONDIR = IconDir /* Xcursor cursors/icon directory */ -+ XCURSORPATH = XcursorPath /* Xcursor cursors path */ - DRIVERMANDIR = DriverManDir /* man pages for drivers */ - LOGDIRECTORY = LogDirectory /* OS location of log files */ - #ifdef VarRunDirectory -@@ -1872,15 +1956,30 @@ - PERL = PerlCmd - PERLOPTS = PerlOptions - PERLENVSETUP = PerlEnvSetup -+ -+ MANSECT = ManSection /* section for command man pages */ -+ SYSCALLMANSECT = SyscallManSection /* section for system call man pages */ -+ LIBMANSECT = LibManSection /* section for library man pages */ -+ DRIVERMANSECT = DriverManSection /* section for driver man pages */ -+ FILEMANSECT = FileManSection /* section for file format man pages */ -+ GAMEMANSECT = GameManSection /* section for game command man pages */ -+ MISCMANSECT = MiscManSection /* section for misc man pages */ -+ ADMMANSECT = AdmManSection /* section for administrative command man pages */ -+ MANSRCSECT = ManSrcSection /* section for man page source */ -+ MANNEWSECT = ManNewSection /* section for preprocessed man source */ -+ PROJECTMANSUFFIX = ProjectManSuffix /* man page suffix for the X11 distribution */ - MANSUFFIX = ManSuffix /* suffix for command man pages */ -+ SYSCALLMANSUFFIX = SyscallManSuffix /* suffix for system call man pages */ - LIBMANSUFFIX = LibManSuffix /* suffix for library man pages */ -+ DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ - FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */ -+ GAMEMANSUFFIX = GameManSuffix /* suffix for game command man pages */ - MISCMANSUFFIX = MiscManSuffix /* suffix for misc man pages */ -- DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ -+ ADMMANSUFFIX = AdmManSuffix /* suffix for administrative command man pages */ - ADMINMANSUFFIX = AdminManSuffix /* suffix for admin command man pages */ - MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ - MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ -- MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS) -+ MANDEFS = AppLoadDefs FileManDefs LibManDefs ManDefs SyscallManDefs GameManDefs MiscManDefs AdmManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs AppManDefs $(XORGMANDEFS) $(VENDORMANDEFS) - - COMPRESSMANCMD = CompressManCmd - ---- a/xorg-cf-files/Library.tmpl -+++ b/xorg-cf-files/Library.tmpl -@@ -37,6 +37,14 @@ - #define DoExtraLib NO - #endif - -+#ifndef DoPicLib -+# if DoNormalLib && !DoSharedLib && !StaticNeedsPicForShared -+# define DoPicLib YES -+# else -+# define DoPicLib NO -+# endif -+#endif -+ - #ifndef HasSharedData - #define HasSharedData NO - #endif -@@ -53,7 +61,7 @@ - #endif - - #ifndef LibraryCplusplusOptions --# if DoSharedLib && defined(SharedLibraryCplusplusOptions) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) - # define LibraryCplusplusOptions SharedLibraryCplusplusOptions - # else - # define LibraryCplusplusOptions DefaultCplusplusOptions -@@ -85,14 +93,14 @@ - - #ifndef CplusplusSource - # ifndef LibraryCcCmd --# if DoSharedLib && defined(SharedLibraryCcCmd) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd) - # define LibraryCcCmd SharedLibraryCcCmd - # else - # define LibraryCcCmd CcCmd - # endif - # endif - # ifndef LibraryCCOptions --# if DoSharedLib && defined(SharedLibraryCCOptions) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions) - # define LibraryCCOptions SharedLibraryCCOptions - # else - # define LibraryCCOptions DefaultCCOptions -@@ -121,7 +129,7 @@ - #else - # ifndef CrossCompileDir - # ifndef LibraryCplusplusCmd --# if DoSharedLib && defined(SharedLibraryCplusplusCmd) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) - # define LibraryCplusplusCmd SharedLibraryCplusplusCmd - # else - # define LibraryCplusplusCmd CplusplusCmd -@@ -129,7 +137,7 @@ - # endif - # else - # ifndef CrossLibraryCplusplusCmd --# if DoSharedLib && defined(SharedLibraryCplusplusCmd) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) - # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd)) - # else - # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd)) -@@ -138,7 +146,7 @@ - # endif - - # ifndef LibraryCplusplusOptions --# if DoSharedLib && defined(SharedLibraryCplusplusOptions) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) - # define LibraryCplusplusOptions SharedLibraryCplusplusOptions - # else - # define LibraryCplusplusOptions DefaultCplusplusOptions -@@ -204,14 +212,14 @@ - # define _NormalObjCplusplusCompile(options) $(_NULLCMD_) - # define _NormalCleanDir() $(_NULLCMD_) - #else --# if DoSharedLib && SeparateSharedCompile -+# if (DoSharedLib || DoPicLib) && SeparateSharedCompile - # define _NormalLibMkdir() _LibMkdir(unshared) - # define _NormalObjCompile(options) UnsharedLibObjCompile(options) - # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) - # define _NormalCleanDir() LibCleanDir(unshared) - # else - # define _NormalLibMkdir() $(_NULLCMD_) --# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) -+# if (!DoSharedLib && !DoPicLib) && defined(IncludeSharedObjectInNormalLib) - # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) - # else - # define _NormalObjCompile(options) NormalLibObjCompile(options) -@@ -221,7 +229,7 @@ - # endif - #endif - --#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile) -+#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile) - # define _SharedObjCompile(options) $(_NULLCMD_) - # define _SharedObjCplusplusCompile(options) $(_NULLCMD_) - #else -@@ -517,6 +525,12 @@ - InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) - # endif - # endif -+# if DoPicLib -+PicLibraryTarget($(LIBNAME),$(OBJS)) -+# if !defined(LibInstall) || LibInstall -+InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR)) -+# endif -+# endif - # if DoExtraLib && defined(ExtraLibRules) - ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS)) - # if !defined(LibInstall) || LibInstall +diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf +index 0662cdf..984f518 100644 --- a/xorg-cf-files/linux.cf +++ b/xorg-cf-files/linux.cf -@@ -107,31 +107,48 @@ +@@ -107,31 +107,48 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion) XCOMM binutils: (LinuxBinUtilsMajorVersion) @@ -1330,7 +1857,7 @@ # define FSUseSyslog YES # define BuildLibGlxWithoutPIC NO -@@ -142,15 +159,12 @@ +@@ -142,15 +159,12 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define MiscManSuffix 7x # define MiscManDir $(MANSOURCEPATH)7 @@ -1349,7 +1876,7 @@ # ifndef XorgCustomVersion # define XorgCustomVersion "Debian" # endif -@@ -158,47 +172,138 @@ +@@ -158,47 +172,138 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define BuilderEMailAddr "debian-x@lists.debian.org" # endif # define XFree86Devel YES @@ -1521,7 +2048,7 @@ # endif /* DebianMaintainer */ #endif /* LinuxDebian */ -@@ -591,11 +696,7 @@ +@@ -597,11 +702,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #define MkdirHierCmd mkdir -p #ifndef HaveLib64 @@ -1533,7 +2060,7 @@ #endif #if UseElfFormat -@@ -725,10 +826,10 @@ +@@ -731,10 +832,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # if UseElfFormat # ifdef AlphaArchitecture # define CcCmd gcc -b alpha-linux @@ -1545,7 +2072,7 @@ # endif /* AlphaArchitecture */ # ifdef HPArchitecture # define CcCmd gcc -@@ -740,10 +841,10 @@ +@@ -746,10 +847,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linux @@ -1557,7 +2084,7 @@ # endif /* i386Architecture */ # ifdef ia64Architecture # define CcCmd gcc -@@ -754,10 +855,10 @@ +@@ -760,10 +861,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # endif /* ia64Architecture */ # ifdef Mc68020Architecture # define CcCmd gcc -b m68k-linux @@ -1569,7 +2096,7 @@ # endif /* Mc68020Architecture */ # ifdef AMD64Architecture # define CcCmd gcc -@@ -770,7 +871,7 @@ +@@ -776,7 +877,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define CcCmd gcc # define AsCmd CcCmd -c -x assembler # define LdCmd CcCmd -nostdlib @@ -1578,7 +2105,7 @@ # endif #endif -@@ -837,7 +938,7 @@ +@@ -843,7 +944,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef AlphaArchitecture # ifndef OptimizedCDebugFlags @@ -1587,7 +2114,7 @@ # endif # define LinuxMachineDefines -D__alpha__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -850,7 +951,7 @@ +@@ -856,7 +957,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef Arm32Architecture # define DefaultCCOptions # ifndef OptimizedCDebugFlags @@ -1596,7 +2123,7 @@ # endif # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -858,7 +959,9 @@ +@@ -864,7 +965,9 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif /* Arm32Achitecture */ #ifdef HPArchitecture @@ -1607,7 +2134,7 @@ # define LinuxMachineDefines -D__hppa__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -@@ -866,7 +969,7 @@ +@@ -872,7 +975,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef i386Architecture # ifndef OptimizedCDebugFlags @@ -1616,7 +2143,7 @@ # endif # define LinuxMachineDefines -D__i386__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -875,7 +978,7 @@ +@@ -881,7 +984,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef ia64Architecture # ifndef OptimizedCDebugFlags @@ -1625,7 +2152,7 @@ # endif # define LinuxMachineDefines -D__ia64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -884,7 +987,7 @@ +@@ -890,7 +993,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef Mc68020Architecture # ifndef OptimizedCDebugFlags @@ -1634,7 +2161,7 @@ # endif # define LinuxMachineDefines -D__mc68000__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -912,7 +1015,7 @@ +@@ -918,7 +1021,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef Ppc64Architecture # define DefaultCCOptions -mminimal-toc # ifndef OptimizedCDebugFlags @@ -1643,7 +2170,7 @@ # endif # define LinuxMachineDefines -D__powerpc64__ -D__powerpc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -922,7 +1025,7 @@ +@@ -928,7 +1031,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef PpcArchitecture # define DefaultCCOptions # ifndef OptimizedCDebugFlags @@ -1652,7 +2179,7 @@ # endif # define LinuxMachineDefines -D__powerpc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -931,7 +1034,7 @@ +@@ -937,7 +1040,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef s390Architecture # ifndef OptimizedCDebugFlags @@ -1661,7 +2188,7 @@ # endif # define LinuxMachineDefines -D__s390__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -939,16 +1042,17 @@ +@@ -945,16 +1048,17 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif /* s390Architecture */ #ifdef s390xArchitecture @@ -1683,7 +2210,7 @@ # endif # define LinuxMachineDefines -D__sparc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -979,7 +1083,7 @@ +@@ -985,7 +1089,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # endif # endif # ifndef OptimizedCDebugFlags @@ -1692,7 +2219,7 @@ # endif # define LinuxMachineDefines -D__sh__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -991,7 +1095,7 @@ +@@ -997,7 +1101,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef AMD64Architecture # ifndef OptimizedCDebugFlags @@ -1701,7 +2228,7 @@ # endif # define LinuxMachineDefines -D__amd64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -1000,7 +1104,7 @@ +@@ -1006,7 +1110,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef AArch64Architecture # ifndef OptimizedCDebugFlags @@ -1710,7 +2237,7 @@ # endif # define LinuxMachineDefines -D__aarch64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -@@ -1041,26 +1145,6 @@ +@@ -1047,26 +1151,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define ConnectionFlags -DUNIXCONN -DTCPCONN #endif @@ -1737,7 +2264,7 @@ #ifndef StaticLibrary # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif -@@ -1105,3 +1189,59 @@ +@@ -1111,3 +1195,59 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifndef XFree86ServerOSDefines # define XFree86ServerOSDefines #endif @@ -1797,257 +2324,11 @@ + SELINUX_LIBS = SELinuxLibraries +# endif +#endif ---- a/xorg-cf-files/NetBSD.cf -+++ b/xorg-cf-files/NetBSD.cf -@@ -18,12 +18,178 @@ - #define OSTeenyVersion DefaultOSTeenyVersion - #endif - -+#ifndef NetBSDDistribution -+#define NetBSDDistribution DefaultNetBSDDistribution -+/* -+ Add "#define NetBSDDistribution NetBSD" to your site.def or host.def. -+ Currently only NetBSDDebian will be autodetected. -+ Valid values are: -+ NetBSDUnknown (0) -+ NetBSDNative (1) -+ NetBSDDebian (2) -+*/ -+#endif -+ -+#ifndef NetBSDDistName -+# define NetBSDDistName DefaultNetBSDDistName -+#endif - - #ifndef OSVendor --#define OSVendor The NetBSD Foundation, Inc. -+#define OSVendor The NetBSD Foundation, Inc. - #endif -+ -+#ifndef NetBSDBinUtilsMajorVersion -+# define NetBSDBinUtilsMajorVersion DefaultNetBSDBinUtilsMajorVersion -+#endif -+ - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - -+/* Defines for Debian GNU/NetBSD */ -+ -+#if NetBSDDistribution == NetBSDDebian -+# ifndef DefaultGcc2OptimizeOpt -+# define DefaultGcc2OptimizeOpt -O2 -+# endif -+# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs -+# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs -+# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs -+# define SystemManDirectory /usr/share/man -+# define HasPam YES -+# 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 -+/* un-comment this when it is un-broken */ -+/* # define JoystickSupport YES */ -+# 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) -+# define InstallAppDefFiles YES -+/* the relative symlink created by this rule causes problems for us */ -+# ifdef InstallAppDefFiles -+# if InstallAppDefFiles -+# define InstallAppDefaultsLong(file,class) @@\ -+InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -+# else -+# define InstallAppDefaultsLong(file,class) @@\ -+InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -+# endif -+# endif /* InstallAppDefFiles */ -+# define SharedLibXdmGreet NO -+# define LinkGLToUsrInclude NO -+# define LinkGLToUsrLib NO -+# define SharedLibFont NO -+# define HasZlib YES -+# define SharedLibGlu YES -+# define NormalLibGlu YES -+# define FSUseSyslog YES -+ -+# define DebianMaintainer YES -+ -+# ifdef DebianMaintainer -+# ifndef XFree86CustomVersion -+# define XFree86CustomVersion "Debian" -+# endif -+# ifndef BuilderEMailAddr -+# define BuilderEMailAddr "debian-x@lists.debian.org" -+# endif -+# define XFree86Devel YES -+# define InstallXinitConfig YES -+# define InstallXdmConfig YES -+# define InstallFSConfig YES -+# define DebuggableLibraries YES -+# define ForceNormalLib YES -+# define BuildRman NO -+# define BuildHtmlManPages NO -+/* -+ * Debian doesn't use certain parts of the tree when doing -+ * architecture-specific package builds. -+ */ -+# ifndef BuildFonts -+# define BuildFonts YES -+# endif -+# ifndef BuildSpecsDocs -+# define BuildSpecsDocs YES -+# endif -+# if BuildSpecsDocs -+# define BuildAllSpecsDocs YES -+# endif -+/* -+ * The XFree86 Debian package uses a local patch that defines a -+ * PicLibraryTarget() Imake rule, instead of using upstream's method. -+ */ -+# define StaticNeedsPicForShared NO -+# define KernelVersionInBanner YES -+# define ProjectManSuffix x -+/* The TT/Meltho fonts are all under non-free licenses. */ -+# define BuildTrueTypeFonts NO -+# define BuildBethMarduthoFonts NO -+/* -+ * The XFree86 Debian package build-depends on external Expat, Fontconfig, -+ * Freetype, Render, Xcursor, and Xft libraries. -+ */ -+# define BuildExpatLibrary NO -+# define HasExpat YES -+# define ExpatIncDirStandard YES -+# define BuildFontconfigLibrary NO -+# define HasFontconfig YES -+# define UseFontconfig YES -+# define FontconfigIncDir /usr/include/fontconfig -+# define BuildFreetype2Library NO -+# define HasFreetype2 YES -+# define BuildRenderLibrary NO -+# define HasRenderLibrary YES -+# define BuildXcursorLibrary NO -+# define HasXcursorLibrary YES -+/* Xlib needs to know the available version of Xcursor. */ -+# define SharedXcursorRev 1 -+# define BuildXftLibrary NO -+# define HasXftLibrary YES -+ -+# ifdef UseInstalled -+# define RenderLibraryDir /usr -+# define XftLibraryDir /usr -+# define XcursorLibraryDir /usr -+# else -+/* The XFree86 Debian package uses a special hack to find these libraries. */ -+# define RenderLibraryDir $(TOP)/../../imports -+# define XftLibraryDir $(TOP)/../../imports -+# define XcursorLibraryDir $(TOP)/../../imports -+# endif -+ -+/* -+ * We want to be sure that the normal XFree86 X server and the debugging X -+ * server use the same FreeType2 library. We'd *like* it if we could -+ * achieve this by both packages dynamically linking against the system's -+ * FreeType2 library; however, the normal X server package -+ * (xserver-xorg) *cannot* be built dynamically linked against the -+ * FreeType2 library when the module loader is enabled because of -+ * code/design issues. Therefore, we encapsulate XFree86's internal "fork" -+ * of the FreeType2 library into *both* xserver-xorg and -+ * xserver-xorg-dbg. When it becomes possible to build the -+ * module-loading server against an external FreeType2 shared library, we -+ * can drop this define: -+ */ -+# define FontLibSharedFreeType NO -+ -+# define HasLinuxInput YES -+# define HasXdmAuth YES -+# define HasLatex YES -+/* Enable extended instruction set support. */ -+# ifdef i386Architecture -+# define HasX86Support YES -+# define HasMMXSupport YES -+# define Has3DNowSupport YES -+# define HasSSESupport YES -+# endif /* i386Architecture */ -+# endif /* DebianMaintainer */ -+#endif /* NetBSDDebian */ -+ - /* - * C library features - */ -@@ -93,8 +259,12 @@ - - #define HasUsableFileMmap YES - --#define HasVarRun YES -+#if NetBSDDistribution == NetBSDDebian -+#define VarDbDirectory $(VARDIR)/lib -+#else /* Debian */ - #define HasVarDb YES -+#endif /* Debian */ -+#define HasVarRun YES - - #define HasShadowPasswd NO - -@@ -207,6 +377,8 @@ - - #if UseElfFormat - #define DlLibrary -rdynamic /* no -ldl yet */ -+#define HasPlugin YES -+#define VendorHasX11R6_3libXext YES - #else - #define DlLibrary /**/ - #endif -@@ -336,6 +508,10 @@ - /* NetBSD doesn't have gperf in the base install */ - #define DontRebuildGperfOutput YES - -+#if NetBSDDistribution == NetBSDDebian -+#define HasPerl YES -+#endif -+ - /* - * NetBSD doesn't have perl in default system - * you may override this in host.def if you installed perl from the packages -@@ -355,7 +531,13 @@ - /* - * Make & install Features - */ -+ -+#if NetBSDDistribution == NetBSDDebian -+#define HasBsdMake NO -+#else - #define HasBsdMake YES -+#endif -+ - #define CompressAllFonts YES - #define GzipFontCompression YES - #define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR) -@@ -463,6 +645,8 @@ - @@\ - .EXEC: - -+#if NetBSDDistribution != NetBSDDebian /* Debian uses ProjectManSuffix */ -+ - /* - * Man pages need to be formatted when installed, so override the default - * imake rules. -@@ -552,6 +736,8 @@ - @@\ - InstallManPageAliasesBase(file,destdir,aliases) - -+#endif /* NetBSDDistribution != NetBSDDebian */ -+ - /* - * Shared libraries supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. +diff --git a/xorg-cf-files/sco5.cf b/xorg-cf-files/sco5.cf +index 4fc60ff..79fee5b 100644 --- a/xorg-cf-files/sco5.cf +++ b/xorg-cf-files/sco5.cf -@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.5 2004/09/02 01:10:28 kem Exp $ #endif #ifndef UseExportLists @@ -2056,9 +2337,11 @@ #endif #define StandardDefines -DSYSV -Di386 -DSCO325 -D__SCO__ +diff --git a/xorg-cf-files/usl.cf b/xorg-cf-files/usl.cf +index ba6ff9e..1baf5c2 100644 --- a/xorg-cf-files/usl.cf +++ b/xorg-cf-files/usl.cf -@@ -159,7 +159,7 @@ +@@ -159,7 +159,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer #endif #ifndef UseExportLists @@ -2067,248 +2350,11 @@ #endif #define GencatFlags -m ---- a/xorg-cf-files/X11.tmpl -+++ b/xorg-cf-files/X11.tmpl -@@ -614,23 +614,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 -@@ -700,8 +706,12 @@ - #define BuildXkbcomp BuildClients - #endif - -+#ifndef HasXcursorLibrary -+#define HasXcursorLibrary NO -+#endif -+ - #ifndef BuildXcursorLibrary --#define BuildXcursorLibrary BuildRenderLibrary -+#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary && BuildLibraries) - #endif - - #ifndef BuildXcursorgen -@@ -1170,7 +1180,7 @@ - #endif - - #ifndef RenderDefines --#if BuildRender -+#if BuildRender || HasRenderLibrary - #define RenderDefines -DRENDER - #else - #define RenderDefines /**/ -@@ -2669,6 +2679,7 @@ - ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) - #endif - -+#if BuildRenderLibrary - XRENDERLIBSRC = $(LIBSRC)/Xrender - #if SharedLibXrender - #ifndef SharedXrenderRev -@@ -2679,6 +2690,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 -@@ -2729,6 +2776,7 @@ - ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) - #endif - -+#if BuildXcursorLibrary - XCURSORLIBSRC = $(LIBSRC)/Xcursor - #if SharedLibXcursor - #ifndef SharedXcursorRev -@@ -2739,6 +2787,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 -@@ -3544,6 +3627,7 @@ - - #endif /* UseExpat */ - -+#if BuildXftLibrary - #ifndef SharedLibXft1 - #define SharedLibXft1 HasSharedLibraries - #endif -@@ -3556,6 +3640,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 -@@ -3610,6 +3706,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 -@@ -3725,8 +3857,6 @@ - - #endif /* UseFontconfig */ - --XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -- - #ifdef HasLibpng - - /* +diff --git a/xorg-cf-files/xfree86.cf b/xorg-cf-files/xfree86.cf +index 1dbbd87..5edfec9 100644 --- a/xorg-cf-files/xfree86.cf +++ b/xorg-cf-files/xfree86.cf -@@ -100,6 +100,13 @@ +@@ -100,6 +100,13 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #define XVendorManNameString XFree86 #endif @@ -2322,7 +2368,7 @@ /* * This enables some settings for developers. */ -@@ -116,6 +123,15 @@ +@@ -116,6 +123,15 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # endif #endif @@ -2338,7 +2384,7 @@ #ifndef BuildDebug # define BuildDebug YES #endif -@@ -233,6 +249,11 @@ +@@ -233,6 +249,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #define GlideDriver /**/ #endif @@ -2350,7 +2396,7 @@ /* * There are three parameters that determine where and how the Matrox HAL * library is used: -@@ -372,15 +393,17 @@ +@@ -372,15 +393,17 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # /* Don't build the nsc driver on IA64 */ # ifndef ia64Architecture # define NscDriver nsc @@ -2369,7 +2415,7 @@ fbdev vesa vga \ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif -@@ -485,8 +508,11 @@ +@@ -485,8 +508,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ vga dummy fbdev vesa # endif @@ -2383,7 +2429,7 @@ # define DevelDRIDrivers /**/ -@@ -579,9 +605,9 @@ +@@ -579,9 +605,9 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ * require changes (or even removal) for things like endianness, etc. Move * those known to work into the main XF86CardDrivers #define. */ @@ -2396,7 +2442,7 @@ # else # define DevelDrivers /* */ # endif -@@ -872,8 +898,14 @@ +@@ -872,8 +898,14 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ savage nv cirrus DevelDrivers siliconmotion \ vga XF86OSCardDrivers XF86ExtraCardDrivers # endif @@ -2412,7 +2458,7 @@ # endif #endif -@@ -968,8 +1000,13 @@ +@@ -968,8 +1000,13 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif @@ -2427,7 +2473,7 @@ # endif #endif -@@ -1066,7 +1103,7 @@ +@@ -1066,7 +1103,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # define TdfxDriDriver /**/ # endif # ifndef DriDrivers @@ -2436,7 +2482,7 @@ # endif #endif -@@ -1745,7 +1782,7 @@ +@@ -1745,7 +1782,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #endif #ifndef BuildScanpci # if SystemV || SystemV4 || \ @@ -2445,7 +2491,7 @@ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ defined(OS2Architecture) || defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -@@ -1943,10 +1980,6 @@ +@@ -1943,10 +1980,6 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define UseRgbTxt YES #endif @@ -2456,7 +2502,7 @@ /* * GNU Compiler stuff */ -@@ -2010,45 +2043,51 @@ +@@ -2010,45 +2043,51 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define GccAliasingArgs /* */ #endif @@ -2515,9 +2561,11 @@ # endif #endif +diff --git a/xorg-cf-files/xorg.cf b/xorg-cf-files/xorg.cf +index 3b0f10b..3d711ee 100644 --- a/xorg-cf-files/xorg.cf +++ b/xorg-cf-files/xorg.cf -@@ -262,6 +262,11 @@ +@@ -262,6 +262,11 @@ RELEASE_VERSION = ReleaseVersion #define GlideDriver /**/ #endif @@ -2529,7 +2577,7 @@ /* * There are three parameters that determine where and how the Matrox HAL * library is used: -@@ -425,7 +430,13 @@ +@@ -425,7 +430,13 @@ RELEASE_VERSION = ReleaseVersion /* SiS is 64-bit unclean as of this writing. */ # define i386DRIDrivers /**/ # endif @@ -2544,7 +2592,7 @@ # endif #endif /* i386Architecture || ia64Architecture */ -@@ -461,8 +472,13 @@ +@@ -461,8 +472,13 @@ RELEASE_VERSION = ReleaseVersion # endif /* SiS is 64-bit unclean as of this writing. */ @@ -2559,7 +2607,7 @@ # endif #endif /*AMD64Arcitecture*/ -@@ -602,8 +618,13 @@ +@@ -602,8 +618,13 @@ RELEASE_VERSION = ReleaseVersion * Glide is available for Alpha, therefore build tdfx DRM module. * SiS is 64-bit unclean as of this writing. */ @@ -2574,7 +2622,7 @@ # endif #endif /* AlphaArchitecture */ -@@ -767,7 +788,7 @@ +@@ -767,7 +788,7 @@ RELEASE_VERSION = ReleaseVersion # endif # define TdfxDriDriver /**/ # ifndef DriDrivers @@ -2583,7 +2631,7 @@ # endif #endif /* Ppc64Architecture */ -@@ -1480,10 +1501,6 @@ +@@ -1480,10 +1501,6 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define UseRgbTxt YES #endif @@ -2594,7 +2642,7 @@ /* * GNU Compiler stuff */ -@@ -1557,49 +1574,49 @@ +@@ -1557,49 +1574,49 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese #if HasGcc2 && defined(i386Architecture) # ifndef DefaultGcc2i386Opt diff --git a/debian/patches/05_xaw_without_xp.diff b/debian/patches/05_xaw_without_xp.diff index 241b691..6fbd7b9 100644 --- a/debian/patches/05_xaw_without_xp.diff +++ b/debian/patches/05_xaw_without_xp.diff @@ -1,56 +1,18 @@ +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:39 +0800 +Subject: _xaw_without_xp + --- - xorg-cf-files/FreeBSD.cf | 10 ++++++++++ - xorg-cf-files/gnu.cf | 10 ++++++++++ - xorg-cf-files/linux.cf | 10 ++++++++++ + xorg-cf-files/FreeBSD.cf | 10 ++++++++++ + xorg-cf-files/gnu.cf | 10 ++++++++++ + xorg-cf-files/linux.cf | 10 ++++++++++ 3 files changed, 30 insertions(+) -Index: xutils-dev/xorg-cf-files/linux.cf -=================================================================== ---- xutils-dev.orig/xorg-cf-files/linux.cf -+++ xutils-dev/xorg-cf-files/linux.cf -@@ -1158,6 +1158,16 @@ InstallNamedTargetNoClobber(install,file - #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) - #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -+#ifndef ExtraXawClientLibs -+# define ExtraXawClientLibs /**/ -+#endif -+#ifndef ExtraXawClientDepLibs -+# define ExtraXawClientDepLibs /**/ -+#endif -+#ifndef ExtraXawReqs -+# define ExtraXawReqs /**/ -+#endif -+ - #if HaveLib64 - # ifndef LibDirName - # define LibDirName lib64 -Index: xutils-dev/xorg-cf-files/gnu.cf -=================================================================== ---- xutils-dev.orig/xorg-cf-files/gnu.cf -+++ xutils-dev/xorg-cf-files/gnu.cf -@@ -541,6 +541,16 @@ InstallNamedTargetNoClobber(install,file - #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) - #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -+#ifndef ExtraXawClientLibs -+# define ExtraXawClientLibs /**/ -+#endif -+#ifndef ExtraXawClientDepLibs -+# define ExtraXawClientDepLibs /**/ -+#endif -+#ifndef ExtraXawReqs -+# define ExtraXawReqs /**/ -+#endif -+ - #ifndef BuildDmx - #define BuildDmx YES - #endif -Index: xutils-dev/xorg-cf-files/FreeBSD.cf -=================================================================== ---- xutils-dev.orig/xorg-cf-files/FreeBSD.cf -+++ xutils-dev/xorg-cf-files/FreeBSD.cf -@@ -570,6 +570,16 @@ XCOMM operating system: OSName (OSMajor +diff --git a/xorg-cf-files/FreeBSD.cf b/xorg-cf-files/FreeBSD.cf +index 8f9cac3..db2ca96 100644 +--- a/xorg-cf-files/FreeBSD.cf ++++ b/xorg-cf-files/FreeBSD.cf +@@ -570,6 +570,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #endif #endif @@ -67,3 +29,45 @@ Index: xutils-dev/xorg-cf-files/FreeBSD.cf /* * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4 */ +diff --git a/xorg-cf-files/gnu.cf b/xorg-cf-files/gnu.cf +index ae767b5..fb2c20d 100644 +--- a/xorg-cf-files/gnu.cf ++++ b/xorg-cf-files/gnu.cf +@@ -541,6 +541,16 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class + #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) + #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) + ++#ifndef ExtraXawClientLibs ++# define ExtraXawClientLibs /**/ ++#endif ++#ifndef ExtraXawClientDepLibs ++# define ExtraXawClientDepLibs /**/ ++#endif ++#ifndef ExtraXawReqs ++# define ExtraXawReqs /**/ ++#endif ++ + #ifndef BuildDmx + #define BuildDmx YES + #endif +diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf +index 984f518..0b3de25 100644 +--- a/xorg-cf-files/linux.cf ++++ b/xorg-cf-files/linux.cf +@@ -1173,6 +1173,16 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class + #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) + #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) + ++#ifndef ExtraXawClientLibs ++# define ExtraXawClientLibs /**/ ++#endif ++#ifndef ExtraXawClientDepLibs ++# define ExtraXawClientDepLibs /**/ ++#endif ++#ifndef ExtraXawReqs ++# define ExtraXawReqs /**/ ++#endif ++ + #if HaveLib64 + # ifndef LibDirName + # define LibDirName lib64 diff --git a/debian/patches/06_font_path.diff b/debian/patches/06_font_path.diff index 015841b..fb38596 100644 --- a/debian/patches/06_font_path.diff +++ b/debian/patches/06_font_path.diff @@ -1,8 +1,17 @@ -Index: xutils-dev/xorg-cf-files/X11.tmpl +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:39 +0800 +Subject: _font_path + =================================================================== ---- xutils-dev.orig/xorg-cf-files/X11.tmpl 2006-12-19 20:55:05.000000000 -0500 -+++ xutils-dev/xorg-cf-files/X11.tmpl 2006-12-19 20:56:03.000000000 -0500 -@@ -1512,10 +1512,10 @@ +--- + xorg-cf-files/X11.tmpl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xorg-cf-files/X11.tmpl b/xorg-cf-files/X11.tmpl +index 034d88e..8fa289d 100644 +--- a/xorg-cf-files/X11.tmpl ++++ b/xorg-cf-files/X11.tmpl +@@ -1512,10 +1512,10 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define DocPdfDir $(DOCDIR)/PDF #endif #ifndef FontDir diff --git a/debian/patches/07_gnu_manpath.diff b/debian/patches/07_gnu_manpath.diff index 7343ace..3bae73e 100644 --- a/debian/patches/07_gnu_manpath.diff +++ b/debian/patches/07_gnu_manpath.diff @@ -1,8 +1,17 @@ -This patch is Debian-specific, see bugs.debian.org/638016 +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:39 +0800 +Subject: _gnu_manpath ---- xutils-dev-7.6+5/xorg-cf-files/gnu.cf 2011-08-16 16:06:57.000000000 +0200 -+++ xutils-dev-7.6+5/xorg-cf-files/gnu.cf.new 2011-08-16 16:09:58.000000000 +0200 -@@ -29,6 +29,13 @@ +This patch is Debian-specific, see bugs.debian.org/638016 +--- + xorg-cf-files/gnu.cf | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/xorg-cf-files/gnu.cf b/xorg-cf-files/gnu.cf +index fb2c20d..dcd1ba9 100644 +--- a/xorg-cf-files/gnu.cf ++++ b/xorg-cf-files/gnu.cf +@@ -29,6 +29,13 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.2 2004/04/23 18:41:58 eich Exp $ # define GnuBinUtilsMajorVersion DefaultGnuBinUtilsMajorVersion #endif diff --git a/debian/patches/99_ppc64el.diff b/debian/patches/99_ppc64el.diff index 2097d44..44df854 100644 --- a/debian/patches/99_ppc64el.diff +++ b/debian/patches/99_ppc64el.diff @@ -1,7 +1,17 @@ -diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.cf ---- xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf 2013-07-30 12:22:15.000000000 -0600 -+++ xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.cf 2013-12-18 05:22:24.000000000 -0700 -@@ -930,6 +930,11 @@ +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:39 +0800 +Subject: _ppc64el + +--- + xorg-cf-files/Imake.cf | 5 +++++ + xorg-cf-files/Imake.tmpl | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf +index 0942fb0..1215d4b 100644 +--- a/xorg-cf-files/Imake.cf ++++ b/xorg-cf-files/Imake.cf +@@ -941,6 +941,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef __powerpc__ # endif # ifdef __powerpc64__ @@ -13,10 +23,11 @@ diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf xutils-dev-7.7~1ubuntu6 # ifndef Ppc64Architecture # define Ppc64Architecture # endif -diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.tmpl xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.tmpl ---- xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.tmpl 2013-07-30 16:53:35.000000000 -0600 -+++ xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.tmpl 2013-12-18 05:25:04.000000000 -0700 -@@ -528,6 +528,8 @@ +diff --git a/xorg-cf-files/Imake.tmpl b/xorg-cf-files/Imake.tmpl +index 9302a5a..7308e91 100644 +--- a/xorg-cf-files/Imake.tmpl ++++ b/xorg-cf-files/Imake.tmpl +@@ -528,6 +528,8 @@ XCOMM the platform-specific parameters - edit site.def to change #define ByteOrder X_LITTLE_ENDIAN #elif defined(RsArchitecture) #define ByteOrder X_BIG_ENDIAN diff --git a/debian/patches/riscv64-support.patch b/debian/patches/riscv64-support.patch index 2b6dc10..3b7ca8b 100644 --- a/debian/patches/riscv64-support.patch +++ b/debian/patches/riscv64-support.patch @@ -1,8 +1,20 @@ -Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf +From: Openkylin Developers +Date: Mon, 10 Apr 2023 10:15:39 +0800 +Subject: riscv64-support + =================================================================== ---- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/Imake.cf -+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf -@@ -1042,6 +1042,10 @@ XCOMM Keep cpp from replacing path eleme +--- + xorg-cf-files/Imake.cf | 4 ++++ + xorg-cf-files/linux.cf | 9 +++++++++ + xorg-cf-files/xfree86.cf | 6 ++++++ + xorg-cf-files/xorg.cf | 6 ++++++ + 4 files changed, 25 insertions(+) + +diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf +index 1215d4b..21781dd 100644 +--- a/xorg-cf-files/Imake.cf ++++ b/xorg-cf-files/Imake.cf +@@ -1042,6 +1042,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # define AArch64Architecture # undef __aarch64__ # endif @@ -13,11 +25,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf #endif /* linux || __GLIBC__ */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf -=================================================================== ---- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/linux.cf -+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf -@@ -1111,6 +1111,15 @@ InstallNamedTargetNoClobber(install,file +diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf +index 0b3de25..fb5924d 100644 +--- a/xorg-cf-files/linux.cf ++++ b/xorg-cf-files/linux.cf +@@ -1117,6 +1117,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AArch64Architecture */ @@ -33,11 +45,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf #ifndef StandardDefines # ifdef __linux__ # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines -Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf -=================================================================== ---- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/xfree86.cf -+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf -@@ -2067,6 +2067,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane +diff --git a/xorg-cf-files/xfree86.cf b/xorg-cf-files/xfree86.cf +index 5edfec9..2133f91 100644 +--- a/xorg-cf-files/xfree86.cf ++++ b/xorg-cf-files/xfree86.cf +@@ -2067,6 +2067,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # endif #endif @@ -50,11 +62,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf #if HasGcc2 && defined(AlphaArchitecture) # ifndef DefaultGcc2AxpOpt # define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs -Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xorg.cf -=================================================================== ---- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/xorg.cf -+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xorg.cf -@@ -1584,6 +1584,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane +diff --git a/xorg-cf-files/xorg.cf b/xorg-cf-files/xorg.cf +index 3d711ee..3a3892f 100644 +--- a/xorg-cf-files/xorg.cf ++++ b/xorg-cf-files/xorg.cf +@@ -1584,6 +1584,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # endif #endif