diff options
Diffstat (limited to 'common/recipes-graphics')
-rw-r--r-- | common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch | 36 | ||||
-rw-r--r-- | common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch new file mode 100644 index 00000000..c41cefdd --- /dev/null +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 99b316e80a883372aaa61ee610d98fb53e6a52d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 16 Nov 2016 12:03:03 +0200 | ||
4 | Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23 | ||
5 | |||
6 | Add backport to fix build with new xserver-xorg. | ||
7 | |||
8 | Upstream-Status: Backport [df094bfffe] | ||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | |||
11 | Original author: Adam Jackson <ajax@redhat.com> | ||
12 | --- | ||
13 | src/compat-api.h | 5 +++++ | ||
14 | 1 file changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/src/compat-api.h b/src/compat-api.h | ||
17 | index 6bc946f..89976e4 100644 | ||
18 | --- a/src/compat-api.h | ||
19 | +++ b/src/compat-api.h | ||
20 | @@ -75,8 +75,13 @@ | ||
21 | |||
22 | #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv | ||
23 | |||
24 | +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) | ||
25 | +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout | ||
26 | +#define BLOCKHANDLER_ARGS arg, pTimeout | ||
27 | +#else | ||
28 | #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask | ||
29 | #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask | ||
30 | +#endif | ||
31 | |||
32 | #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen | ||
33 | #define CLOSE_SCREEN_ARGS pScreen | ||
34 | -- | ||
35 | 2.1.4 | ||
36 | |||
diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb index 36b75b2c..61b2d3c1 100644 --- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb | |||
@@ -6,7 +6,9 @@ DESCRIPTION = "mga is an Xorg driver for Matrox video cards" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" |
8 | 8 | ||
9 | SRC_URI += "file://checkfile.patch" | 9 | SRC_URI += "file://checkfile.patch \ |
10 | file://0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch \ | ||
11 | " | ||
10 | 12 | ||
11 | DEPENDS += "virtual/libx11 libpciaccess" | 13 | DEPENDS += "virtual/libx11 libpciaccess" |
12 | 14 | ||