Patchwork [meta-oe-meta-systemd,4/5] pointercal-xinput: remove

login
register
mail settings
Submitter Andreas Müller
Date Feb. 5, 2013, 10:18 p.m.
Message ID <1360102723-27891-5-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/44161/
State Not Applicable, archived
Headers show

Comments

Andreas Müller - Feb. 5, 2013, 10:18 p.m.
Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf. After
this is accepted patches to layers appending pointercal-xinput will be send.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../pointercal-xinput/pointercal.xinput            |    1 -
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   19 -------------------
 .../xinput-calibrator/xinput-calibrator_git.bb     |    3 +--
 3 files changed, 1 insertions(+), 22 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
Martin Jansa - Feb. 6, 2013, 2:48 p.m.
On Tue, Feb 05, 2013 at 11:18:42PM +0100, Andreas Müller wrote:
> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf. After

So the plan to replace pointercal-xinput in BSP layers
is to convert pointercal.xinput files to 99-<device>.conf files provided
by xserver-xf86-conf bbappend?

And do you have some script to convert them or do you convert them
manually?

Regards,

> this is accepted patches to layers appending pointercal-xinput will be send.
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../pointercal-xinput/pointercal.xinput            |    1 -
>  .../xinput-calibrator/pointercal-xinput_0.0.bb     |   19 -------------------
>  .../xinput-calibrator/xinput-calibrator_git.bb     |    3 +--
>  3 files changed, 1 insertions(+), 22 deletions(-)
>  delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
>  delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
> 
> diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
> deleted file mode 100644
> index 9633fc5..0000000
> --- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
> +++ /dev/null
> @@ -1 +0,0 @@
> -# replace with valid machine specific pointercal.xinput
> diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
> deleted file mode 100644
> index 9b68d54..0000000
> --- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -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-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> index 199ee34..8ef774b 100644
> --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f340
>  DEPENDS = "virtual/libx11 libxi"
>  
>  PV = "0.7.5+git${SRCPV}"
> -PR = "r3"
> +PR = "r4"
>  
>  inherit autotools
>  
> @@ -58,4 +58,3 @@ do_install_append() {
>  
>  FILES_${PN} += "${sysconfdir}/xdg/autostart ${systemd_unitdir}/system"
>  RDEPENDS_${PN} = "xterm"
> -RRECOMMENDS_${PN} = "pointercal-xinput"
> -- 
> 1.7.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Andreas Müller - Feb. 6, 2013, 3:12 p.m.
On Wed, Feb 6, 2013 at 3:48 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Feb 05, 2013 at 11:18:42PM +0100, Andreas Müller wrote:
>> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf. After
>
> So the plan to replace pointercal-xinput in BSP layers
> is to convert pointercal.xinput files to 99-<device>.conf files provided
> by xserver-xf86-conf bbappend?
I would have appended it to xinput-calibrator because that's where the
configuration files are used. I can put them also to xserver-xf86-conf
bbappend - have no strong opinion here.
>
> And do you have some script to convert them or do you convert them
> manually?
>
I wanted to convert them manually but a script is more reliable - will
do that next week.

Andreas
Martin Jansa - Feb. 6, 2013, 3:25 p.m.
On Wed, Feb 06, 2013 at 04:12:50PM +0100, Andreas Müller wrote:
> On Wed, Feb 6, 2013 at 3:48 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Tue, Feb 05, 2013 at 11:18:42PM +0100, Andreas Müller wrote:
> >> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf. After
> >
> > So the plan to replace pointercal-xinput in BSP layers
> > is to convert pointercal.xinput files to 99-<device>.conf files provided
> > by xserver-xf86-conf bbappend?
> I would have appended it to xinput-calibrator because that's where the
> configuration files are used. I can put them also to xserver-xf86-conf
> bbappend - have no strong opinion here.

xinput-calibrator does not need to be MACHINE_ARCH, that's why they were
in separate pointercal-xinput before.

xserver-xf86-config on other hand is usually MACHINE_ARCH so it would be
better to add them there.

Or create new recipe for them and RDEPEND it from xinput-calibrator...

> > And do you have some script to convert them or do you convert them
> > manually?
> >
> I wanted to convert them manually but a script is more reliable - will
> do that next week.
> 
> Andreas
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Andreas Müller - Feb. 6, 2013, 3:45 p.m.
On Wed, Feb 6, 2013 at 4:25 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Feb 06, 2013 at 04:12:50PM +0100, Andreas Müller wrote:
>> On Wed, Feb 6, 2013 at 3:48 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Tue, Feb 05, 2013 at 11:18:42PM +0100, Andreas Müller wrote:
>> >> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf. After
>> >
>> > So the plan to replace pointercal-xinput in BSP layers
>> > is to convert pointercal.xinput files to 99-<device>.conf files provided
>> > by xserver-xf86-conf bbappend?
>> I would have appended it to xinput-calibrator because that's where the
>> configuration files are used. I can put them also to xserver-xf86-conf
>> bbappend - have no strong opinion here.
>
> xinput-calibrator does not need to be MACHINE_ARCH, that's why they were
> in separate pointercal-xinput before.
>
> xserver-xf86-config on other hand is usually MACHINE_ARCH so it would be
> better to add them there.
>
> Or create new recipe for them and RDEPEND it from xinput-calibrator...
Or don't remove pointercal-xinput :)

Andreas
Koen Kooi - Feb. 7, 2013, 10:01 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 05-02-13 23:18, Andreas Müller schreef:
> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf.
> After this is accepted patches to layers appending pointercal-xinput will
> be send.

How does this work with board where you can plug in different touchscreen
(like beaglebone) or difference touchscreen controllers (beagleboard, olimex
allwinner boards, etc)?

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFRE3tvMkyGM64RGpERAiSbAJ9lhIi1jSmhhM9UIePDIzICyQlTLQCfWgyi
oh3uluQd0wpW/61WheXTrz4=
=FYL8
-----END PGP SIGNATURE-----
Andreas Müller - Feb. 8, 2013, 10:11 p.m.
On Thu, Feb 7, 2013 at 11:01 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 05-02-13 23:18, Andreas Müller schreef:
>> Calibration values are stored now in /etc/xorg.conf.d/99-<device>.conf.
>> After this is accepted patches to layers appending pointercal-xinput will
>> be send.
>
> How does this work with board where you can plug in different touchscreen
> (like beaglebone) or difference touchscreen controllers (beagleboard, olimex
> allwinner boards, etc)?
>
Each device gets an conf-file named by the name of the device. An
example file I took from my gumstix:

Section "InputClass"
	Identifier	"calibration"
	MatchProduct	"ADS7846 Touchscreen"
	Option	"Calibration"	"96 3935 3591 98"
	Option	"SwapAxes"	"0"
EndSection

For devices with different name it works fine. I have no solution yet
for connecting multiple touchscreen devices of same device name -
similar to your use-case connecting different touchscreens on same
controller. There a manual recalibration has to be started which now
stores the data persistent (if the operator has the right to write to
/etc/X11/xorg.conf.d).

Andreas

Patch

diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
deleted file mode 100644
index 9633fc5..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
+++ /dev/null
@@ -1 +0,0 @@ 
-# replace with valid machine specific pointercal.xinput
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
deleted file mode 100644
index 9b68d54..0000000
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@ 
-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-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 199ee34..8ef774b 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f340
 DEPENDS = "virtual/libx11 libxi"
 
 PV = "0.7.5+git${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -58,4 +58,3 @@  do_install_append() {
 
 FILES_${PN} += "${sysconfdir}/xdg/autostart ${systemd_unitdir}/system"
 RDEPENDS_${PN} = "xterm"
-RRECOMMENDS_${PN} = "pointercal-xinput"