meta-openembedded: subtree update:2258c9a767..164a6030b0
Alejandro Hernandez Samaniego (1):
emacs: Fix packaging for emacs-minimal
Andreas Müller (8):
fluidsynth: upgrade 2.1.3 -> 2.1.5
hdf5: Shorten SUMMARY and move long text to DESCRIPTION
wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES
wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it
wxwidgets: upgrade 3.1.3 -> 3.1.4
babl: upgrade 0.1.78 -> 0.1.82
gegl: upgrade 0.4.24 -> 0.4.26
gimp: upgrade 2.10.20 -> 2.10.22
Andrej Valek (2):
nss: upgrade 3.56 -> 3.57
nspr: upgrade 4.26 -> 4.29
Chen Qi (2):
open-isns: use /run instead of /var/run in systemd service file
openhpi: use /run instead of /var/run in systemd service file
Daniel Ammann (2):
dhex: add homepage
pcsc-tools: add new package
Fagundes, Paulo (1):
vnstat: add recipe
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.14 -> 6.1.16
Gianluca Pacchiella (1):
Add missing dependencies for rsnapshot.
Khem Raj (5):
meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT
apitrace: Disable secuirty flags for clang
iscsi-initiator-utils: Silence a clang warning on 64bit systems
minifi-cpp: Do not use lld on riscv32
redis: Fix build with clang on riscv32
Leon Anavi (44):
python3-aiohttp: Upgrade 3.6.2 -> 3.6.3
python3-ujson: Upgrade 3.2.0 -> 4.0.1
python3-passlib: Upgrade 1.7.2 -> 1.7.4
python3-croniter: Upgrade 0.3.34 -> 0.3.35
python3-isort: Upgrade 5.5.4 -> 5.6.4
python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8
python3-yarl: Upgrade 1.6.0 -> 1.6.2
python3-sqlparse: Upgrade 0.3.1 -> 0.4.1
python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20
python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0
python3-markdown: Upgrade 3.3 -> 3.3.1
python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0
python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7
python3-luma-core: Upgrade 1.17.1 -> 1.17.2
python3-graphviz: Upgrade 0.14.1 -> 0.14.2
python3-yappi: Upgrade 1.2.5 -> 1.3.0
python3-iniconfig: Upgrade 1.0.1 -> 1.1.1
transmission: Upgrade 2.94 -> 3.00
python3-regex: Upgrade 2020.10.11 -> 2020.10.15
python3-colorama: Upgrade 0.4.3 -> 0.4.4
python3-zipp: Upgrade 3.3.0 -> 3.3.1
python3-pychromecast: Upgrade 7.5.0 -> 7.5.1
python3-semver: Upgrade 2.10.2 -> 2.13.0
python3-pydicti: Upgrade 1.1.3 -> 1.1.4
python3-humanize: Upgrade 3.0.1 -> 3.1.0
python3-dominate: Upgrade 2.5.2 -> 2.6.0
python3-urllib3: Upgrade 1.25.10 -> 1.25.11
python3-bitarray: Upgrade 1.5.3 -> 1.6.0
python3-markdown: Upgrade 3.3.1 -> 3.3.2
python3-pymisp: Upgrade 2.4.131 -> 2.4.133
python3-typeguard: Upgrade 2.9.1 -> 2.10.0
python3-traitlets: Upgrade 5.0.4 -> 5.0.5
python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1
python3-lxml: Upgrade 4.5.2 -> 4.6.1
python3-regex: Upgrade 2020.10.15 -> 2020.10.23
python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5
python3-cryptography: Upgrade 3.1.1 -> 3.2
python3-psutil: Upgrade 5.7.2 -> 5.7.3
python3-pyparted: Upgrade 3.11.6 -> 3.11.7
python3-tqdm: Upgrade 4.50.2 -> 4.51.0
python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1
python3-luma-core: Upgrade 1.17.2 -> 1.17.3
python3-zipp: Upgrade 3.3.1 -> 3.4.0
python3-aiohttp: Upgrade 3.6.3 -> 3.7.1
Luca Boccassi (2):
Add recipe for fsverity-utils
Add new recipe for squashfs-tools-ng
Mario Schuknecht (1):
wireguard-tools: Fix systemd service installation
Martin Jansa (3):
packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST
python3-colorama: add native and nativesdk to BBCLASSEXTEND
mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled
Michael Tretter (1):
apitrace: add new recipe
Mingli Yu (1):
mariadb: Upgrade to 10.5.6
Pascal Bach (1):
fmt: make available as native and nativesdk
Pierre-Jean Texier (3):
c-periphery: upgrade 2.2.1 -> 2.2.4
c-periphery: fix typo in SUMMARY
stunnel: upgrade 5.56 -> 5.57
Qi.Chen@windriver.com (4):
php: use /run instead /var/run in systemd service file
lmsensors: use /run instead of /var/run for systemd service
cyrus-sasl: use /run instead of /var/run for systemd service file
freediameter: use /run instead of /var/run in systemd service file
Ross Burton (2):
mpv: fetch waf in do_fetch
glmark2: no need to patch waf
Sakib Sajal (1):
python3-prettytable: add python3-wcwidth to RDEPENDS
Siming Yuan (1):
python3-paramiko: fixing runtime dependencies
Taisei Nakano (1):
anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM
Ulrich Ölmann (1):
usb-modeswitch, usb-modeswitch-data: fix usrmerge
Yi Zhao (2):
samba: upgrade 4.10.17 -> 4.10.18
networkmanager: remove PACKAGECONFIG[dhclient]
Zang Ruochen (13):
firewalld: upgrade 0.9.0 -> 0.9.1
mtr: upgrade 0.93 -> 0.94
wireshark: upgrade 3.2.6 -> 3.2.7
hwdata: upgrade 0.339 -> 0.340
libmbim: upgrade 1.24.2 -> 1.24.4
linuxptp: upgrade 3.0 -> 3.1
memtester: upgrade 4.4.0 -> 4.5.0
paho-mqtt-c: upgrade 1.3.5 -> 1.3.6
mm-common: upgrade 1.0.1 -> 1.0.2
poppler: upgrade 20.09.0 -> 20.10.0
spdlog: upgrade 1.8.0 -> 1.8.1
libcgi-perl: upgrade 4.50 -> 4.51
libcurses-perl: upgrade 1.36 -> 1.37
zangrc (8):
gphoto2: upgrade 2.5.23 -> 2.5.26
libgphoto2: upgrade 2.5.25 -> 2.5.26
libmtp: upgrade 1.1.17 -> 1.1.18
libp11: upgrade 0.4.10 -> 0.4.11
libpwquality: upgrade 1.4.2 -> 1.4.4
libqmi: upgrade 1.26.4 -> 1.26.6
nano: upgrade 5.2 -> 5.3
protobuf: upgrade 3.13.0 -> 3.13.0.1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486
diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
index 1d3c972..26a9004 100644
--- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb
@@ -10,7 +10,7 @@
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,9 +21,12 @@
tiff \
"
-SRC_URI = "git://github.com/wxWidgets/wxWidgets.git"
-PV = "3.1.3"
-SRCREV= "8a40d23b27ed1c80b5a2ca9f7e8461df4fbc1a31"
+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.4"
+SRCREV= "6cdaedd42ba59331b3dc4ead50e0bac76ae14c19"
S = "${WORKDIR}/git"
# These can be either 'builtin' or 'sys' and builtin means cloned soures are
@@ -39,10 +42,10 @@
-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,9 +66,28 @@
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"
+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}