diff options
Diffstat (limited to 'recipes/xinput-calibrator')
12 files changed, 30 insertions, 142 deletions
diff --git a/recipes/xinput-calibrator/pointercal-xinput/bug/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/bug/pointercal.xinput new file mode 100644 index 0000000000..8292c01a17 --- /dev/null +++ b/recipes/xinput-calibrator/pointercal-xinput/bug/pointercal.xinput @@ -0,0 +1,2 @@ +xinput set-int-prop "ts4" "Evdev Axis Calibration" 32 3570 4074 272 3892 +xinput set-int-prop "ts5" "Evdev Axis Calibration" 32 3570 4074 272 3892 diff --git a/recipes/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput new file mode 100644 index 0000000000..50e2632777 --- /dev/null +++ b/recipes/xinput-calibrator/pointercal-xinput/bug20/pointercal.xinput @@ -0,0 +1 @@ +xinput set-int-prop "TSC2004 Touchscreen" "Evdev Axis Calibration" 32 239 10 232 6; diff --git a/recipes/xinput-calibrator/pointercal-xinput_0.0.bb b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb index 2d62f20070..b5a6867623 100644 --- a/recipes/xinput-calibrator/pointercal-xinput_0.0.bb +++ b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb @@ -1,8 +1,11 @@ DESCRIPTION = "Touchscreen calibration data from xinput-calibrator" -LICENSE = "MIT/X11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + SECTION = "base" -PR = "r2" +PR = "r5" + SRC_URI = "file://pointercal.xinput" S = "${WORKDIR}" @@ -14,6 +17,5 @@ do_install() { fi } -ALLOW_EMPTY_${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop deleted file mode 100644 index 813d7c1ac5..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Calibrate Xinput Touchscreen -Name[de]=Xinput Touchscreen Kalibrieren -Comment=Run the calibration tool for Xinput touchscreens -Encoding=UTF-8 -Exec=/usr/bin/xinput_calibrator -Terminal=false -Type=Application -Icon=calibrate -StartupNotify=true -Categories=System;Settings; diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh deleted file mode 100644 index 82fcfc6570..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -if [ -e /etc/pointercal.xinput ] ; then - echo Using calibration data stored in /etc/pointercal.xinput - . /etc/pointercal.xinput -else - CAL=`/usr/bin/xinput_calibrator | tee /etc/pointercal.xinput.log | grep xinput| sed 's/^ //g; s/$/;/g'` - if [ ! -z "$CAL" ] ; then - echo $CAL > /etc/pointercal.xinput - echo Calibration data stored in /etc/pointercal.xinput - fi -fi diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch b/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch deleted file mode 100644 index fa0314726b..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 383a3a8523814d1b108d2dc1ed812f80d6c9f050 Mon Sep 17 00:00:00 2001 -From: Mario Domenech Goulart <mario@ossystems.com.br> -Date: Thu, 11 Mar 2010 11:05:18 -0300 -Subject: [PATCH] calibratorXorgPrint.cpp: fix miny and maxx printing order for UDEV and HAL - - -Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> ---- - src/calibrator/calibratorXorgPrint.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/calibrator/calibratorXorgPrint.cpp b/src/calibrator/calibratorXorgPrint.cpp -index 92d297a..1f74de0 100644 ---- a/src/calibrator/calibratorXorgPrint.cpp -+++ b/src/calibrator/calibratorXorgPrint.cpp -@@ -69,7 +69,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy) - \tENV{x11_options.miny}=\"%d\"\n\ - \tENV{x11_options.maxx}=\"%d\"\n\ - \tENV{x11_options.maxy}=\"%d\"\n" -- , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max); -+ , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max); - if (swap_xy != 0) - printf("\tENV{x11_options.swapxy}=\"%d\"\n", swap_xy); - printf("\tLABEL=\"xorg_touchscreen_end\"\n"); -@@ -81,7 +81,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy) - \t <merge key=\"input.x11_options.miny\" type=\"string\">%d</merge>\n\ - \t <merge key=\"input.x11_options.maxx\" type=\"string\">%d</merge>\n\ - \t <merge key=\"input.x11_options.maxy\" type=\"string\">%d</merge>\n" -- , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max); -+ , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max); - if (swap_xy != 0) - printf("\t <merge key=\"input.x11_options.swapxy\" type=\"string\">%d</merge>\n", swap_xy); - printf("\t</match>\n"); --- -1.6.3.3.444.g4ecbc - diff --git a/recipes/xinput-calibrator/xinput-calibrator.inc b/recipes/xinput-calibrator/xinput-calibrator.inc deleted file mode 100644 index 357b0e5c04..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator.inc +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "A generic touchscreen calibration program for X.Org" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" -LICENSE = "MIT/X11" -DEPENDS = "virtual/libx11 libxi" -RDEPENDS_${PN} = "xinput pointercal-xinput" -INC_PR = "r7" - -inherit autotools diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb deleted file mode 100644 index ba04865f99..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xinput-calibrator.inc - -PR = "${INC_PR}.0" - -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ - file://xinput-calibrator.desktop \ - file://xinput_calibrator_once.sh \ -" - -SRCREV = "1c715824334c5d33085dba02f195c9720c2883b5" -S = "${WORKDIR}/git/" - -do_install() { - install -d ${D}${bindir} - install -m 0755 src/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -m 0755 ${WORKDIR}/xinput_calibrator_once.sh ${D}${bindir}/xinput_calibrator_once.sh - install -d ${D}${datadir}/applications/ - install -m 0755 ${WORKDIR}/xinput-calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop -} diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb deleted file mode 100644 index 06f46d0bbb..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xinput-calibrator.inc - -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ - file://0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch" - -SRCREV = "d6e01d780001948f55006698e8e9e48c12894810" -S = "${WORKDIR}/git/" - -PR = "${INC_PR}.0" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop - install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh -} diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb deleted file mode 100644 index 7dc6f29e13..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xinput-calibrator.inc - -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" - -SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7" -PR = "${INC_PR}.0" -S = "${WORKDIR}/git/" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop - install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh -} diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.7.5.bb b/recipes/xinput-calibrator/xinput-calibrator_0.7.5.bb new file mode 100644 index 0000000000..4024883463 --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator_0.7.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A generic touchscreen calibration program for X.Org" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" +LICENSE = "MIT/X11" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" +DEPENDS = "virtual/libx11 libxi" + +inherit autotools + +RDEPENDS_${PN} = "xinput" +RRECOMMENDS_${PN} = "pointercal-xinput" + +SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz" +SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" +SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" + +S = "${WORKDIR}/xinput_calibrator-${PV}" + +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 +} diff --git a/recipes/xinput-calibrator/xinput-calibrator_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb deleted file mode 100644 index c6188e6a7c..0000000000 --- a/recipes/xinput-calibrator/xinput-calibrator_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xinput-calibrator.inc - -PV = "0.6.0+gitr${SRCPV}" -PR = "${INC_PR}.0" - -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git;branch=misclick" - -SRCREV = "496d4401731c6e5ed550e446cc2fc4b12d999ad8" -S = "${WORKDIR}/git/" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop -} - -# remove this after misclick branch is well-tested and merged to master -DEFAULT_PREFERENCE = "-1" |