diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-06-01 08:00:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-04 15:15:00 +0100 |
commit | f1eb044403b543e1122656d89280ea5202783a78 (patch) | |
tree | 52c400d40d5112d6ad9a5878d3582a64e8b76c6c /meta/recipes-graphics | |
parent | 5e12d1f55f32c0a41c41eee2d8163d4737b31bb4 (diff) | |
download | poky-f1eb044403b543e1122656d89280ea5202783a78.tar.gz |
xf86-input-mouse: add fix for buld fix do for 1.20 xorg-server update
../../xf86-input-mouse-1.9.2/src/mouse.c:824:5: error: implicit declaration of function 'xf86GetOS'; did you mean 'xf86SetDpi'? [-Werror=implicit-function-declaration]
| xf86GetOS(&osname, NULL, NULL, NULL);
| ^~~~~~~~~
(From OE-Core rev: 88ce0df3b769f1932b4a9d44e39bf6551c802d9b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch | 48 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb | 2 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch new file mode 100644 index 0000000000..4a082c0a03 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adam Jackson <ajax@redhat.com> | ||
3 | Date: Thu, 16 Feb 2017 09:21:21 -0500 | ||
4 | Subject: [PATCH] Adapt to removal of xf86GetOS | ||
5 | |||
6 | Signed-off-by: Adam Jackson <ajax@redhat.com> | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | Fixes build issue with updated xorg-server changes. | ||
10 | |||
11 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
12 | |||
13 | --- | ||
14 | src/mouse.c | 11 +++++------ | ||
15 | 1 file changed, 5 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/src/mouse.c b/src/mouse.c | ||
18 | index dae98aa..40d97a9 100644 | ||
19 | --- a/src/mouse.c | ||
20 | +++ b/src/mouse.c | ||
21 | @@ -794,7 +794,6 @@ InitProtocols(void) | ||
22 | { | ||
23 | int classes; | ||
24 | int i; | ||
25 | - const char *osname = NULL; | ||
26 | |||
27 | if (osInfo) | ||
28 | return TRUE; | ||
29 | @@ -821,11 +820,11 @@ InitProtocols(void) | ||
30 | mouseProtocols[i].id = PROT_UNSUP; | ||
31 | |||
32 | /* NetBSD uses PROT_BM for "PS/2". */ | ||
33 | - xf86GetOS(&osname, NULL, NULL, NULL); | ||
34 | - if (osname && xf86NameCmp(osname, "netbsd") == 0) | ||
35 | - for (i = 0; mouseProtocols[i].name; i++) | ||
36 | - if (mouseProtocols[i].id == PROT_PS2) | ||
37 | - mouseProtocols[i].id = PROT_BM; | ||
38 | +#if defined(__NetBSD__) | ||
39 | + for (i = 0; mouseProtocols[i].name; i++) | ||
40 | + if (mouseProtocols[i].id == PROT_PS2) | ||
41 | + mouseProtocols[i].id = PROT_BM; | ||
42 | +#endif | ||
43 | |||
44 | return TRUE; | ||
45 | } | ||
46 | -- | ||
47 | 2.7.4 | ||
48 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb index 0750476a23..8dea384e7c 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb | |||
@@ -10,5 +10,7 @@ driver." | |||
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" |
12 | 12 | ||
13 | SRC_URI += "file://0001-Adapt-to-removal-of-xf86GetOS.patch" | ||
14 | |||
13 | SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845" | 15 | SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845" |
14 | SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f" | 16 | SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f" |