summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch34
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb9
2 files changed, 4 insertions, 39 deletions
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
deleted file mode 100644
index 9dc94ae493..0000000000
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 9 Aug 2016 17:03:31 +0300
4Subject: [PATCH] add geometry input when calibrating
5
6Send monitor geometry to xinput_calibrator when running the script
7Update:
8 Remove bashism
9
10Upstream-Status: Inappropriate [no longer maintained]
11
12Signed-off-by: Jonathan David <jonathan.david@ni.com>
13Signed-off-by: Maxin B. John <maxin.john@intel.com>
14---
15 scripts/xinput_calibrator_pointercal.sh | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
19index fccb197..fea7c2f 100755
20--- a/scripts/xinput_calibrator_pointercal.sh
21+++ b/scripts/xinput_calibrator_pointercal.sh
22@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then
23 fi
24 fi
25
26-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
27+RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
28+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
29 if [ ! -z "$CALDATA" ] ; then
30 echo $CALDATA > $CALFILE
31 echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
32--
332.4.0
34
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 57c3a7a9a6..68e62ea6d9 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Touchscreen calibration program for X11"
2HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" 2HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
3LICENSE = "MIT-X" 3LICENSE = "MIT-X"
4LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" 4LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
5DEPENDS = "virtual/libx11 libxi" 5DEPENDS = "virtual/libx11 libxi libxrandr"
6 6
7PV = "0.7.5+git${SRCPV}" 7PV = "0.7.5+git${SRCPV}"
8PR = "r6" 8PR = "r6"
@@ -11,11 +11,10 @@ inherit autotools pkgconfig distro_features_check
11# depends on virtual/libx11 11# depends on virtual/libx11
12REQUIRED_DISTRO_FEATURES = "x11" 12REQUIRED_DISTRO_FEATURES = "x11"
13 13
14SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" 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://add-geometry-input-when-calibrating.patch"
19 18
20S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
21 20
@@ -34,5 +33,5 @@ do_install_append() {
34} 33}
35 34
36FILES_${PN} += "${sysconfdir}/xdg/autostart" 35FILES_${PN} += "${sysconfdir}/xdg/autostart"
37RDEPENDS_${PN} = "xinput formfactor xrandr" 36RDEPENDS_${PN} = "xinput formfactor"
38RRECOMMENDS_${PN} = "pointercal-xinput" 37RRECOMMENDS_${PN} = "pointercal-xinput"