summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-03-16 13:56:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:48 +0000
commitf4857dc64065fda9f20ada185b745ccb0c93b484 (patch)
tree8285b99ac313f3efe99b7233e75ee72eb1467904
parent8b125fe5a8f7b51f123a9d2103780f723241fdb1 (diff)
downloadpoky-f4857dc64065fda9f20ada185b745ccb0c93b484.tar.gz
xf86-input-synaptics: drop already applied patch
This patch was part of the 1.8.1 release. (From OE-Core rev: aa5377fc4cf93678b2fdae86855ea1d6f39fa148) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch60
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb4
2 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch
deleted file mode 100644
index f36bb7579d..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
2From: Peter Hutterer <peter.hutterer@who-t.net>
3Date: Fri, 29 Aug 2014 07:57:41 +1000
4Subject: Include xorg-server.h to fix build errors on newest glibc
5
6In file included from /usr/include/string.h:634:0,
7 from /usr/include/xorg/os.h:53,
8 from /usr/include/xorg/misc.h:115,
9 from /usr/include/xorg/xf86str.h:37,
10 from /usr/include/xorg/xf86Xinput.h:54,
11 from synproto.h:36,
12 from synproto.c:24:
13/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
14 strndup(const char *str, size_t n);
15
16See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
17
18Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
19
20Status: Backport
21
22Index: xf86-input-synaptics-1.8.0/src/eventcomm.h
23===================================================================
24--- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700
25+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700
26@@ -27,6 +27,8 @@
27 #ifndef _EVENTCOMM_H_
28 #define _EVENTCOMM_H_
29
30+#include <xorg-server.h>
31+
32 #include <linux/input.h>
33 #include <linux/version.h>
34 #include <xf86Xinput.h>
35Index: xf86-input-synaptics-1.8.0/src/ps2comm.h
36===================================================================
37--- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700
38+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700
39@@ -22,6 +22,8 @@
40 #ifndef _PS2COMM_H_
41 #define _PS2COMM_H_
42
43+#include <xorg-server.h>
44+
45 #include <unistd.h>
46 #include <sys/ioctl.h>
47 #include "xf86_OSproc.h"
48Index: xf86-input-synaptics-1.8.0/src/synproto.h
49===================================================================
50--- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700
51+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700
52@@ -31,6 +31,8 @@
53 #include "config.h"
54 #endif
55
56+#include <xorg-server.h>
57+
58 #include <unistd.h>
59 #include <sys/ioctl.h>
60 #include <xf86Xinput.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
index 435faa6024..19be77aadb 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
@@ -1,7 +1,5 @@
1require xorg-driver-input.inc 1require xorg-driver-input.inc
2 2
3#SRC_URI += "file://configurefix.patch"
4
5SUMMARY = "X.Org X server -- synaptics touchpad input driver" 3SUMMARY = "X.Org X server -- synaptics touchpad input driver"
6 4
7DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ 5DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \
@@ -12,8 +10,6 @@ advanced features of the touchpad to become available."
12 10
13LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" 11LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
14 12
15SRC_URI += "file://always_include_xorg_server.h.patch"
16
17SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9" 13SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9"
18SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a" 14SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a"
19 15