From a184774ad161031cceed264d62d48ebd019ac800 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 3 Aug 2015 20:12:05 +0200 Subject: Fix compilation with newer Xorg versions Xorg 1.18 stopped exporting some xfont related symbols in its headers/shared libraries, which causes QXL to fail to build: uxa-damage.c:947:5: error: implicit declaration of function 'QueryGlyphExtents' [-Werror=implicit-function-declaration] QueryGlyphExtents(font, charinfo, n, &extents); The missing definition can be found in xfont, so this commit addes the needed configure.ac checks and includes. Note that dixfontstr.h must be included before the xfont headers or this will cause compile-time warnings on older Xorg versions (eg 1.17) --- Downloaded from https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=a184774ad161031cceed264d62d48ebd019ac800 Signed-off-by: Bernd Kuhls diff --git a/configure.ac b/configure.ac index 6555a8d..7e95b01 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) save_CFLAGS="$CFLAGS" diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c index 6201712..a6d1ee3 100644 --- a/src/uxa/uxa-damage.c +++ b/src/uxa/uxa-damage.c @@ -33,6 +33,9 @@ #include #include #include +#include +#include +#include #include "uxa-damage.h" -- cgit v0.10.2