Patchwork [oe,meta-oe,1/4] xinput-calibrator: calibrate touch screen with xorg

login
register
mail settings
Submitter Marco Cavallini
Date April 9, 2013, 2:19 p.m.
Message ID <1365517194-30916-1-git-send-email-m.cavallini@koansoftware.com>
Download mbox | patch
Permalink /patch/47705/
State New
Headers show

Comments

Marco Cavallini - April 9, 2013, 2:19 p.m.
* Taken from oe-classic
 * This patch includes pointercal-xinput

Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
---
 .../pointercal-xinput/pointercal.xinput            |  1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     | 19 +++++++++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     | 31 ++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
Ross Burton - April 9, 2013, 2:28 p.m.
On 9 April 2013 15:19, Marco Cavallini <koansoftware@gmail.com> wrote:
> +# force native X11 ui as we don't have gtk+ in DEPENDS
> +EXTRA_OECONF += "--with-gui=x11"

This should be a PACKAGECONFIG as people who have a GTK+-based shell
will probably prefer the GTK+ UI.

Ross
Andreas Müller - April 9, 2013, 4:49 p.m.
On Tue, Apr 9, 2013 at 4:19 PM, Marco Cavallini <koansoftware@gmail.com> wrote:
>  * Taken from oe-classic
>  * This patch includes pointercal-xinput
>
> Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
> ---
>  .../pointercal-xinput/pointercal.xinput            |  1 +
>  .../xinput-calibrator/pointercal-xinput_0.0.bb     | 19 +++++++++++++
>  .../xinput-calibrator/xinput-calibrator_git.bb     | 31 ++++++++++++++++++++++
>  3 files changed, 51 insertions(+)
>  create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
>  create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
>  create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
>
> diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
> new file mode 100644
> index 0000000..9633fc5
> --- /dev/null
> +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
> @@ -0,0 +1 @@
> +# replace with valid machine specific pointercal.xinput
> diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
> new file mode 100644
> index 0000000..9b68d54
> --- /dev/null
> +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
> @@ -0,0 +1,19 @@
> +DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +PR = "r4"
> +
> +SRC_URI = "file://pointercal.xinput"
> +S = "${WORKDIR}"
> +
> +do_install() {
> +       # Only install file if it has a contents
> +       if [ -s ${S}/pointercal.xinput ]; then
> +               install -d ${D}${sysconfdir}/
> +               install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
> +       fi
> +}
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
> diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> new file mode 100644
> index 0000000..97f9343
> --- /dev/null
> +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> @@ -0,0 +1,31 @@
> +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=1bcba08f67cdb56f34021557898e4b5a"
> +DEPENDS = "virtual/libx11 libxi"
> +
> +PV = "0.7.5+git${SRCPV}"
> +PR = "r1"
> +
> +inherit autotools
> +
> +SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
> +SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
> +
> +S = "${WORKDIR}/git"
> +
> +# force native X11 ui as we don't have gtk+ in DEPENDS
> +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 -d ${D}${sysconfdir}/xdg/autostart
> +        sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop
> +        install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart
> +}
> +
> +FILES_${PN} += "${sysconfdir}/xdg/autostart"
> +RDEPENDS_${PN} = "xinput xterm"
> +RRECOMMENDS_${PN} = "pointercal-xinput"
> --
> 1.8.2.1
>
1. Is this a 'core' component?
2. If so: Why not importing from meta-oe there were several
enhancements (mainline) meanwhile?
3. I am again(still) working on this ( systemd/udev plug & play ). It
would make my life easier if we wait with this migration

Andreas
Ross Burton - April 9, 2013, 4:56 p.m.
On 9 April 2013 17:49, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> On Tue, Apr 9, 2013 at 4:19 PM, Marco Cavallini <koansoftware@gmail.com> wrote:
>>  * Taken from oe-classic
>>  * This patch includes pointercal-xinput
>
> 1. Is this a 'core' component?
> 2. If so: Why not importing from meta-oe there were several
> enhancements (mainline) meanwhile?
> 3. I am again(still) working on this ( systemd/udev plug & play ). It
> would make my life easier if we wait with this migration

Erm, yeah.  I didn't notice this was from oe-classic.  My xterm
grumble still applies though!

Ross
Andreas Müller - April 9, 2013, 5:25 p.m.
On Tue, Apr 9, 2013 at 6:56 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 9 April 2013 17:49, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>> On Tue, Apr 9, 2013 at 4:19 PM, Marco Cavallini <koansoftware@gmail.com> wrote:
>>>  * Taken from oe-classic
>>>  * This patch includes pointercal-xinput
>>
>> 1. Is this a 'core' component?
>> 2. If so: Why not importing from meta-oe there were several
>> enhancements (mainline) meanwhile?
>> 3. I am again(still) working on this ( systemd/udev plug & play ). It
>> would make my life easier if we wait with this migration
>
> Erm, yeah.  I didn't notice this was from oe-classic.  My xterm
> grumble still applies though!
>
Yes I had the same feeling (gtk-UI looks much smarter). I would like
to address these issues but have some questions:

* xterm: for me it was just a useless package in my image. With the
approach I am working on (first shot [1] - but there were some
enhancements since then) I simply removed xterm from RDEPENDS assuming
people who want manual recalibrating (only those need a terminal for
calibration) will take care in their images which terminal to install.
Is that OK - or other suggestions?
* gtk-UI: Upon what would you suggest to make this decision? Distro
feature? If yes: Which entry?

[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-February/043854.html

Andreas

Patch

diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
new file mode 100644
index 0000000..9633fc5
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
@@ -0,0 +1 @@ 
+# replace with valid machine specific pointercal.xinput
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
new file mode 100644
index 0000000..9b68d54
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -0,0 +1,19 @@ 
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PR = "r4"
+
+SRC_URI = "file://pointercal.xinput"
+S = "${WORKDIR}"
+
+do_install() {
+	# Only install file if it has a contents
+	if [ -s ${S}/pointercal.xinput ]; then
+	        install -d ${D}${sysconfdir}/
+	        install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
new file mode 100644
index 0000000..97f9343
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -0,0 +1,31 @@ 
+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=1bcba08f67cdb56f34021557898e4b5a"
+DEPENDS = "virtual/libx11 libxi"
+
+PV = "0.7.5+git${SRCPV}"
+PR = "r1"
+
+inherit autotools
+
+SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+# force native X11 ui as we don't have gtk+ in DEPENDS
+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 -d ${D}${sysconfdir}/xdg/autostart
+        sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop
+        install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart
+}
+
+FILES_${PN} += "${sysconfdir}/xdg/autostart"
+RDEPENDS_${PN} = "xinput xterm"
+RRECOMMENDS_${PN} = "pointercal-xinput"