On Mon, Aug 03, 2015 at 10:15:54AM +0200, Victor Toso wrote: > Hi, > > On Fri, Jul 31, 2015 at 04:25:29PM +0200, poma wrote: > > > > Information for build xorg-x11-drv-qxl-0.1.4-4.fc24 > > http://koji.fedoraproject.org/koji/buildinfo?buildID=673175 > > ... > > Changelog ... > > - 1.15 ABI rebuild > > > > Is not that "1.18 ABI rebuild" - xorg-x11-server-1.18.0? > > > > https://kojipkgs.fedoraproject.org/work/tasks/7640/10517640/build.log > > ... > > uxa-damage.c:947:5: error: implicit declaration of function 'QueryGlyphExtents' [-Werror=implicit-function-declaration] > > QueryGlyphExtents(font, charinfo, n, &extents); > > ^ > > > > Declare the function before it's used? > > This function is declared in xorg/dixfont.h (by dixfontstr.h in > uxa-damage.c) in my 1.17.2 (fedora 22). > > Looks like it was removed upstream by > http://cgit.freedesktop.org/xorg/xserver/commit/include/dixfont.h?id=b51f7f8582ab6c3cc9fa56c8d9721d0f240915e7 The function is still in libxfont, it was exported both by xserver and xfont in older x.org. I came up with the attached patch last Friday which fixes the build, but there are still some potentially worrying warnings I haven't had time to look at yet. Christophe
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 3e4c075..95b3f85 100644 --- a/src/uxa/uxa-damage.c +++ b/src/uxa/uxa-damage.c @@ -28,6 +28,9 @@ #include "uxa-priv.h" #include <X11/X.h> +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fontutil.h> #include "scrnintstr.h" #include "windowstr.h" #include "dixfontstr.h" diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c index fe3d6e8..2400ab8 100644 --- a/src/uxa/uxa-glyphs.c +++ b/src/uxa/uxa-glyphs.c @@ -64,6 +64,10 @@ #include <stdlib.h> +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fontutil.h> + #include "uxa-priv.h" #include "mipict.h"
Attachment:
pgpnt3vk0bJ0u.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel