xf86-input-mouse: update to 1.9.3

drop patch now included in update

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index 4a082c0..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 16 Feb 2017 09:21:21 -0500
-Subject: [PATCH] Adapt to removal of xf86GetOS
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-Upstream-Status: Backport
-Fixes build issue with updated xorg-server changes.
-
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
----
- src/mouse.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/mouse.c b/src/mouse.c
-index dae98aa..40d97a9 100644
---- a/src/mouse.c
-+++ b/src/mouse.c
-@@ -794,7 +794,6 @@ InitProtocols(void)
- {
-     int classes;
-     int i;
--    const char *osname = NULL;
- 
-     if (osInfo)
-         return TRUE;
-@@ -821,11 +820,11 @@ InitProtocols(void)
-                 mouseProtocols[i].id = PROT_UNSUP;
- 
-     /* NetBSD uses PROT_BM for "PS/2". */
--    xf86GetOS(&osname, NULL, NULL, NULL);
--    if (osname && xf86NameCmp(osname, "netbsd") == 0)
--        for (i = 0; mouseProtocols[i].name; i++)
--            if (mouseProtocols[i].id == PROT_PS2)
--                mouseProtocols[i].id = PROT_BM;
-+#if defined(__NetBSD__)
-+    for (i = 0; mouseProtocols[i].name; i++)
-+        if (mouseProtocols[i].id == PROT_PS2)
-+            mouseProtocols[i].id = PROT_BM;
-+#endif
- 
-     return TRUE;
- }
--- 
-2.7.4
-

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
similarity index 69%
rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb
index 8dea384e7c335c86962c5744cb0b1e818e7cc60f..c38dab505b42436d4ba4994450b76e346e01489f 100644 (file)
--- 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."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
 
-SRC_URI += "file://0001-Adapt-to-removal-of-xf86GetOS.patch"
-
-SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845"
-SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f"
+SRC_URI[md5sum] = "a2104693bbcfe1413397f7905eecd3dc"
+SRC_URI[sha256sum] = "93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5"