[meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[Maxin B. John]

make tslib dependency optional

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 recipes-qt4/qt4/qt4-embedded.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-qt4/qt4/qt4-embedded.inc b/recipes-qt4/qt4/qt4-embedded.inc
index 3f40b82..6e7cd86 100644
--- a/recipes-qt4/qt4/qt4-embedded.inc
+++ b/recipes-qt4/qt4/qt4-embedded.inc
@@ -2,7 +2,9 @@ SUMMARY = "Cross-platform UI toolkit and application framework (framebuffer vers
 DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded (framebuffer) version."
 SECTION = "libs"
 HOMEPAGE = "http://qt-project.org/"
-DEPENDS += "tslib"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[tslib] = "QT_EMBEDDED_EXTRA_FLAGS_append ='  -plugin-mouse-tslib', , tslib"
 
 QT4EDEPENDS = ""
 QT_BASE_LIB  ?= "libqt-embedded"
@@ -18,7 +20,7 @@ QT_EMBEDDED_FLAGS ?= " \
 "
 QT_EMBEDDED_EXTRA_FLAGS ?= " \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
+    -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
     -qt-kbd-tty -qt-kbd-linuxinput \
 "
 QT_EMBEDDED_KEYPAD_FLAGS ?= " \
-- 
2.4.0

[meta-qt4][PATCH 2/2] packagegroup-core-qt4e: updates based on tslib dependency

[Maxin B. John]

Since tslib dependency is optional, update the location of
qt4-embedded-plugin-mousedriver-tslib which depends on it.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 recipes-qt4/packagegroups/packagegroup-core-qt4e.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-qt4/packagegroups/packagegroup-core-qt4e.bb b/recipes-qt4/packagegroups/packagegroup-core-qt4e.bb
index eb5fa1f..588e99b 100644
--- a/recipes-qt4/packagegroups/packagegroup-core-qt4e.bb
+++ b/recipes-qt4/packagegroups/packagegroup-core-qt4e.bb
@@ -7,7 +7,7 @@ COMPATIBLE_HOST_mips64 = "null"
 
 inherit packagegroup
 
-TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests qt4-embedded-plugin-mousedriver-tslib", "",d)}'
 
 RDEPENDS_${PN} = " \
 	qt4-embedded \
@@ -35,7 +35,6 @@ RDEPENDS_${PN} = " \
 	qt4-embedded-plugin-imageformat-mng \
 	qt4-embedded-plugin-imageformat-svg \
 	qt4-embedded-plugin-imageformat-tiff \
-	qt4-embedded-plugin-mousedriver-tslib \
 	qt4-embedded-plugin-script-dbus \
 	qt4-embedded-plugin-sqldriver-sqlite \
 	${TOUCH} \
-- 
2.4.0

Re: [meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1733 bytes --]

On Fri, Aug 19, 2016 at 11:01:57AM +0300, Maxin B. John wrote:
> make tslib dependency optional
> 
> Signed-off-by: Maxin B. John <maxin.john@intel.com>
> ---
>  recipes-qt4/qt4/qt4-embedded.inc | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-qt4/qt4/qt4-embedded.inc b/recipes-qt4/qt4/qt4-embedded.inc
> index 3f40b82..6e7cd86 100644
> --- a/recipes-qt4/qt4/qt4-embedded.inc
> +++ b/recipes-qt4/qt4/qt4-embedded.inc
> @@ -2,7 +2,9 @@ SUMMARY = "Cross-platform UI toolkit and application framework (framebuffer vers
>  DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded (framebuffer) version."
>  SECTION = "libs"
>  HOMEPAGE = "http://qt-project.org/"
> -DEPENDS += "tslib"
> +
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[tslib] = "QT_EMBEDDED_EXTRA_FLAGS_append ='  -plugin-mouse-tslib', , tslib"

Does this really work? Why don't you append PACKAGECONFIG_CONFARGS
variable to QT_EMBEDDED_EXTRA_FLAGS and leave only -plugin-mouse-tslib
in PACKAGECONFIG?

>  QT4EDEPENDS = ""
>  QT_BASE_LIB  ?= "libqt-embedded"
> @@ -18,7 +20,7 @@ QT_EMBEDDED_FLAGS ?= " \
>  "
>  QT_EMBEDDED_EXTRA_FLAGS ?= " \
>      -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
> -    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
> +    -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
>      -qt-kbd-tty -qt-kbd-linuxinput \
>  "
>  QT_EMBEDDED_KEYPAD_FLAGS ?= " \
> -- 
> 2.4.0
> 
> -- 
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[Maxin B. John]

Hi Martin,

On Fri, Aug 19, 2016 at 10:13:31AM +0200, Martin Jansa wrote:
> On Fri, Aug 19, 2016 at 11:01:57AM +0300, Maxin B. John wrote:
> > make tslib dependency optional
> > 
> > Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > ---
> >  recipes-qt4/qt4/qt4-embedded.inc | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/recipes-qt4/qt4/qt4-embedded.inc b/recipes-qt4/qt4/qt4-embedded.inc
> > index 3f40b82..6e7cd86 100644
> > --- a/recipes-qt4/qt4/qt4-embedded.inc
> > +++ b/recipes-qt4/qt4/qt4-embedded.inc
> > @@ -2,7 +2,9 @@ SUMMARY = "Cross-platform UI toolkit and application framework (framebuffer vers
> >  DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded (framebuffer) version."
> >  SECTION = "libs"
> >  HOMEPAGE = "http://qt-project.org/"
> > -DEPENDS += "tslib"
> > +
> > +PACKAGECONFIG ??= ""
> > +PACKAGECONFIG[tslib] = "QT_EMBEDDED_EXTRA_FLAGS_append ='  -plugin-mouse-tslib', , tslib"
> 
> Does this really work? 

Yes, it was tested before.   

> Why don't you append PACKAGECONFIG_CONFARGS
> variable to QT_EMBEDDED_EXTRA_FLAGS and leave only -plugin-mouse-tslib
> in PACKAGECONFIG?

Your suggestion looks better and will try to update it based on that, Thanks.
(A quick grep in meta-qt4 for PACKAGECONFIG_CONFARGS returned zero results)

> >  QT4EDEPENDS = ""
> >  QT_BASE_LIB  ?= "libqt-embedded"
> > @@ -18,7 +20,7 @@ QT_EMBEDDED_FLAGS ?= " \
> >  "
> >  QT_EMBEDDED_EXTRA_FLAGS ?= " \
> >      -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
> > -    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
> > +    -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
> >      -qt-kbd-tty -qt-kbd-linuxinput \
> >  "
> >  QT_EMBEDDED_KEYPAD_FLAGS ?= " \
> > -- 
> > 2.4.0

Best Regards,
Maxin

Re: [meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

On 19 August 2016 at 09:42, Maxin B. John <maxin.john@intel.com> wrote:

> (A quick grep in meta-qt4 for PACKAGECONFIG_CONFARGS returned zero results)
>

FWIW it's a relatively new feature: when PACKAGECONFIG is evaluated it
writes the enabled/disabled values to PACKAGECONFIG_CONFARGS, which classes
can then use to set the relevant variable.  For now it also sets
EXTRA_OECONF but that was meant to be changed now that we're unfrozen.

Martin, would you be able to write and test the change to remove
EXTRA_OECONF from the PACKAGECONFIG handling?

Ross

[-- Attachment #2: Type: text/html, Size: 1042 bytes --]

Re: [meta-qt4][PATCH 1/2] qt4-embedded.inc: provide PACKAGECONFIG for tslib

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]

On Mon, Aug 22, 2016 at 09:37:56PM +0100, Burton, Ross wrote:
> On 19 August 2016 at 09:42, Maxin B. John <maxin.john@intel.com> wrote:
> 
> > (A quick grep in meta-qt4 for PACKAGECONFIG_CONFARGS returned zero results)
> >
> 
> FWIW it's a relatively new feature: when PACKAGECONFIG is evaluated it
> writes the enabled/disabled values to PACKAGECONFIG_CONFARGS, which classes
> can then use to set the relevant variable.  For now it also sets
> EXTRA_OECONF but that was meant to be changed now that we're unfrozen.
> 
> Martin, would you be able to write and test the change to remove
> EXTRA_OECONF from the PACKAGECONFIG handling?

I've prepared such change and will include it in next world build to see
how many things still abuse EXTRA_OECONF (hopefully buildhistory will
catch at least some differences once the options are gone from the
build).

Unfortunately the world status isn't so great now, so many issues might
be hidden.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

[PATCH] base, autotools: Append PACKAGECONFIG_CONFARGS to EXTRA_OECONF only in autotools.bbclass

[Martin Jansa]

* recipes which don't inherit autotools or cmake bbclass and want to
  use the configure options from PACKAGECONFIG need to handle
  PACKAGECONFIG_CONFARGS themselves.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/autotools.bbclass | 2 ++
 meta/classes/base.bbclass      | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 076899c..47a0190 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -131,6 +131,8 @@ autotools_postconfigure(){
 
 EXTRACONFFUNCS ??= ""
 
+EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
+
 do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
 do_configure[postfuncs] += "autotools_postconfigure"
 
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 79edfe5..a31a53f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -431,12 +431,6 @@ python () {
         appendVar('RDEPENDS_${PN}', extrardeps)
         appendVar('PACKAGECONFIG_CONFARGS', extraconf)
 
-        # TODO: once all recipes/classes abusing EXTRA_OECONF
-        # to get PACKAGECONFIG options are fixed to use PACKAGECONFIG_CONFARGS
-        # move this appendVar to autotools.bbclass.
-        if not bb.data.inherits_class('cmake', d):
-            appendVar('EXTRA_OECONF', extraconf)
-
     pn = d.getVar('PN', True)
     license = d.getVar('LICENSE', True)
     if license == "INVALID":
-- 
2.9.2