debian/changelog | 7 +++++++
src/compat-api.h | 5 +++++
2 files changed, 12 insertions(+)
New commits:
commit c05c9382945b6b75a814dbdbe8b28057745920c0
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Nov 18 11:53:19 2016 +0100
Document the cherry-pick in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index deae00c..5cd7f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.6.4-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick commit df094bf (Adapt Block/WakeupHandler signature for
+ ABI 23) from upstream master branch.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Fri, 18 Nov 2016 11:52:23 +0100
+
xserver-xorg-video-mga (1:1.6.4-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
commit 4806cc96f5b37a8b90d158bd19d088457921ec87
Author: Adam Jackson <a...@redhat.com>
Date: Tue Jul 19 10:03:56 2016 -0400
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <a...@redhat.com>
(cherry picked from commit df094bfffe4ef097bfd9a569f2d2e35649c1a3c7)
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
