Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgbump.git;a=commitdiff;h=ac7991bf55ff29f3707230c108509ea5660bca78

commit ac7991bf55ff29f3707230c108509ea5660bca78
Author: DeX77 <[email protected]>
Date:   Thu Nov 17 11:41:49 2016 +0100

xf86-video-qxl-0.1.4-3-x86_64

* rebuild with xorg-server 1.19

diff --git a/source/x11-extra/xf86-video-qxl/FrugalBuild 
b/source/x11-extra/xf86-video-qxl/FrugalBuild
index d3d8184..6bc3d90 100644
--- a/source/x11-extra/xf86-video-qxl/FrugalBuild
+++ b/source/x11-extra/xf86-video-qxl/FrugalBuild
@@ -3,15 +3,29 @@

pkgname=xf86-video-qxl
pkgver=0.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org driver for the QXL virtual GPU."
url="http://xorg.freedesktop.org";
groups=('x11-extra')
archs=('i686' 'x86_64')
Finclude xorg
-sha1sums=('7559f6aede110893a440300379211984d2eb862f')
-source=("http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.gz";)
+sha1sums=('7559f6aede110893a440300379211984d2eb862f' \
+          '1c82207d3f343a02802fc93e67b33636d8d283b1' \
+          'd30ff09f39b342ee61513d72379b98f09ef0f6f6' \
+          '2b6f26ee872d197586e6e00087ab3816cfbcebbf')
+source=("http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.gz";
 \
+       fixIncludes.patch \
+       fixQueryGlyphExtents.patch \
+       usexfont2uxa.patch)
up2date="Flasttar http://xorg.freedesktop.org/releases/individual/driver/";
depends=('xorg-server>=1.18.0' 'spice-protocol>=0.12.12-1')

+build() {
+       Fcd
+       Fpatchall
+       Fautoreconf
+       Fmake
+       Fmakeinstall
+}
+
# optimization OK
diff --git a/source/x11-extra/xf86-video-qxl/fixIncludes.patch 
b/source/x11-extra/xf86-video-qxl/fixIncludes.patch
new file mode 100644
index 0000000..858977f
--- /dev/null
+++ b/source/x11-extra/xf86-video-qxl/fixIncludes.patch
@@ -0,0 +1,34 @@
+From 83e00bb5f9b74c0d7059c189d747ec3c24c7798a Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <[email protected]>
+Date: Tue, 4 Aug 2015 17:36:12 +0200
+Subject: Use <> for system-includes
+
+These headers come from /usr/include/xorg/ so it's clearer if they are
+included using <>. While at it, I've reordered them alphabetically.
+
+diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c
+index 3e4c075..6201712 100644
+--- a/src/uxa/uxa-damage.c
++++ b/src/uxa/uxa-damage.c
+@@ -27,12 +27,13 @@
+ #include <stdlib.h>
+ #include "uxa-priv.h"
+
++#include    <dixfontstr.h>
++#include    <gcstruct.h>
++#include    <picturestr.h>
++#include    <scrnintstr.h>
++#include    <windowstr.h>
+ #include    <X11/X.h>
+-#include    "scrnintstr.h"
+-#include    "windowstr.h"
+-#include    "dixfontstr.h"
+-#include    "gcstruct.h"
+-#include    "picturestr.h"
++
+ #include    "uxa-damage.h"
+
+ typedef struct _damageGCPriv {
+--
+cgit v0.10.2
+
diff --git a/source/x11-extra/xf86-video-qxl/fixQueryGlyphExtents.patch 
b/source/x11-extra/xf86-video-qxl/fixQueryGlyphExtents.patch
new file mode 100644
index 0000000..ed96f39
--- /dev/null
+++ b/source/x11-extra/xf86-video-qxl/fixQueryGlyphExtents.patch
@@ -0,0 +1,46 @@
+From a184774ad161031cceed264d62d48ebd019ac800 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <[email protected]>
+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)
+
+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    <scrnintstr.h>
+ #include    <windowstr.h>
+ #include    <X11/X.h>
++#include    <X11/fonts/font.h>
++#include    <X11/fonts/fontstruct.h>
++#include    <X11/fonts/fontutil.h>
+
+ #include    "uxa-damage.h"
+
+--
+cgit v0.10.2
+
diff --git a/source/x11-extra/xf86-video-qxl/usexfont2uxa.patch 
b/source/x11-extra/xf86-video-qxl/usexfont2uxa.patch
new file mode 100644
index 0000000..5d62510
--- /dev/null
+++ b/source/x11-extra/xf86-video-qxl/usexfont2uxa.patch
@@ -0,0 +1,64 @@
+From e13d28ee5d8724fc4b22f26bce01a7d36355f272 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <[email protected]>
+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.
+
+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    <X11/X.h>
+ #include    <X11/fonts/font.h>
+ #include    <X11/fonts/fontstruct.h>
++#ifdef HAVE_XFONT2
++#include    <X11/fonts/libxfont2.h>
++#else
+ #include    <X11/fonts/fontutil.h>
++#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
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to