summaryrefslogtreecommitdiff
path: root/package/xf86-video-geode/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-29 05:41:21 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-29 05:41:40 +0100
commit9581e2ce4a1fc360d3db6ff78b2fcbe87dd2c4a9 (patch)
treeadd64dfc6ff2d5c86c81755dd2f7cb25228829c4 /package/xf86-video-geode/patches
parentc76d1960526d15cbcef6a61b4f7bed8eb5b95037 (diff)
Xorg: update Xserver, Xlibs and drivers
Diffstat (limited to 'package/xf86-video-geode/patches')
-rw-r--r--package/xf86-video-geode/patches/patch-src_compat-api_h30
-rw-r--r--package/xf86-video-geode/patches/patch-src_geode_dcon_c10
2 files changed, 30 insertions, 10 deletions
diff --git a/package/xf86-video-geode/patches/patch-src_compat-api_h b/package/xf86-video-geode/patches/patch-src_compat-api_h
new file mode 100644
index 000000000..244111bdd
--- /dev/null
+++ b/package/xf86-video-geode/patches/patch-src_compat-api_h
@@ -0,0 +1,30 @@
+--- xf86-video-geode-2.11.18.orig/src/compat-api.h 2016-02-03 19:46:59.000000000 +0100
++++ xf86-video-geode-2.11.18/src/compat-api.h 2016-11-28 08:39:15.624653928 +0100
+@@ -53,8 +53,13 @@
+
+ #define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScrn, 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 pScrn
+ #define CLOSE_SCREEN_ARGS scrnIndex, pScrn
+@@ -89,8 +94,13 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScrn, 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 pScrn
+ #define CLOSE_SCREEN_ARGS pScrn
diff --git a/package/xf86-video-geode/patches/patch-src_geode_dcon_c b/package/xf86-video-geode/patches/patch-src_geode_dcon_c
deleted file mode 100644
index a80c00dfe..000000000
--- a/package/xf86-video-geode/patches/patch-src_geode_dcon_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xf86-video-geode-2.11.15.orig/src/geode_dcon.c 2013-10-09 13:47:09.000000000 +0200
-+++ xf86-video-geode-2.11.15/src/geode_dcon.c 2014-05-17 18:56:45.000000000 +0200
-@@ -29,6 +29,7 @@
-
- /* Includes that are used by all drivers */
- #include <xf86.h>
-+#include <xf86Modes.h>
- #include <xf86_OSproc.h>
- #include <compiler.h>
-