summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch81
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb2
4 files changed, 145 insertions, 0 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
new file mode 100644
index 0000000000..f36bb7579d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch
@@ -0,0 +1,60 @@
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.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb
index dc3b6b597c..90baf8fbf3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb
@@ -12,6 +12,8 @@ advanced features of the touchpad to become available."
12 12
13LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" 13LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
14 14
15SRC_URI += "file://always_include_xorg_server.h.patch"
16
15SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f" 17SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f"
16SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a" 18SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a"
17 19
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch
new file mode 100644
index 0000000000..12fb9df2fd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch
@@ -0,0 +1,81 @@
1From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001
2From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3Date: Thu, 28 Nov 2013 11:59:53 -0800
4Subject: Always include config.h first
5
6This fixes some build warnings about CSRG_BASED being redefined due to
7incorrect header include ordering.
8
9Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
10
11Upstream-Status: Backport
12
13Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c
14===================================================================
15--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700
16+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700
17@@ -39,6 +39,10 @@
18 #endif
19
20
21+#ifdef HAVE_CONFIG_H
22+#include "config.h"
23+#endif
24+
25 #include "vmmouse_client.h"
26 #include "vmmouse_proto.h"
27
28Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c
29===================================================================
30--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700
31+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700
32@@ -33,6 +33,10 @@
33 */
34
35
36+#ifdef HAVE_CONFIG_H
37+#include "config.h"
38+#endif
39+
40 #include "vmmouse_proto.h"
41
42
43Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h
44===================================================================
45--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700
46+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700
47@@ -36,11 +36,6 @@
48 #ifndef _VMMOUSE_PROTO_H_
49 #define _VMMOUSE_PROTO_H_
50
51-
52-#ifdef HAVE_CONFIG_H
53-#include "config.h"
54-#endif
55-
56 #include <stdint.h>
57
58 #ifdef HAVE_XORG_SERVER_1_1_0
59Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c
60===================================================================
61--- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700
62+++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700
63@@ -26,14 +26,14 @@
64 */
65
66
67-#include <stdlib.h>
68-#include <signal.h>
69-#include "vmmouse_client.h"
70-
71 #ifdef HAVE_CONFIG_H
72 #include "config.h"
73 #endif
74
75+#include <stdlib.h>
76+#include <signal.h>
77+#include "vmmouse_client.h"
78+
79 void
80 segvCB(int sig)
81 {
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb
index 35ef5991c3..83ea960a88 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb
@@ -8,6 +8,8 @@ standard 'mouse' driver if a VMware virtual machine is not detected."
8 8
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.0"
10 10
11SRC_URI += "file://always_include_config.h.patch"
12
11SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07" 13SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07"
12SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c" 14SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c"
13 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 20:23:18 +0000