The config file name is based on which package config among gtk, qt and
no_gui is enabled. Fix it in do_install script.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upgrade wxwidgets from 3.1.5 to 3.2.1.
* rename respect-DESTDIR-when-create-link.patch that DESTDIR has
considerred by upstream and only create symlink with relative path
* rebase patches to replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
* split .so files to -dev package to fix [dev-so] qa error
* fix host contamination
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Enable option wxUSE_PRIVATE_FONTS of wxwidgets if build with gtk. It
allows application to use the font from the given file even if it is
not globally installed on the system.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Building with wayland and opengl in DISTRO_FEATURES without x11 as
well was giving the error:
wxwidgets: PACKAGECONFIG[no_gui] Conflict package config 'opengl' set in PACKAGECONFIG.
Upon some investigation, it looks like wxwidgets now supports building
against Gtk's Wayland support, so we can also enable it if wayland is
in DISTRO_FEATURES. For OpenGL, however, wxwidgets seems to have a
dependency on libglu, so the DISTRO_FEATURES check has been changed
to only enable it by default if both x11 and opengl are configured.
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
It sets 'libdir' with path element 'lib' directly which is not suitable
for multilib. Add an option '--baselib' for wx-config to support
multilib when cross compile.
And set EGREP for wx-config to avoid host contamination.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Fixed when x11 is not in DISTRO_FEATURES:
$ bitbake wxwidgets
CMake Error at build/cmake/functions.cmake:542 (add_library):
Cannot find source file:
/path/to/core2-64-wrs-linux/wxwidgets/3.1.5-r0/git/src/expat/expat/lib/xmlparse.c
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The PACKAGECONFIG depends on DISTRO_FEATURES, not DISTRO_FEATURES depends on
PACKAGECONFIG. And the REQUIRED_DISTRO_FEATURES is not needed since it can work
with gtk or x11.
Fixed when x11 is not in DISTRO_FEATURES:
$ bitbake wxwidgets
ERROR: Nothing PROVIDES 'wxwidgets'
wxwidgets was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* correct LICENSE name which should be 'WXWindows' according to
https://www.wxwidgets.org/about/licence/
remove the 'wxWidgets' license file and use the one in oe-core
* native wx-conf from wxwidgets is required by python3-wxgtk4, so extend
wxwidgets-native and remove packageconfig opengl for -native.
* add patch to correct library names
* add packageconfig 'curl'
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
There are errors during do install. So link files 'wx-config' and 'wxrc'
are not created, and rename failed either:
| CMake Error: failed to create symbolic link '/usr/bin/wx-config': Permission denied
| Error renaming from "/usr/bin/wxrc" to "/usr/bin/wxrc-3.1": No such file or directory
| CMake Error: failed to create symbolic link '/usr/bin/wxrc': Permission denied
Respect variable 'DESTDIR' to make it work as expect.
And package ${libdir}/wx/config/gtk3-unicode-3.1 to ${PN}-dev that
/usr/bin/wx-config from ${PN}-dev links to it.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
wxWidgets hardcodes libdir with 'lib' and does not support multilib
which will change it. Respect variable wxPLATFORM_LIB_DIR to support
libdir be configurable.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This patch updates SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls as generated by the conversion script
in OE-Core.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* need it for 0.a.d and audacity
* did extensive testing with PACKAGECONFIG combinations (exception: mspack -
libmspack is in meta-security)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
