xserver-xorg-video-sisusb: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/compat-api.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit fceb6ca43badf8ddb2fbfd7fb00648383a0a35e1
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Jan 17 14:46:23 2017 -0800
xf86-video-sisusb 0.9.7
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index a686034..18d71b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sisusb],
- [0.9.6],
+ [0.9.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sisusb])
AC_CONFIG_SRCDIR([Makefile.am])
commit 6d44eb7a6075b9cc359b44282a7095a8b46c8a38
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sat Dec 10 13:07:37 2016 +0100
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
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
Reply to: