From ed51f18cdea6fc03cad172235b6964369ddaf248 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 1 Mar 2010 19:32:02 +0100 Subject: [PATCH] xinput-calibrator: add version 0.6.0 and also git version from misclick branch Signed-off-by: Martin Jansa --- .../xinput-calibrator/xinput-calibrator.inc | 7 +++++++ .../xinput-calibrator_0.5.0.bb | 11 +--------- .../xinput-calibrator_0.6.0.bb | 14 +++++++++++++ .../xinput-calibrator_git.bb | 20 +++++++++++++++++++ 4 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 recipes/xinput-calibrator/xinput-calibrator.inc create mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb create mode 100644 recipes/xinput-calibrator/xinput-calibrator_git.bb diff --git a/recipes/xinput-calibrator/xinput-calibrator.inc b/recipes/xinput-calibrator/xinput-calibrator.inc new file mode 100644 index 0000000000..fad07869c7 --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator.inc @@ -0,0 +1,7 @@ +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" + +inherit autotools diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb index 9d549b3af8..71d7931816 100644 --- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb +++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb @@ -1,11 +1,4 @@ -DESCRIPTION = "A generic touchscreen calibration program for X.Org" -HOMEPAGE = "http://github.com/tias/xinput_calibrator" - -LICENSE = "MIT/X11" - -DEPENDS = "virtual/libx11 libxi" - -RDEPENDS_${PN} = "xinput" +require xinput-calibrator.inc PR = "r6" @@ -17,8 +10,6 @@ SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ SRCREV = "1c715824334c5d33085dba02f195c9720c2883b5" S = "${WORKDIR}/git/" -inherit autotools - do_install() { install -d ${D}${bindir} install -m 0755 src/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb new file mode 100644 index 0000000000..517f919549 --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb @@ -0,0 +1,14 @@ +require xinput-calibrator.inc + +SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" + +SRCREV = "d6e01d780001948f55006698e8e9e48c12894810" +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 +} diff --git a/recipes/xinput-calibrator/xinput-calibrator_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb new file mode 100644 index 0000000000..8d3d4c4a4a --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator_git.bb @@ -0,0 +1,20 @@ +require xinput-calibrator.inc + +PV = "0.6.0+gitr${SRCREV}" + +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" +DEFAULT_PREFERENCE_shr = "1" -- 2.39.5