diff options
author | Mario Domenech Goulart <mario@ossystems.com.br> | 2012-12-03 16:03:24 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-12-04 10:46:34 +0100 |
commit | 3cd0866c28822d08e5817d4d806b8deaa368c711 (patch) | |
tree | b2bac5dfd6146e3d882bc2feed89bf55b12bfd61 | |
parent | 3becce8504033dfac7c497fa12675f873a5df9e0 (diff) | |
download | meta-openembedded-contrib-3cd0866c28822d08e5817d4d806b8deaa368c711.tar.gz |
xinput-calibrator: update to 2012 Aug 2nd's git snapshot
Change-Id: I16dedd2623cc6230fccbe9765592d29dcdb2aa72
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch | 56 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop | 8 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb (renamed from meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb) | 17 |
3 files changed, 7 insertions, 74 deletions
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch deleted file mode 100644 index 8e6d9498e7..0000000000 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e73eb2c343006865ff3faf7777ab93ccfd1762d6 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 28 Feb 2012 14:09:08 +0100 -Subject: [PATCH] xinput_calibrator_pointercal.sh: specify output type since 'auto' doesn't always pick 'xinput' - -Also deal with pointercal files that contain '# replace with valid machine specific pointercal.xinput' - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - -Upstream-status: Submitted - - scripts/xinput_calibrator_pointercal.sh | 22 +++++++++++++++------- - 1 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index 579509c..fccb197 100755 ---- a/scripts/xinput_calibrator_pointercal.sh -+++ b/scripts/xinput_calibrator_pointercal.sh -@@ -6,18 +6,26 @@ - # - # original script: Martin Jansa <Martin.Jansa@gmail.com>, 2010-01-31 - # updated by Tias Guns <tias@ulyssis.org>, 2010-02-15 -+# updated by Koen Kooi <koen@dominion.thruhere.net>, 2012-02-28 -+ -+PATH="/usr/bin:$PATH" - - BINARY="xinput_calibrator" - CALFILE="/etc/pointercal.xinput" - LOGFILE="/var/log/xinput_calibrator.pointercal.log" - - if [ -e $CALFILE ] ; then -- echo "Using calibration data stored in $CALFILE" -- . $CALFILE --else -- CALDATA=`$BINARY -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)" -+ if grep replace $CALFILE ; then -+ echo "Empty calibration file found, removing it" -+ rm $CALFILE -+ else -+ echo "Using calibration data stored in $CALFILE" -+ . $CALFILE && exit 0 - fi - fi -+ -+CALDATA=`$BINARY --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)" -+fi --- -1.7.2.5 - diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop deleted file mode 100644 index 3f3d613278..0000000000 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator-autostart.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Calibrate Touchscreen -Exec=xinput_calibrator_once.sh -Terminal=false -Type=Application -Icon=xinput_calibrator -StartupNotify=true -Categories=System;Settings; diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index edc10bda40..c16a412470 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -1,21 +1,17 @@ DESCRIPTION = "A generic touchscreen calibration program for X.Org" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" DEPENDS = "virtual/libx11 libxi" -PR = "r8" +PV = "0.7.5+git${SRCPV}" inherit autotools -SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \ - file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch \ - file://xinput-calibrator-autostart.desktop \ -" -SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" -SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" +SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" +SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" -S = "${WORKDIR}/xinput_calibrator-${PV}" +S = "${WORKDIR}/git" # force native X11 ui as we don't have gtk+ in DEPENDS EXTRA_OECONF += "--with-gui=x11" @@ -25,7 +21,8 @@ do_install_append() { install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh install -d ${D}${sysconfdir}/xdg/autostart - install -m 0644 ${WORKDIR}/xinput-calibrator-autostart.desktop ${D}${sysconfdir}/xdg/autostart + sed -i -e 's,^Exec=.*,Exec=/usr/bin/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop + install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart } FILES_${PN} += "${sysconfdir}/xdg/autostart" |