diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2016-11-27 12:06:14 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-11-27 22:33:22 +0100 |
| commit | c2a79469b28f77d65bf44ca180493f26497f0bf5 (patch) | |
| tree | c8b5f3628ef60e94ee60626778023a0fc03590f9 /package/x11r7 | |
| parent | c55fb8ad22be6d95b8b521d208cad0cfa7d75d07 (diff) | |
package/x11r7/xdriver_xf86-video-sis: Add patch for ABI 23 support (xserver_xorg-server 1.19+)
Re-numbered patches as well.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch | 33 | ||||
| -rw-r--r-- | package/x11r7/xdriver_xf86-video-sis/0003-xi.patch (renamed from package/x11r7/xdriver_xf86-video-sis/0007-xi.patch) | 0 |
2 files changed, 33 insertions, 0 deletions
diff --git a/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch new file mode 100644 index 000000000..109f74537 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch @@ -0,0 +1,33 @@ +From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 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> +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.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 +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-sis/0007-xi.patch b/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch index 790524816..790524816 100644 --- a/package/x11r7/xdriver_xf86-video-sis/0007-xi.patch +++ b/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch |