xf86-video-mga: Backport ABI 23 fix

Fixes build with xserver-xorg 1.19.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

2 files changed, 39 insertions, 1 deletions

diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
new file mode 100644
index 00000000..c41cefdd
--- /dev/null
+++ b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
@@ -0,0 +1,36 @@
+From 99b316e80a883372aaa61ee610d98fb53e6a52d4 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 16 Nov 2016 12:03:03 +0200
+Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23
+
+Add backport to fix build with new xserver-xorg.
+
+Upstream-Status: Backport [df094bfffe]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+Original author: Adam Jackson <ajax@redhat.com>
+---
+ src/compat-api.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+2.1.4
+
diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
index 36b75b2c..61b2d3c1 100644
--- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
+++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
@@ -6,7 +6,9 @@ DESCRIPTION = "mga is an Xorg driver for Matrox video cards"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc"
 
-SRC_URI += "file://checkfile.patch"
+SRC_URI += "file://checkfile.patch \
+            file://0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch \
+            "
 
 DEPENDS += "virtual/libx11 libpciaccess"