Patchwork [meta-qt5] qtbase: Add libxi to depends.

login
register
mail settings
Submitter Søren Holm
Date March 19, 2014, 1:44 p.m.
Message ID <1395236677-28379-1-git-send-email-sgh@sgh.dk>
Download mbox | patch
Permalink /patch/68875/
State Changes Requested, archived
Headers show

Comments

Søren Holm - March 19, 2014, 1:44 p.m.
Not having so gives errors like this when configuring qtbase

XInput2 auto-detection... ()
compiling /home/teamcitybuildagent/work/33644ecacd0fdba5/build/tmp/work/i586-poky-linux/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/config.tests/x11/xinput2/xinput2.cpp
/home/teamcitybuildagent/work/33644ecacd0fdba5/build/tmp/work/i586-poky-linux/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/config.tests/x11/xinput2/xinput2.cpp:43:36: fatal error: X11/extensions/XInput2.h: No such file or directory
                                   ^
compilation terminated.
make: *** [xinput2.o] Error 1
XInput2 disabled.
XInput2 support cannot be enabled due to functionality tests!
Turn on verbose messaging (-v) to /home/teamcitybuildagent/work/33644ecacd0fdba5/build/tmp/work/i586-poky-linux/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/configure to see the final report.
If you believe this message is in error you may use the continue
switch (-continue) to /home/teamcitybuildagent/work/33644ecacd0fdba5/build/tmp/work/i586-poky-linux/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/configure to continue.
---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Søren Holm - March 19, 2014, 1:45 p.m.
I'd like this to go into dora if possible.

Sorry for the double posts :)
Jacob Kroon - March 19, 2014, 1:56 p.m.
Maybe do something this instead ? This is only necessary for X11 right ?

-DEPENDS += "qtbase-native"
+DEPENDS += " \
+    qtbase-native \
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
+"

/Jacob


On Wed, Mar 19, 2014 at 2:45 PM, Søren Holm <sgh@sgh.dk> wrote:

> I'd like this to go into dora if possible.
>
> Sorry for the double posts :)
>
> --
> Søren Holm
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Martin Jansa - March 19, 2014, 2:15 p.m.
On Wed, Mar 19, 2014 at 02:56:18PM +0100, Jacob Kroon wrote:
> Maybe do something this instead ? This is only necessary for X11 right ?
> 
> -DEPENDS += "qtbase-native"
> +DEPENDS += " \
> +    qtbase-native \
> +    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
> +"
> 
> /Jacob

I think it belongs to
PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"

> On Wed, Mar 19, 2014 at 2:45 PM, Søren Holm <sgh@sgh.dk> wrote:
> 
> > I'd like this to go into dora if possible.
> >
> > Sorry for the double posts :)
> >
> > --
> > Søren Holm
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> 
> 
> 
> -- 
>   -- Jacob
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Søren Holm - March 19, 2014, 5:02 p.m.
yes problably. I did not investigate the whole structure that thorough 
apparently.

Could that change get into dora?

Onsdag den 19. marts 2014 15:15:01 skrev Martin Jansa:
> On Wed, Mar 19, 2014 at 02:56:18PM +0100, Jacob Kroon wrote:
> > Maybe do something this instead ? This is only necessary for X11 right ?
> > 
> > -DEPENDS += "qtbase-native"
> > +DEPENDS += " \
> > +    qtbase-native \
> > +    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
> > +"
> > 
> > /Jacob
> 
> I think it belongs to
> PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
>
Martin Jansa - March 19, 2014, 5:40 p.m.
On Wed, Mar 19, 2014 at 06:02:57PM +0100, Søren Holm wrote:
> 
> yes problably. I did not investigate the whole structure that thorough 
> apparently.
> 
> Could that change get into dora?

Yes, but first it needs to go to master.

> Onsdag den 19. marts 2014 15:15:01 skrev Martin Jansa:
> > On Wed, Mar 19, 2014 at 02:56:18PM +0100, Jacob Kroon wrote:
> > > Maybe do something this instead ? This is only necessary for X11 right ?
> > > 
> > > -DEPENDS += "qtbase-native"
> > > +DEPENDS += " \
> > > +    qtbase-native \
> > > +    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
> > > +"
> > > 
> > > /Jacob
> > 
> > I think it belongs to
> > PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
> > 
> -- 
> Søren Holm
Søren Holm - April 23, 2014, 7 a.m.
Hi MArtin

This fix is not in master yet. Is it lost between two chairs ?

Onsdag den 19. marts 2014 18:40:24 skrev Martin Jansa:
> On Wed, Mar 19, 2014 at 06:02:57PM +0100, Søren Holm wrote:
> > yes problably. I did not investigate the whole structure that thorough
> > apparently.
> > 
> > Could that change get into dora?
> 
> Yes, but first it needs to go to master.
> 
> > Onsdag den 19. marts 2014 15:15:01 skrev Martin Jansa:
> > > On Wed, Mar 19, 2014 at 02:56:18PM +0100, Jacob Kroon wrote:
> > > > Maybe do something this instead ? This is only necessary for X11 right
> > > > ?
> > > > 
> > > > -DEPENDS += "qtbase-native"
> > > > +DEPENDS += " \
> > > > +    qtbase-native \
> > > > +    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
> > > > +"
> > > > 
> > > > /Jacob
> > > 
> > > I think it belongs to
> > > PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
Jacob Kroon - April 23, 2014, 7:28 a.m.
Hi Søren,

On Wed, Apr 23, 2014 at 9:00 AM, Søren Holm <sgh@sgh.dk> wrote:

> Hi MArtin
>
> This fix is not in master yet. Is it lost between two chairs ?
>
> Onsdag den 19. marts 2014 18:40:24 skrev Martin Jansa:
> > On Wed, Mar 19, 2014 at 06:02:57PM +0100, Søren Holm wrote:
> > > yes problably. I did not investigate the whole structure that thorough
> > > apparently.
> > >
> > > Could that change get into dora?
> >
> > Yes, but first it needs to go to master.
> >
> > > Onsdag den 19. marts 2014 15:15:01 skrev Martin Jansa:
> > > > On Wed, Mar 19, 2014 at 02:56:18PM +0100, Jacob Kroon wrote:
> > > > > Maybe do something this instead ? This is only necessary for X11
> right
> > > > > ?
> > > > >
> > > > > -DEPENDS += "qtbase-native"
> > > > > +DEPENDS += " \
> > > > > +    qtbase-native \
> > > > > +    ${@base_contains('DISTRO_FEATURES', 'x11', 'libxi', '', d)} \
> > > > > +"
> > > > >
> > > > > /Jacob
> > > >
> > > > I think it belongs to
> > > > PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
>
>
Please test the solution that Martin proposed, and if everything looks
good, submit a patch using the instructions found in meta-qt5/README
and http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded.

/Jacob

Patch

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index eb22e40..3888a0a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -24,7 +24,7 @@  SRC_URI += " \
     file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
 "
 
-DEPENDS += "qtbase-native"
+DEPENDS += "qtbase-native libxi"
 
 # for syncqt
 RDEPENDS_${PN}-tools += "perl"