[3/8] wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES

Submitted by Andreas Müller on Oct. 14, 2020, 1:06 a.m. | Patch ID: 177209

Details

Message ID 20201014010617.1086948-3-schnitzeltony@gmail.com
State Accepted
Commit 0488766d589dd634bc409e0e6df354d430bc9659
Headers show

Commit Message

Andreas Müller Oct. 14, 2020, 1:06 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
index 1d3c972da..95a6e8527 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
@@ -39,10 +39,10 @@  EXTRA_OECMAKE_append_libc-musl = " \
     -DHAVE_LOCALE_T=OFF \
 "
 
-PACKAGECONFIG ?= "gtk"
+PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 
 # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt'
-PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk"
+PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk opengl"
 PACKAGECONFIG[gtk] = "-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_GUI=ON,,gtk+3,,,no_gui qt"
 PACKAGECONFIG[qt] = "-DwxBUILD_TOOLKIT=qt  -DwxUSE_GUI=ON,,qtbase,,,no_gui gtk"
 python () {
@@ -63,6 +63,7 @@  PACKAGECONFIG[gstreamer] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF,gstreamer
 PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libsecret,,,no_gui"
 PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz"
 PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack"
+PACKAGECONFIG[opengl] = ",,libglu"
 PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2"
 PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui"
 

Comments

Khem Raj Oct. 14, 2020, 5:50 a.m.
On Tue, Oct 13, 2020 at 6:06 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> index 1d3c972da..95a6e8527 100644
> --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> @@ -39,10 +39,10 @@ EXTRA_OECMAKE_append_libc-musl = " \
>      -DHAVE_LOCALE_T=OFF \
>  "
>
> -PACKAGECONFIG ?= "gtk"
> +PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"

libglu also needs X11, so checking for opengl won't be enough

>
>  # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt'
> -PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk"
> +PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk opengl"
>  PACKAGECONFIG[gtk] = "-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_GUI=ON,,gtk+3,,,no_gui qt"
>  PACKAGECONFIG[qt] = "-DwxBUILD_TOOLKIT=qt  -DwxUSE_GUI=ON,,qtbase,,,no_gui gtk"
>  python () {
> @@ -63,6 +63,7 @@ PACKAGECONFIG[gstreamer] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF,gstreamer
>  PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libsecret,,,no_gui"
>  PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz"
>  PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack"
> +PACKAGECONFIG[opengl] = ",,libglu"
>  PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2"
>  PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui"
>
> --
> 2.26.2
>
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87504): https://lists.openembedded.org/g/openembedded-devel/message/87504
Mute This Topic: https://lists.openembedded.org/mt/77496590/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Andreas Müller Oct. 14, 2020, 8:52 a.m.
On Wed, Oct 14, 2020 at 7:50 AM Khem Raj <raj.khem@gmail.com> wrote:
> > -PACKAGECONFIG ?= "gtk"
> > +PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
>
> libglu also needs X11, so checking for opengl won't be enough
It's not that simple:

* wxwidgets has three PACKAGECONFIGs for the backend: no_gui/gtk/qt
and users should (there is a note in the recipe) select exactly one of
them.
* For qt and gtk x11 is added to REQUIRED_DISTRO_FEATURES
* PACKAGECONFIG no_gui (the only non x11) is marked as conflicting with opengl

=> To select opengl successfully, x11 must be in DISTRO_FEATURES. Hope
that's good enough

Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87514): https://lists.openembedded.org/g/openembedded-devel/message/87514
Mute This Topic: https://lists.openembedded.org/mt/77496590/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Andreas Müller Oct. 14, 2020, 8:58 a.m.
On Wed, Oct 14, 2020 at 10:52 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Wed, Oct 14, 2020 at 7:50 AM Khem Raj <raj.khem@gmail.com> wrote:
> > > -PACKAGECONFIG ?= "gtk"
> > > +PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
> >
> > libglu also needs X11, so checking for opengl won't be enough
> It's not that simple:
>
> * wxwidgets has three PACKAGECONFIGs for the backend: no_gui/gtk/qt
> and users should (there is a note in the recipe) select exactly one of
> them.
Forgot that I did a python check that one of no_gui/gtk/qt is selected.

Andreas
> * For qt and gtk x11 is added to REQUIRED_DISTRO_FEATURES
> * PACKAGECONFIG no_gui (the only non x11) is marked as conflicting with opengl
>
> => To select opengl successfully, x11 must be in DISTRO_FEATURES. Hope
> that's good enough
>
> Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87515): https://lists.openembedded.org/g/openembedded-devel/message/87515
Mute This Topic: https://lists.openembedded.org/mt/77496590/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Oct. 14, 2020, 3:34 p.m.
On Wed, Oct 14, 2020 at 1:52 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Wed, Oct 14, 2020 at 7:50 AM Khem Raj <raj.khem@gmail.com> wrote:
> > > -PACKAGECONFIG ?= "gtk"
> > > +PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
> >
> > libglu also needs X11, so checking for opengl won't be enough
> It's not that simple:
>
> * wxwidgets has three PACKAGECONFIGs for the backend: no_gui/gtk/qt
> and users should (there is a note in the recipe) select exactly one of
> them.
> * For qt and gtk x11 is added to REQUIRED_DISTRO_FEATURES
> * PACKAGECONFIG no_gui (the only non x11) is marked as conflicting with opengl
>
> => To select opengl successfully, x11 must be in DISTRO_FEATURES. Hope
> that's good enough

right thanks for explaining it here.

>
> Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87525): https://lists.openembedded.org/g/openembedded-devel/message/87525
Mute This Topic: https://lists.openembedded.org/mt/77496590/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-