[oe] [PATCH 5/5] xinput-calibrator: drop older versions
Martin Jansa
martin.jansa at gmail.com
Fri May 13 09:40:09 UTC 2011
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../xinput-calibrator.desktop | 11 ------
.../xinput_calibrator_once.sh | 11 ------
...orgPrint.cpp-fix-miny-and-maxx-printing-o.patch | 36 --------------------
recipes/xinput-calibrator/xinput-calibrator.inc | 8 ----
.../xinput-calibrator/xinput-calibrator_0.5.0.bb | 19 ----------
.../xinput-calibrator/xinput-calibrator_0.6.0.bb | 18 ----------
.../xinput-calibrator/xinput-calibrator_0.6.1.bb | 16 ---------
recipes/xinput-calibrator/xinput-calibrator_git.bb | 20 -----------
8 files changed, 0 insertions(+), 139 deletions(-)
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput-calibrator.desktop
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/xinput_calibrator_once.sh
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator.inc
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
delete mode 100644 recipes/xinput-calibrator/xinput-calibrator_git.bb
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 813d7c1..0000000
--- 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 82fcfc6..0000000
--- 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 fa03147..0000000
--- 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 at 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 at 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 357b0e5..0000000
--- 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 ba04865..0000000
--- 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 06f46d0..0000000
--- 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 7dc6f29..0000000
--- 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_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb
deleted file mode 100644
index c6188e6..0000000
--- 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"
--
1.7.5.rc3
More information about the Openembedded-devel
mailing list