summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-30 22:50:12 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-02 11:06:00 +0000
commitc38a24f6205df5814373e1b3f1a4bee0a94d07e4 (patch)
tree6c0e39de82cd741d2df31de3d04d1bcaddd247d9
parentbbc4c8eb9b2ebde05b2cb1d01e693cda9083ae6d (diff)
downloadpoky-c38a24f6205df5814373e1b3f1a4bee0a94d07e4.tar.gz
xinput-calibrator: Fix build with clang/libc++
(From OE-Core rev: c95081d80b3779095233effaf3740d32be429a9b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch28
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb4
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch
new file mode 100644
index 0000000000..37617600d5
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch
@@ -0,0 +1,28 @@
1From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Jan 2019 22:40:24 -0800
4Subject: [PATCH] calibrator.hh: Include <string> to get std::string
5
6Found with libc++
7
8Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/calibrator.hh | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/src/calibrator.hh b/src/calibrator.hh
15index a6f9504..e75bcef 100644
16--- a/src/calibrator.hh
17+++ b/src/calibrator.hh
18@@ -29,6 +29,7 @@
19 #include <X11/Xlib.h>
20 #include <stdio.h>
21 #include <vector>
22+#include <string>
23
24 // XXX: we currently don't handle lines that are longer than this
25 #define MAX_LINE_LEN 1024
26--
272.20.1
28
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 68e62ea6d9..9873d3f33f 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -14,7 +14,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
14SRCREV = "03dadf55109bd43d3380f040debe9f82f66f2f35" 14SRCREV = "03dadf55109bd43d3380f040debe9f82f66f2f35"
15SRC_URI = "git://github.com/tias/xinput_calibrator.git \ 15SRC_URI = "git://github.com/tias/xinput_calibrator.git \
16 file://30xinput_calibrate.sh \ 16 file://30xinput_calibrate.sh \
17 file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" 17 file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
18 file://0001-calibrator.hh-Include-string-to-get-std-string.patch \
19 "
18 20
19S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
20 22