[PATCH 1/8] fluidsynth: upgrade 2.1.3 -> 2.1.5

[PATCH 1/8] fluidsynth: upgrade 2.1.3 -> 2.1.5

[Andreas Müller]

fluidsynth 2.1.5:
* loading DLS may have failed in certain setup environments (#666)
* fix a build failure with GCC 4.8 (#661, thanks to @ffontaine)

fluidsynth 2.1.4:
* fix an uninitialized memory access possibly triggering an FPE trap
* fix several regressions introduced in 2.1.3:
    fluid_synth_start() failed for certain presets
    fix a NULL dereference in jack driver
    fix a stack-based overflow when creating the synth

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-multimedia/fluidsynth/fluidsynth.inc            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index fcc9df8c3..73c1d0db6 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
-SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "19a20eb8526465fdf940b740b13462d71e190a1a"
+SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x"
+SRCREV = "6776569abe9a885bcec14141692fa93c0568d51c"
 S = "${WORKDIR}/git"
-PV = "2.1.3"
+PV = "2.1.5"
 
 inherit cmake pkgconfig lib_package
-- 
2.26.2

[PATCH 2/8] hdf5: Shorten SUMMARY and move long text to DESCRIPTION

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb
index 9af2b6714..11285451a 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb
@@ -1,4 +1,5 @@
-SUMMARY = "Unique technology suite that makes possible the management of \
+SUMMARY = "Management suite for extremely large and complex data collections"
+DESCRIPTION = "Unique technology suite that makes possible the management of \
 extremely large and complex data collections"
 HOMEPAGE = "https://www.hdfgroup.org/"
 SECTION = "libs"
-- 
2.26.2

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

[Andreas Müller]

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)}"
 
 # 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

[PATCH 4/8] wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it

[Andreas Müller]

When I created wxwidgets recipe I had no test case for consumers of wxwidgets.
This changed now and it showed that wxwidgets is building fine but is
completely useless: It is a collection of libraries that are impossible to
find for other recipes.

To get rid wxwidgets now inherits binconfig: wxwidgets creates wx-config that
at least cmake relies upon. wx-config content had to be adjusted:

* As is it is a symlink to a useless file: Make it a file with usable contents
* To let wx-config report correct libraries a patch was added disabling cross
  magic not working here.
* Set full sysroot paths for includedir/libdir/bindir so that sstate can adjust
  them when creating recipe-sysroot for recipes depending on wxwidgets

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...able-cross-magic-it-does-not-work-fo.patch | 35 +++++++++++++++++++
 .../wxwidgets/wxwidgets_git.bb                | 25 +++++++++++--
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch

diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
new file mode 100644
index 000000000..b3b9e79c5
--- /dev/null
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
@@ -0,0 +1,35 @@
+From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 11 Oct 2020 22:16:55 +0200
+Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+E.g 'wx-config --libs' appends a '-Linux' to all libraries (e.g
+-lwx_gtk3u_xrc-3.1 is reported as -lwx_gtk3u_xrc-3.1-Linux) which is wrong and
+make projects depending on wxwidgets fail.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ wx-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wx-config.in b/wx-config.in
+index d132e3182f..d0d162e8a3 100755
+--- a/wx-config.in
++++ b/wx-config.in
+@@ -396,7 +396,7 @@ get_mask()
+ }
+ 
+ # Returns true if this script is for a cross compiled config.
+-is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
++is_cross()  { [ "xno" = "xyes" ]; }
+ 
+ 
+ # Determine the base directories we require.
+-- 
+2.26.2
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
index 95a6e8527..555399f74 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
@@ -10,7 +10,7 @@ LICENSE = "wxWidgets"
 LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6"
 
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)}
-inherit features_check lib_package
+inherit features_check lib_package binconfig
 
 # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake)
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}"
@@ -21,7 +21,10 @@ DEPENDS += " \
     tiff \
 "
 
-SRC_URI = "git://github.com/wxWidgets/wxWidgets.git"
+SRC_URI = " \
+    git://github.com/wxWidgets/wxWidgets.git \
+    file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
+"
 PV = "3.1.3"
 SRCREV= "8a40d23b27ed1c80b5a2ca9f7e8461df4fbc1a31"
 S = "${WORKDIR}/git"
@@ -67,6 +70,24 @@ 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"
 
+do_compile_append() {
+    # if not at re-compile
+    if [ -L ${B}/wx-config ]; then
+        # ${B}/wx-config is a symlink for build and not needed after compile
+        # So for our purposes do:
+        # 1. make a file out of wx-config so that binconfig.bbclass detects it
+        # 2. make sure we do not move the file used for compiling into sysroot
+        cp --remove-destination `readlink ${B}/wx-config | sed 's:inplace-::'` ${B}/wx-config
+    fi
+    # 3. Set full sysroot paths so sstate can translate them when setting
+    #    up wxwidgets's consumer sysroots
+    sed -i \
+        -e 's,^includedir=.*,includedir="${STAGING_INCDIR}",g' \
+        -e 's,^libdir=.*",libdir="${STAGING_LIBDIR}",g' \
+        -e 's,^bindir=.*",bindir="${STAGING_BINDIR}",g' \
+        ${B}/wx-config
+}
+
 do_install_append() {
     # do not ship bindir if empty
     rmdir --ignore-fail-on-non-empty ${D}${bindir}
-- 
2.26.2

[PATCH 5/8] wxwidgets: upgrade 3.1.3 -> 3.1.4

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
index 555399f74..26a9004fb 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
@@ -25,8 +25,8 @@ SRC_URI = " \
     git://github.com/wxWidgets/wxWidgets.git \
     file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
 "
-PV = "3.1.3"
-SRCREV= "8a40d23b27ed1c80b5a2ca9f7e8461df4fbc1a31"
+PV = "3.1.4"
+SRCREV= "6cdaedd42ba59331b3dc4ead50e0bac76ae14c19"
 S = "${WORKDIR}/git"
 
 # These can be either 'builtin' or 'sys' and builtin means cloned soures are
-- 
2.26.2

[PATCH 6/8] babl: upgrade 0.1.78 -> 0.1.82

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gimp/babl/{babl_0.1.78.bb => babl_0.1.82.bb}       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gimp/babl/{babl_0.1.78.bb => babl_0.1.82.bb} (80%)

diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb
similarity index 80%
rename from meta-gnome/recipes-gimp/babl/babl_0.1.78.bb
rename to meta-gnome/recipes-gimp/babl/babl_0.1.82.bb
index 173d5aa74..244b867fa 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb
@@ -15,7 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore "
 CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore "
 
 SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[md5sum] = "b1a85d1f3d710407164848708f1f49f1"
-SRC_URI[sha256sum] = "17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a"
+SRC_URI[sha256sum] = "c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5"
 
 BBCLASSEXTEND = "native"
-- 
2.26.2

[PATCH 7/8] gegl: upgrade 0.4.24 -> 0.4.26

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gimp/gegl/{gegl_0.4.24.bb => gegl_0.4.26.bb}       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gimp/gegl/{gegl_0.4.24.bb => gegl_0.4.26.bb} (93%)

diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb
similarity index 93%
rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb
rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb
index 77c30f7de..6ac1e6ca9 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb
@@ -26,8 +26,7 @@ SRC_URI = " \
     https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \
     file://0001-meson.build-Give-note-if-sdl2-was-found.patch \
 "
-SRC_URI[md5sum] = "3a8062add20effb6f92b4b614facbbd5"
-SRC_URI[sha256sum] = "7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a"
+SRC_URI[sha256sum] = "0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424"
 
 PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
 PACKAGECONFIG_class-native = "libpng librsvg"
-- 
2.26.2

[PATCH 8/8] gimp: upgrade 2.10.20 -> 2.10.22

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gimp/gimp/{gimp_2.10.20.bb => gimp_2.10.22.bb}     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.20.bb => gimp_2.10.22.bb} (92%)

diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
similarity index 92%
rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb
rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
index 2923e6b0c..aec1ebf7b 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
@@ -38,8 +38,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SHPV = "${@gnome_verdir("${PV}")}"
 
 SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2"
-SRC_URI[md5sum] = "7479a4e90b28628d2948e6612fe44049"
-SRC_URI[sha256sum] = "e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c"
+SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb"
 
 EXTRA_OECONF = "--disable-python \
                 --without-webkit \
-- 
2.26.2

Re: [oe] [PATCH 4/8] wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it

[Khem Raj]

On Tue, Oct 13, 2020 at 6:06 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> When I created wxwidgets recipe I had no test case for consumers of wxwidgets.
> This changed now and it showed that wxwidgets is building fine but is
> completely useless: It is a collection of libraries that are impossible to
> find for other recipes.
>
> To get rid wxwidgets now inherits binconfig: wxwidgets creates wx-config that
> at least cmake relies upon. wx-config content had to be adjusted:
>
> * As is it is a symlink to a useless file: Make it a file with usable contents
> * To let wx-config report correct libraries a patch was added disabling cross
>   magic not working here.
> * Set full sysroot paths for includedir/libdir/bindir so that sstate can adjust
>   them when creating recipe-sysroot for recipes depending on wxwidgets
>

is wx-config wrapping pkg-config? if so then perhaps it would be
better to make pkgconfig work here instead

> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  ...able-cross-magic-it-does-not-work-fo.patch | 35 +++++++++++++++++++
>  .../wxwidgets/wxwidgets_git.bb                | 25 +++++++++++--
>  2 files changed, 58 insertions(+), 2 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
>
> diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
> new file mode 100644
> index 000000000..b3b9e79c5
> --- /dev/null
> +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
> @@ -0,0 +1,35 @@
> +From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 11 Oct 2020 22:16:55 +0200
> +Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +E.g 'wx-config --libs' appends a '-Linux' to all libraries (e.g
> +-lwx_gtk3u_xrc-3.1 is reported as -lwx_gtk3u_xrc-3.1-Linux) which is wrong and
> +make projects depending on wxwidgets fail.
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + wx-config.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/wx-config.in b/wx-config.in
> +index d132e3182f..d0d162e8a3 100755
> +--- a/wx-config.in
> ++++ b/wx-config.in
> +@@ -396,7 +396,7 @@ get_mask()
> + }
> +
> + # Returns true if this script is for a cross compiled config.
> +-is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
> ++is_cross()  { [ "xno" = "xyes" ]; }
> +
> +
> + # Determine the base directories we require.
> +--
> +2.26.2
> +
> diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> index 95a6e8527..555399f74 100644
> --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
> @@ -10,7 +10,7 @@ LICENSE = "wxWidgets"
>  LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6"
>
>  inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)}
> -inherit features_check lib_package
> +inherit features_check lib_package binconfig
>
>  # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake)
>  REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}"
> @@ -21,7 +21,10 @@ DEPENDS += " \
>      tiff \
>  "
>
> -SRC_URI = "git://github.com/wxWidgets/wxWidgets.git"
> +SRC_URI = " \
> +    git://github.com/wxWidgets/wxWidgets.git \
> +    file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
> +"
>  PV = "3.1.3"
>  SRCREV= "8a40d23b27ed1c80b5a2ca9f7e8461df4fbc1a31"
>  S = "${WORKDIR}/git"
> @@ -67,6 +70,24 @@ 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"
>
> +do_compile_append() {
> +    # if not at re-compile
> +    if [ -L ${B}/wx-config ]; then
> +        # ${B}/wx-config is a symlink for build and not needed after compile
> +        # So for our purposes do:
> +        # 1. make a file out of wx-config so that binconfig.bbclass detects it
> +        # 2. make sure we do not move the file used for compiling into sysroot
> +        cp --remove-destination `readlink ${B}/wx-config | sed 's:inplace-::'` ${B}/wx-config
> +    fi
> +    # 3. Set full sysroot paths so sstate can translate them when setting
> +    #    up wxwidgets's consumer sysroots
> +    sed -i \
> +        -e 's,^includedir=.*,includedir="${STAGING_INCDIR}",g' \
> +        -e 's,^libdir=.*",libdir="${STAGING_LIBDIR}",g' \
> +        -e 's,^bindir=.*",bindir="${STAGING_BINDIR}",g' \
> +        ${B}/wx-config
> +}
> +
>  do_install_append() {
>      # do not ship bindir if empty
>      rmdir --ignore-fail-on-non-empty ${D}${bindir}
> --
> 2.26.2
>
>
> 
>

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

[Khem Raj]

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
>
>
> 
>

Re: [oe] [PATCH 4/8] wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it

[Andreas Müller]

On Wed, Oct 14, 2020 at 7:48 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Tue, Oct 13, 2020 at 6:06 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > When I created wxwidgets recipe I had no test case for consumers of wxwidgets.
> > This changed now and it showed that wxwidgets is building fine but is
> > completely useless: It is a collection of libraries that are impossible to
> > find for other recipes.
> >
> > To get rid wxwidgets now inherits binconfig: wxwidgets creates wx-config that
> > at least cmake relies upon. wx-config content had to be adjusted:
> >
> > * As is it is a symlink to a useless file: Make it a file with usable contents
> > * To let wx-config report correct libraries a patch was added disabling cross
> >   magic not working here.
> > * Set full sysroot paths for includedir/libdir/bindir so that sstate can adjust
> >   them when creating recipe-sysroot for recipes depending on wxwidgets
> >
>
> is wx-config wrapping pkg-config? if so then perhaps it would be
> better to make pkgconfig work here instead

Thought about creating a pkg-config either but:
* wx-config is a tailored script that reports way more than just standard flags
* cmake ships a module (and projects ship copies of this on their own)
that does magic stuff with wx-config.

Going that way is a minefield

Andreas

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

[Andreas Müller]

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

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

[Andreas Müller]

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

Re: [oe] [PATCH 4/8] wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it

[Khem Raj]

On Wed, Oct 14, 2020 at 1:19 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Wed, Oct 14, 2020 at 7:48 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Tue, Oct 13, 2020 at 6:06 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > >
> > > When I created wxwidgets recipe I had no test case for consumers of wxwidgets.
> > > This changed now and it showed that wxwidgets is building fine but is
> > > completely useless: It is a collection of libraries that are impossible to
> > > find for other recipes.
> > >
> > > To get rid wxwidgets now inherits binconfig: wxwidgets creates wx-config that
> > > at least cmake relies upon. wx-config content had to be adjusted:
> > >
> > > * As is it is a symlink to a useless file: Make it a file with usable contents
> > > * To let wx-config report correct libraries a patch was added disabling cross
> > >   magic not working here.
> > > * Set full sysroot paths for includedir/libdir/bindir so that sstate can adjust
> > >   them when creating recipe-sysroot for recipes depending on wxwidgets
> > >
> >
> > is wx-config wrapping pkg-config? if so then perhaps it would be
> > better to make pkgconfig work here instead
>
> Thought about creating a pkg-config either but:
> * wx-config is a tailored script that reports way more than just standard flags
> * cmake ships a module (and projects ship copies of this on their own)
> that does magic stuff with wx-config.
>
> Going that way is a minefield

OK thanks

>
> Andreas

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

[Khem Raj]

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