xf86-input-synaptics/xf86-input-vmmouse: Fix build with glibc 2.20
Backport the upstream patches needed for them to work with glibc 2.20 (From OE-Core rev: 60f78480135aab55e538c9e4e0b6d387139f1404) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5e328bf30e
commit
4d26851300
|
@ -0,0 +1,60 @@
|
|||
From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 29 Aug 2014 07:57:41 +1000
|
||||
Subject: Include xorg-server.h to fix build errors on newest glibc
|
||||
|
||||
In file included from /usr/include/string.h:634:0,
|
||||
from /usr/include/xorg/os.h:53,
|
||||
from /usr/include/xorg/misc.h:115,
|
||||
from /usr/include/xorg/xf86str.h:37,
|
||||
from /usr/include/xorg/xf86Xinput.h:54,
|
||||
from synproto.h:36,
|
||||
from synproto.c:24:
|
||||
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
|
||||
strndup(const char *str, size_t n);
|
||||
|
||||
See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
Status: Backport
|
||||
|
||||
Index: xf86-input-synaptics-1.8.0/src/eventcomm.h
|
||||
===================================================================
|
||||
--- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700
|
||||
+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700
|
||||
@@ -27,6 +27,8 @@
|
||||
#ifndef _EVENTCOMM_H_
|
||||
#define _EVENTCOMM_H_
|
||||
|
||||
+#include <xorg-server.h>
|
||||
+
|
||||
#include <linux/input.h>
|
||||
#include <linux/version.h>
|
||||
#include <xf86Xinput.h>
|
||||
Index: xf86-input-synaptics-1.8.0/src/ps2comm.h
|
||||
===================================================================
|
||||
--- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700
|
||||
+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700
|
||||
@@ -22,6 +22,8 @@
|
||||
#ifndef _PS2COMM_H_
|
||||
#define _PS2COMM_H_
|
||||
|
||||
+#include <xorg-server.h>
|
||||
+
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include "xf86_OSproc.h"
|
||||
Index: xf86-input-synaptics-1.8.0/src/synproto.h
|
||||
===================================================================
|
||||
--- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700
|
||||
+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
+#include <xorg-server.h>
|
||||
+
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <xf86Xinput.h>
|
|
@ -12,6 +12,8 @@ advanced features of the touchpad to become available."
|
|||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
|
||||
|
||||
SRC_URI += "file://always_include_xorg_server.h.patch"
|
||||
|
||||
SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f"
|
||||
SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a"
|
||||
|
||||
|
|
|
@ -0,0 +1,81 @@
|
|||
From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Thu, 28 Nov 2013 11:59:53 -0800
|
||||
Subject: Always include config.h first
|
||||
|
||||
This fixes some build warnings about CSRG_BASED being redefined due to
|
||||
incorrect header include ordering.
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c
|
||||
===================================================================
|
||||
--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700
|
||||
+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700
|
||||
@@ -39,6 +39,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include "config.h"
|
||||
+#endif
|
||||
+
|
||||
#include "vmmouse_client.h"
|
||||
#include "vmmouse_proto.h"
|
||||
|
||||
Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c
|
||||
===================================================================
|
||||
--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700
|
||||
+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700
|
||||
@@ -33,6 +33,10 @@
|
||||
*/
|
||||
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include "config.h"
|
||||
+#endif
|
||||
+
|
||||
#include "vmmouse_proto.h"
|
||||
|
||||
|
||||
Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h
|
||||
===================================================================
|
||||
--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700
|
||||
+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700
|
||||
@@ -36,11 +36,6 @@
|
||||
#ifndef _VMMOUSE_PROTO_H_
|
||||
#define _VMMOUSE_PROTO_H_
|
||||
|
||||
-
|
||||
-#ifdef HAVE_CONFIG_H
|
||||
-#include "config.h"
|
||||
-#endif
|
||||
-
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef HAVE_XORG_SERVER_1_1_0
|
||||
Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c
|
||||
===================================================================
|
||||
--- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700
|
||||
+++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700
|
||||
@@ -26,14 +26,14 @@
|
||||
*/
|
||||
|
||||
|
||||
-#include <stdlib.h>
|
||||
-#include <signal.h>
|
||||
-#include "vmmouse_client.h"
|
||||
-
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
+#include <stdlib.h>
|
||||
+#include <signal.h>
|
||||
+#include "vmmouse_client.h"
|
||||
+
|
||||
void
|
||||
segvCB(int sig)
|
||||
{
|
|
@ -8,6 +8,8 @@ standard 'mouse' driver if a VMware virtual machine is not detected."
|
|||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://always_include_config.h.patch"
|
||||
|
||||
SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07"
|
||||
SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c"
|
||||
|
||||
|
|
Loading…
Reference in New Issue