diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-28 18:39:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-28 18:39:57 +0100 |
| commit | 1a97cdb80945a675353ff4e9e01a3b9b0f50d419 (patch) | |
| tree | 6841759e2f2c25379bb785651e3f24ae53a435d5 /package/xf86-video-siliconmotion | |
| parent | 53eb93657e37ebc5ea45c605bead675ce1faaa76 (diff) | |
xf86-video-siliconmotion: fix compile error
Diffstat (limited to 'package/xf86-video-siliconmotion')
| -rw-r--r-- | package/xf86-video-siliconmotion/patches/patch-src_Makefile_in | 6 | ||||
| -rw-r--r-- | package/xf86-video-siliconmotion/patches/patch-src_compat-api_h | 30 |
2 files changed, 33 insertions, 3 deletions
diff --git a/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in index 141955000..b41de3d48 100644 --- a/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in +++ b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- xf86-video-siliconmotion-1.7.7.orig/src/Makefile.in 2012-07-17 08:28:17.000000000 +0200 -+++ xf86-video-siliconmotion-1.7.7/src/Makefile.in 2014-03-14 18:09:06.901850694 +0100 -@@ -288,7 +288,7 @@ target_alias = @target_alias@ +--- xf86-video-siliconmotion-1.7.8.orig/src/Makefile.in 2015-05-09 16:58:51.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.8/src/Makefile.in 2017-01-25 21:00:59.707690975 +0100 +@@ -364,7 +364,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/package/xf86-video-siliconmotion/patches/patch-src_compat-api_h b/package/xf86-video-siliconmotion/patches/patch-src_compat-api_h new file mode 100644 index 000000000..12d994d2f --- /dev/null +++ b/package/xf86-video-siliconmotion/patches/patch-src_compat-api_h @@ -0,0 +1,30 @@ +--- xf86-video-siliconmotion-1.7.8.orig/src/compat-api.h 2015-05-08 13:08:17.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.8/src/compat-api.h 2017-01-26 02:35:36.147052952 +0100 +@@ -48,8 +48,13 @@ + + #define SCREEN_INIT_ARGS_DECL int i, 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 int arg, pointer blockData, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS scrnIndex, pScreen +@@ -75,8 +80,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 |