From e13d28ee5d8724fc4b22f26bce01a7d36355f272 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 26 Aug 2016 11:44:55 -0400 Subject: Check for either xfont.pc or xfont2.pc More recent versions of Xfont have a different API (with namespacing for libXfont functions.) Check for xfont2.pc and if found, use that, and use the new API. The rational for preferring libXfont2 is that as a recent change the xserver module looks for and requires libXfont2, and it's better not to have both versions of the library in process. --- Downloaded from https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=e13d28ee5d8724fc4b22f26bce01a7d36355f272 Signed-off-by: Bernd Kuhls diff --git a/configure.ac b/configure.ac index 7e95b01..451d42a 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,14 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) +# We can use either version 1 or version 2 of libXfont +PKG_CHECK_EXISTS(xfont2, + [xfont_pc=xfont2 + AC_DEFINE(HAVE_XFONT2,1,[Version 2 of the libXfont library])], + [xfont_pc=xfont]) + # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES) save_CFLAGS="$CFLAGS" diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c index a6d1ee3..6afb346 100644 --- a/src/uxa/uxa-damage.c +++ b/src/uxa/uxa-damage.c @@ -35,7 +35,11 @@ #include #include #include +#ifdef HAVE_XFONT2 +#include +#else #include +#endif #include "uxa-damage.h" @@ -947,8 +951,12 @@ uxa_damage_chars (RegionPtr region, { ExtentInfoRec extents; BoxRec box; - + +#ifdef HAVE_XFONT2 + xfont2_query_glyph_extents(font, charinfo, n, &extents); +#else QueryGlyphExtents(font, charinfo, n, &extents); +#endif if (imageblt) { if (extents.overallWidth > extents.overallRight) -- cgit v0.10.2