summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-04-13 17:07:35 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-04-14 02:10:00 +0300
commit58776373dfbbda0388940c41752c07c18b4f15cd (patch)
treec8a3e0ccd43548d6df30f960de94404009a2baf5 /meta-openembedded/meta-oe/recipes-extended
parentdc43764abca8281445f5d50c2c44cd85b56cc4af (diff)
downloadopenbmc-58776373dfbbda0388940c41752c07c18b4f15cd.tar.xz
subtree updates
meta-raspberrypi: cfbb192e5c..83f5577d8d: AJ Bagwell (1): linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR poky: ed98f1a1ae..30b38d9cb9: Alexander Kanavin (1): connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific Chen Qi (1): spirv-tools: fix to use sdk-1.3.204 branch Kevin Hao (1): kernel.bbclass: Fix the do_strip() malfunction Khem Raj (2): libarchive: Upgrade to 3.6.1 musl: Move to 1.2.3 release tag Martin Jansa (1): license_image.bbclass: close package.manifest file Ralph Siemsen (2): xz: fix CVE-2022-1271 gzip: upgrade 1.11 -> 1.12 Richard Purdie (2): uninative: Upgrade to 3.6 with gcc 12 support package_ipk/deb: Fix specific version handling Ross Burton (1): python3-cryptography: backport fix for leaky test meta-openembedded: b9e440ead8..1888971b1f: Andreas Müller (5): octave: add PACKAGECONFIG for (Qt-)gui - disabled by default xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0 gnome-online-accounts: upgrade 3.43.1 -> 3.44.0 mutter: upgrade 41.2 -> 42.0 gnome-shell: upgrade 41.2 -> 42.0 Clément Péron (1): grpc: remove unused patches Kai Kang (2): wxwidgets: fix wx-config multilib issue python3-wxgtk4: pass '--baselib' to WX_CONFIG Khem Raj (6): Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1" libotr: Include missing sys/socket.h header libcereal: Link in libatomic on rv32 for ptests gnuplot: Disable libcerf and fix typo libcereal: Disable on ppc/ppc64 evolution-data-server: Disable g-i on musl Markus Volk (1): gparted: update to v1.4.0 Naveen Saini (1): ndctl: fix build failure with EXEWRAPPER_ENABLED False Oleksandr Kravchuk (27): python3-beautifulsoup: update to 4.11.1 python3-bidict: update to 0.22.0 python3-can: update t 4.0.0 python3-elementpath: update to 2.5.0 python3-flask-login: update to 0.6.0 python3-flask: update to 2.1.1 python3-gcovr: update to 5.1 python3-google-api-core: update to 2.7.1 python3-google-auth: update to 2.6.3 python3-grpcio-tools: update to 1.45.0 python3-ipython: update to 8.2.0 python3-jmespath: update to 1.0.0 python3-mypy: update to 0.942 python3-pint: update to 0.19.1 python3-portalocker: update to 2.4.0 python3-pulsectl: update to 22.3.2 python3-pycurl: update to 7.45.1 python3-pymogo: update to 4.1.0 python3-pyscaffold: update to 4.2.1 python3-pytest-helpers-namespace: update to 2021.12.29 python3-pywbem: update to 1.4.1 python3-regex: update to 2022.3.15 python3-sympy: update to 1.10.1 python3-tqdm: update to 4.64.1 python3-twitter: update to 4.8.0 python3-xmlschema: update to 1.10.0 python3-zeroconf: update to 0.38.4 Robert Yang (1): python3-wxgtk4: Require DISTRO_FEATURES as gtk3 Sakib Sajal (1): drbd-utils: update 9.13.1 -> 9.20.2 Scott Murray (1): wxwidgets: Fix building without x11 Stefan Herbrechtsmeier (2): grpc: add cmake support for target grpc: remove useless link with libatomic append Stefan Schmidt (4): ot-br-posix: add recipe for an OpenThread Border Router ot-daemon: add recipe for OpenThread daemon wpantund: add new recipe MAINTAINERS: add entry for OpenThread Willy Tu (1): googletests: Update SRC_URI to 9e71237 to move closer to lastest version Yi Zhao (1): libyang: do not inherit binconfig-disabled wangmy (9): haveged: upgrade 1.9.17 -> 1.9.18 hidapi: upgrade 0.10.1 -> 0.11.2 hwdata: upgrade 0.357 -> 0.358 broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3 byacc: upgrade 20211224 -> 20220128 ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0 feh: upgrade 3.6.1 -> 3.8 fio: upgrade 3.29 -> 3.30 grpc: upgrade 1.45.1 -> 1.45.2 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb (renamed from meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb)4
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb3
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb (renamed from meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb3
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch56
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb10
6 files changed, 69 insertions, 9 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb
index 85e5072716..8aa8767d37 100644
--- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb
@@ -4,7 +4,7 @@
# Setting to PD as this is what the upstream has it as.
LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=e13dd32663e3159031608d536530a080"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=62c37a10a2faf90235ee64280ad72737"
require byacc.inc
-SRC_URI[sha256sum] = "7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8"
+SRC_URI[sha256sum] = "42c1805cc529314e6a76326fe1b33e80c70862a44b01474da362e2f7db2d749c"
diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
index 087b69faae..7343a08c7d 100644
--- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
@@ -45,7 +45,8 @@ PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--
EXTRA_OECONF = " \
--with-readline=${STAGING_LIBDIR}/.. \
- -disable-wxwidgets \
+ --disable-wxwidgets \
+ --without-libcerf \
"
do_compile:prepend() {
diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb
index 25007c7773..069fdf7bc2 100644
--- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
# v1.9.17
-SRCREV = "1ff76272aba9803501e6f473dd5083f0e09289ac"
+SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2"
SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb
index 8f41769e02..2817be7c86 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb
@@ -21,10 +21,9 @@ COMPATIBLE_HOST:armv5 = "null"
COMPATIBLE_HOST:riscv64 = "null"
# Main dependencies
-inherit cmake pkgconfig lib_package binconfig-disabled ptest
+inherit cmake pkgconfig lib_package ptest
DEPENDS = "libpcre2"
DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}"
-BINCONFIG = "${bindir}/pcre2-config"
# Ptest dependencies
RDEPENDS:${PN}-ptest += "valgrind"
diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
new file mode 100644
index 0000000000..7ce206d263
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
@@ -0,0 +1,56 @@
+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 default value of baselib with "lib${wxPLATFORM_LIB_DIR}".
+
+Upstream-Status: Pending [oe specific]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ build/cmake/config.cmake | 2 +-
+ wx-config.in | 6 ++++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
+index 52ae69d3f6..28aa733eb0 100644
+--- a/build/cmake/config.cmake
++++ b/build/cmake/config.cmake
+@@ -86,7 +86,7 @@ function(wx_write_config)
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix "\${prefix}")
+ set(includedir "\${prefix}/include")
+- set(libdir "\${exec_prefix}/lib")
++ set(libdir "\${exec_prefix}/\${baselib}")
+ set(bindir "\${exec_prefix}/bin")
+
+ find_program(EGREP egrep)
+diff --git a/wx-config.in b/wx-config.in
+index e3f7d115bb..0e78af03c7 100755
+--- a/wx-config.in
++++ b/wx-config.in
+@@ -42,7 +42,8 @@ usage()
+ {
+ cat 1>&2 <<EOF
+
+- wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
++ wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]][--baselib=DIR]
++ [--release] [--version-full]
+ [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
+ [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
+ [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
+@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix
+
+ # Options that permit the user to supply hints that may affect the output.
+ # These options all accept arbitrary values, to interpret as they please.
+-wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
++wxconfig_input_options="prefix exec_prefix baselib utility $wxconfig_schema"
+
+ # Input options that accept only a yes or no argument.
+ #
+@@ -404,6 +405,7 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; }
+ # Determine the base directories we require.
+ prefix=${input_option_prefix-${this_prefix:-@prefix@}}
+ exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
++baselib=${input_option_baselib:-lib@wxPLATFORM_LIB_DIR@}
+ wxconfdir="@libdir@/wx/config"
+
+ installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
index e821430406..6b57cb54cb 100644
--- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb
@@ -24,6 +24,7 @@ SRC_URI = " \
file://fix-libdir-for-multilib.patch \
file://respect-DESTDIR-when-create-link.patch \
file://not-append-system-name-to-lib-name.patch \
+ file://wx-config-fix-libdir-for-multilib.patch \
"
SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1"
S = "${WORKDIR}/git"
@@ -42,10 +43,11 @@ EXTRA_OECMAKE += " \
EXTRA_OECMAKE:append:libc-musl = " \
-DHAVE_LOCALE_T=OFF \
"
+EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
-# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake)
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
+# OpenGL support currently seems tied to using libglu, which requires x11
+PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
"
PACKAGECONFIG:remove:class-native = "opengl"
@@ -113,4 +115,6 @@ FILES:${PN}-dev += " \
${libdir}/wx/config/ \
"
+RDEPENDS:${PN}-dev += "grep"
+
BBCLASSEXTEND = "native"