From cdbed978972e1b5b2a1b6d971581f1dd836ec27a Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 8 Jul 2018 07:45:36 -0700 Subject: xf86-input-mouse: update to 1.9.3 drop patch now included in update (From OE-Core rev: 197fda706d3ac48da7cfa8fe49565bf89ee3034f) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../0001-Adapt-to-removal-of-xf86GetOS.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch (limited to 'meta/recipes-graphics/xorg-driver/xf86-input-mouse') 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 @@ -From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 16 Feb 2017 09:21:21 -0500 -Subject: [PATCH] Adapt to removal of xf86GetOS - -Signed-off-by: Adam Jackson - -Upstream-Status: Backport -Fixes build issue with updated xorg-server changes. - -Signed-off-by: Armin Kuster - ---- - 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 - -- cgit v1.2.3-54-g00ecf