From f4c80a78ce0e5648334fc43e5c93a068ed3ec5be Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 14:05:57 +0100 Subject: Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API alike. Fixes ArcticaProject/nx-libs#296. Inspired by the following X.org commit. Other than X.org, we will continue support for building nx-libs against libXfont1 for a while. commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Author: Keith Packard Date: Tue Sep 1 18:50:55 2015 -0700 dix: Switch to the libXfont2 API (v2) This new libXfont API eliminates exposing internal X server symbols to the font library, replacing those with a struct full of the entire API needed to use that library. v2: Use libXfont2 instead of libXfont_2 Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- nx-X11/config/cf/Imake.tmpl | 3 +++ nx-X11/config/cf/Server.tmpl | 8 ++++++++ nx-X11/config/cf/host.def | 6 ++++++ nx-X11/config/cf/xorg.cf | 4 ++++ 4 files changed, 21 insertions(+) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 944af2fdc..9ca1f16d7 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -564,6 +564,9 @@ X_BYTE_ORDER = ByteOrder #ifndef HasFfs #define HasFfs YES #endif +#ifndef HasXfont2 +#define HasXfont2 NO +#endif #ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */ #define GzipLibrary -lz #endif diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl index ffdca6811..bae6f3b02 100644 --- a/nx-X11/config/cf/Server.tmpl +++ b/nx-X11/config/cf/Server.tmpl @@ -70,3 +70,11 @@ GLX_DEFINES = GlxDefines #ifdef XorgVersion #include #endif + +#if HasXfont2 +FONT_DEFINES = -DHAS_XFONT2 + XFONTLIB = -lXfont2 +#else +FONT_DEFINES = + XFONTLIB = -lXfont +#endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index ffcf4c0de..4b22042c4 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -389,6 +389,12 @@ #define BuildXKB YES #define BuildXKBlib YES +/* + * If you want to build against libXfont2, rather than libXfont(1), uncomment this. + * +#define HasXfont2 YES + */ + /* * If you are running NetBSD 0.9C or later, and have the aperture driver * installed, uncomment this. diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index ddc501978..1aa7daf06 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -424,6 +424,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildXKBlib YES #endif +#ifndef HasXfont2 +# define HasXfont2 NO +#endif + #ifndef BuildScreenSaverExt # define BuildScreenSaverExt YES #endif -- cgit v1.2.3