1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

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>
This commit is contained in:
Armin Kuster
2018-06-01 08:00:39 -07:00
committed by Richard Purdie
parent 5e12d1f55f
commit f1eb044403
2 changed files with 50 additions and 0 deletions
@@ -0,0 +1,48 @@
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
@@ -10,5 +10,7 @@ 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"