On Thu, Mar 12, 2015 at 09:58:38AM -0400, Stiffler, Jacob wrote: > I'm not sure of the history, it just seemed more complete to only depend on > wayland if wayland is a feature.
Yeah, it makes sense logically, but unfortunately the way GFX SDK is built it will break w/o wayland libs, I'm afraid. > -----Original Message----- > From: Dmytriyenko, Denys > Sent: Thursday, March 12, 2015 9:56 AM > To: Stiffler, Jacob > Cc: [email protected] > Subject: Re: [meta-arago] [PATCH 2/4] qtbase: Use DISTRO_FEATURES to set > appropriate qpa. > > On Thu, Mar 12, 2015 at 08:55:55AM -0400, Jacob Stiffler wrote: > > * If wayland is in DISTRO_FEATURES, then configure '-qpa wayland' > > * Otherwise configure '-qpa eglfs' > > > > Signed-off-by: Jacob Stiffler <[email protected]> > > --- > > meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh | 1 - > > .../recipes-qt/qt5/qtbase_5.4.1.bbappend | 9 ++++++--- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh > > b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh > > index 1e8c196..f888d50 100644 > > --- a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh > > +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh > > @@ -2,4 +2,3 @@ > > > > ### QT Environment Variables ### > > export QT_QPA_GENERIC_PLUGINS=Auto > > -export QT_QPA_PLATFORM=wayland > > diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend > > b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend > > index a466581..5a00800 100644 > > --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend > > +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend > > @@ -1,13 +1,16 @@ > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > > > GLES_EXTRA_DEPS = "" > > -GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland" > > +GLES_EXTRA_DEPS_omap-a15 = " \ > > + libdrm \ > > + ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} > > +\ " > > I meant to comment to the previous revision about this part above ^^^ I don't > think it will work (not that it will be tested) - the way OMAP5 GFX is built, > it has hardcoded dependency on wayland libs, hence it's added above... > That said, I'm not sure you can get eglfs on OMAP5 platforms working cleanly > w/o any wayland libs. But aren't you only doing it for AM3/4 anyway? > > > > PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl > > ${GLES_EXTRA_DEPS}" > > > > -PR_append = "-arago3" > > +PR_append = "-arago4" > > > > -QT_CONFIG_FLAGS += "-qpa wayland" > > +QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland', > > 'wayland', 'eglfs', d)}" > > > > SRC_URI += "file://qt_env.sh" > > > > -- > > 1.7.9.5 > > > > _______________________________________________ > > meta-arago mailing list > > [email protected] > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
