From c38a24f6205df5814373e1b3f1a4bee0a94d07e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 30 Jan 2019 22:50:12 -0800 Subject: xinput-calibrator: Fix build with clang/libc++ (From OE-Core rev: c95081d80b3779095233effaf3740d32be429a9b) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...rator.hh-Include-string-to-get-std-string.patch | 28 ++++++++++++++++++++++ .../xinput-calibrator/xinput-calibrator_git.bb | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch 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 @@ +From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Jan 2019 22:40:24 -0800 +Subject: [PATCH] calibrator.hh: Include to get std::string + +Found with libc++ + +Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76] +Signed-off-by: Khem Raj +--- + src/calibrator.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/calibrator.hh b/src/calibrator.hh +index a6f9504..e75bcef 100644 +--- a/src/calibrator.hh ++++ b/src/calibrator.hh +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // XXX: we currently don't handle lines that are longer than this + #define MAX_LINE_LEN 1024 +-- +2.20.1 + 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" SRCREV = "03dadf55109bd43d3380f040debe9f82f66f2f35" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ file://30xinput_calibrate.sh \ - file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ + file://0001-calibrator.hh-Include-string-to-get-std-string.patch \ + " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf