Patchwork [meta-oe] xinput-calibrator 0.7.5: fix calibration script

login
register
mail settings
Submitter Koen Kooi
Date Feb. 28, 2012, 1:17 p.m.
Message ID <1330435070-30907-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22311/
State Accepted
Commit dd44dc50adaaafd269fab18b09fa6d8b8f7a1759
Headers show

Comments

Koen Kooi - Feb. 28, 2012, 1:17 p.m.
The 'auto' format switched to 'xorg.conf.d' which broke the script. The pointercal package also installed an 'empty' pointercal by default, which also broke the script. Fix these 2 in one go.

Also remove the hal script since hal isn't supported in the oe-core universe anymore

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...brator_pointercal.sh-specify-output-type-.patch |   56 ++++++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    6 +-
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch
Andrea Adami - Feb. 28, 2012, 1:58 p.m.
On Tue, Feb 28, 2012 at 2:17 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> The 'auto' format switched to 'xorg.conf.d' which broke the script. The pointercal package also installed an 'empty' pointercal by default, which also broke the script. Fix these 2 in one go.
>
> Also remove the hal script since hal isn't supported in the oe-core universe anymore
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---

Koen,

do you think the recipe is now mature enough to be committed in oe-core?
This would follow xinput commit and could make easier the unification
of xserver-nodm-init between oe-core and meta-oe.

I think thi sis needed because at the moment xserver ts calibration is
not working when using oe-core (xtscal fails because XCALIBRATE ext
has been removed).


Regards

Andrea



>  ...brator_pointercal.sh-specify-output-type-.patch |   56 ++++++++++++++++++++
>  .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    6 +-
>  2 files changed, 59 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch
>
> 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
> new file mode 100644
> index 0000000..8e6d949
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch
> @@ -0,0 +1,56 @@
> +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_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
> index f0e85cf..e39cc44 100644
> --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
> +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
> @@ -4,11 +4,12 @@ LICENSE = "MIT-X"
>  LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
>  DEPENDS = "virtual/libx11 libxi"
>
> -PR = "r2"
> +PR = "r3"
>
>  inherit autotools
>
> -SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
> +SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
> +           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch"
>  SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
>  SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
>
> @@ -20,7 +21,6 @@ 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 -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
>  }
>
>  RDEPENDS_${PN} = "xinput"
> --
> 1.7.2.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Koen Kooi - Feb. 28, 2012, 2:46 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 28-02-12 14:58, Andrea Adami schreef:
> On Tue, Feb 28, 2012 at 2:17 PM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> The 'auto' format switched to 'xorg.conf.d' which broke the script. The
>> pointercal package also installed an 'empty' pointercal by default,
>> which also broke the script. Fix these 2 in one go.
>> 
>> Also remove the hal script since hal isn't supported in the oe-core
>> universe anymore
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---
> 
> Koen,
> 
> do you think the recipe is now mature enough to be committed in oe-core?

Well, there is too much in oe-core already, it needs to shrink, not grow :(
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9M6KoACgkQMkyGM64RGpHtNgCgtOc4D2DkDh6U52dwYngDD5Zj
gq8An2Anp4rYkcz0zsXC8EWL0fFtJjUS
=5h+N
-----END PGP SIGNATURE-----
Otavio Salvador - Feb. 28, 2012, 2:58 p.m.
On Tue, Feb 28, 2012 at 10:58, Andrea Adami <andrea.adami@gmail.com> wrote:
> do you think the recipe is now mature enough to be committed in oe-core?
> This would follow xinput commit and could make easier the unification
> of xserver-nodm-init between oe-core and meta-oe.
>
> I think thi sis needed because at the moment xserver ts calibration is
> not working when using oe-core (xtscal fails because XCALIBRATE ext
> has been removed).

The touchscreens we have here do not work with it as it doesn't handle
the swap and reverse properly.

Patch

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
new file mode 100644
index 0000000..8e6d949
--- /dev/null
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch
@@ -0,0 +1,56 @@ 
+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_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index f0e85cf..e39cc44 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,11 +4,12 @@  LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
 DEPENDS = "virtual/libx11 libxi"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
-SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
+SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
+           file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch"
 SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
 SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971"
 
@@ -20,7 +21,6 @@  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 -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
 }
 
 RDEPENDS_${PN} = "xinput"