xinput-calibrator: upgrade to 0.8.0

Development has moved to freedesktop.org, so switch SRC_URI.

Drop an upstreamed patch.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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
deleted file mode 100644 (file)
index 3761760..0000000
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 22:40:24 -0800
-Subject: [PATCH] calibrator.hh: Include <string> to get std::string
-
-Found with libc++
-
-Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 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 <X11/Xlib.h>
- #include <stdio.h>
- #include <vector>
-+#include <string>
- 
- // 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/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
index de0862599d73f1c606aad8bc715d699faf43f37a..86982924a81a7c931f5cf40f136c50b391d90121 100644 (file)
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Inactive-Upstream [last commits over a decade ago]
+Upstream-Status: Pending
 
 From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001
 From: Laurentiu Palcu <laurentiu.palcu@intel.com>

diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
similarity index 78%
rename from meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
rename to meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
index 0516928a76b87b741e74e157e8ae6e229570101c..c37b36897b67fcfc075943410dd7f24e65e8e1d9 100644 (file)
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
@@ -4,22 +4,18 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
 DEPENDS = "virtual/libx11 libxi libxrandr"
 
-PV = "0.7.5+git"
-
 inherit autotools pkgconfig features_check
-# depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRCREV = "18ec53f1cada39f905614ebfaffed5c7754ecf46"
-SRC_URI = "git://github.com/kreijack/xinput_calibrator.git;branch=libinput;protocol=https \
+SRCREV = "970b574b8f7b0d6f2613d343191f47814f2dfaa4"
+
+SRC_URI = "git://gitlab.freedesktop.org/xorg/app/xinput-calibrator;protocol=https;branch=master;tag=v${PV} \
            file://30xinput_calibrate.sh \
            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"
 
-# force native X11 ui as we don't have gtk+ in DEPENDS
 EXTRA_OECONF += "--with-gui=x11"
 
 do_install:append() {