summaryrefslogtreecommitdiffstats
path: root/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
diff options
context:
space:
mode:
authorsweeaun <swee.aun.khor@intel.com>2017-08-14 15:37:13 -0700
committerSaul Wold <sgw@linux.intel.com>2017-08-15 14:03:06 -0700
commit92ce2459bc82b9ecdf9623c3008b7a8f427506dd (patch)
tree9aba8fe8b5b1cd31c5c1e459f03fcb64c35518b2 /common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
parent2edb60c5f2aca1c2e23f2c532bbcf3413d68bafa (diff)
downloadmeta-intel-92ce2459bc82b9ecdf9623c3008b7a8f427506dd.tar.gz
xf86-video-mga: upgrade 1.6.4 -> 1.6.5
Upgrade xf86-video-mga version to 1.6.5. Adapt block/wakeupHandler signature for ABI 23 patch has been removed as the change already available from Upstream 1.6.5. Signed-off-by: sweeaun <swee.aun.khor@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch')
-rw-r--r--common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch36
1 files changed, 0 insertions, 36 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
deleted file mode 100644
index c41cefdd..00000000
--- a/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 99b316e80a883372aaa61ee610d98fb53e6a52d4 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 16 Nov 2016 12:03:03 +0200
4Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23
5
6Add backport to fix build with new xserver-xorg.
7
8Upstream-Status: Backport [df094bfffe]
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10
11Original author: Adam Jackson <ajax@redhat.com>
12---
13 src/compat-api.h | 5 +++++
14 1 file changed, 5 insertions(+)
15
16diff --git a/src/compat-api.h b/src/compat-api.h
17index 6bc946f..89976e4 100644
18--- a/src/compat-api.h
19+++ b/src/compat-api.h
20@@ -75,8 +75,13 @@
21
22 #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
23
24+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
25+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
26+#define BLOCKHANDLER_ARGS arg, pTimeout
27+#else
28 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
29 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
30+#endif
31
32 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
33 #define CLOSE_SCREEN_ARGS pScreen
34--
352.1.4
36