summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-08-04 14:01:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:30 -0700
commitfbe44c4cd537276e39064d8f52bf41529f3ab10b (patch)
treeade4c91d3b99ddf067589947d7505504279be393
parentf0ad4ce3c72a8698d39ec26919d36e03505b9b86 (diff)
downloadpoky-fbe44c4cd537276e39064d8f52bf41529f3ab10b.tar.gz
xf86-input-vmmouse: Upgrade 13.0.0 -> 13.1.0
* Remove backported patch * Remove PR * Use ${nonarch_base_libdir} for udev files. (From OE-Core rev: 83a8b00dfb88115a612eff44296956062c5097a5) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.1.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb)12
2 files changed, 5 insertions, 88 deletions
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
deleted file mode 100644
index 12fb9df2fd..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch
+++ /dev/null
@@ -1,81 +0,0 @@
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.1.0.bb
index 83ea960a88..8615b48daa 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
@@ -6,12 +6,8 @@ protocol that is provided by VMware virtual machines to give absolute \
6pointer positioning. The vmmouse driver is capable of falling back to the \ 6pointer positioning. The vmmouse driver is capable of falling back to the \
7standard 'mouse' driver if a VMware virtual machine is not detected." 7standard 'mouse' driver if a VMware virtual machine is not detected."
8 8
9PR = "${INC_PR}.0" 9SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed"
10 10SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319"
11SRC_URI += "file://always_include_config.h.patch"
12
13SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07"
14SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c"
15 11
16RDEPENDS_${PN} += "xf86-input-mouse" 12RDEPENDS_${PN} += "xf86-input-mouse"
17 13
@@ -25,4 +21,6 @@ do_install_append () {
25 rm -rf ${D}${libdir}/hal/ 21 rm -rf ${D}${libdir}/hal/
26} 22}
27 23
28FILES_${PN} += "${base_libdir}/udev/ ${datadir}/X11/xorg.conf.d" 24EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
25
26FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ ${datadir}/X11/xorg.conf.d"