diff options
Diffstat (limited to 'main/xf86-video-xgixp/git-fixes.patch')
| -rw-r--r-- | main/xf86-video-xgixp/git-fixes.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/xf86-video-xgixp/git-fixes.patch b/main/xf86-video-xgixp/git-fixes.patch index 665739aad0..ba54f01a61 100644 --- a/main/xf86-video-xgixp/git-fixes.patch +++ b/main/xf86-video-xgixp/git-fixes.patch @@ -326,3 +326,37 @@ index 80f3645..c146ce4 100644 -- cgit v0.10.2 +From 81c1cc40820a3e24efc0565b68f44eb6748a2db9 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@redhat.com> + +diff --git a/src/compat-api.h b/src/compat-api.h +index 98ba435..44daea4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -78,11 +78,19 @@ + + #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 ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + |