diff options
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 9 |
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 @@ -From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 9 Aug 2016 17:03:31 +0300 -Subject: [PATCH] add geometry input when calibrating - -Send monitor geometry to xinput_calibrator when running the script -Update: - Remove bashism - -Upstream-Status: Inappropriate [no longer maintained] - -Signed-off-by: Jonathan David <jonathan.david@ni.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - scripts/xinput_calibrator_pointercal.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index fccb197..fea7c2f 100755 ---- a/scripts/xinput_calibrator_pointercal.sh -+++ b/scripts/xinput_calibrator_pointercal.sh -@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then - fi - fi - --CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` -+RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') -+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` - if [ ! -z "$CALDATA" ] ; then - echo $CALDATA > $CALFILE - echo "Calibration data stored in $CALFILE (log in $LOGFILE)" --- -2.4.0 - 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" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" -DEPENDS = "virtual/libx11 libxi" +DEPENDS = "virtual/libx11 libxi libxrandr" PV = "0.7.5+git${SRCPV}" PR = "r6" @@ -11,11 +11,10 @@ inherit autotools pkgconfig distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" +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://add-geometry-input-when-calibrating.patch" + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" S = "${WORKDIR}/git" @@ -34,5 +33,5 @@ do_install_append() { } FILES_${PN} += "${sysconfdir}/xdg/autostart" -RDEPENDS_${PN} = "xinput formfactor xrandr" +RDEPENDS_${PN} = "xinput formfactor" RRECOMMENDS_${PN} = "pointercal-xinput" |