diff options
-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.5.bb (renamed from common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb) | 8 |
2 files changed, 3 insertions, 41 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 deleted file mode 100644 index c41cefdd..00000000 --- a/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
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.5.bb index 61b2d3c1..d30936b6 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.5.bb | |||
@@ -6,9 +6,7 @@ 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 | " | ||
12 | 10 | ||
13 | DEPENDS += "virtual/libx11 libpciaccess" | 11 | DEPENDS += "virtual/libx11 libpciaccess" |
14 | 12 | ||
@@ -16,8 +14,8 @@ PR = "r1" | |||
16 | 14 | ||
17 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | 15 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' |
18 | 16 | ||
19 | SRC_URI[md5sum] = "cd3db8370caa3e607614ea4e74d4c350" | 17 | SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" |
20 | SRC_URI[sha256sum] = "48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f" | 18 | SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" |
21 | 19 | ||
22 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" | 20 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" |
23 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" | 21 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" |