summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-07-08 07:45:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-10 17:33:00 +0100
commitcdbed978972e1b5b2a1b6d971581f1dd836ec27a (patch)
tree20caae4fc95d4350cb84d9b0891b05e455391e7c /meta/recipes-graphics
parenta1c299df71ce156fd12eb467a9617878bddeeb40 (diff)
downloadpoky-cdbed978972e1b5b2a1b6d971581f1dd836ec27a.tar.gz
xf86-input-mouse: update to 1.9.3
drop patch now included in update (From OE-Core rev: 197fda706d3ac48da7cfa8fe49565bf89ee3034f) 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.patch48
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb)6
2 files changed, 2 insertions, 52 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
deleted file mode 100644
index 4a082c0a03..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
2From: Adam Jackson <ajax@redhat.com>
3Date: Thu, 16 Feb 2017 09:21:21 -0500
4Subject: [PATCH] Adapt to removal of xf86GetOS
5
6Signed-off-by: Adam Jackson <ajax@redhat.com>
7
8Upstream-Status: Backport
9Fixes build issue with updated xorg-server changes.
10
11Signed-off-by: Armin Kuster <akuster808@gmail.com>
12
13---
14 src/mouse.c | 11 +++++------
15 1 file changed, 5 insertions(+), 6 deletions(-)
16
17diff --git a/src/mouse.c b/src/mouse.c
18index 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--
472.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.3.bb
index 8dea384e7c..c38dab505b 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.3.bb
@@ -10,7 +10,5 @@ driver."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" 11LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
12 12
13SRC_URI += "file://0001-Adapt-to-removal-of-xf86GetOS.patch" 13SRC_URI[md5sum] = "a2104693bbcfe1413397f7905eecd3dc"
14 14SRC_URI[sha256sum] = "93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5"
15SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845"
16SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f"