xinput-calibrator 0.7.5: fix calibration script

The 'auto' format switched to 'xorg.conf.d' which broke the script. The pointercal package also installed an 'empty' pointercal by default, which also broke the script. Fix these 2 in one go.

Also remove the hal script since hal isn't supported in the oe-core universe anymore

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index f0e85cfd8..e39cc44b5 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,11 +4,12 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
 DEPENDS = "virtual/libx11 libxi"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
-SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
+           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch"
 SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
 SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
 
@@ -20,7 +21,6 @@ EXTRA_OECONF += "--with-gui=x11"
 do_install_append() {
         install -d ${D}${bindir}
         install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
-        install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
 }
 
 RDEPENDS_${PN} = "xinput"