Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc Config.in
Simple merge

diff --cc DEVELOPERS
index a7f9cdeb618090f548535e97c01bb587bf8e0e29,a0a9cebfe6ea807728e769459b47d9993b4db095..0ab898d94d6bb8005cafe52531c4e7ca48ccf098
--- 1/DEVELOPERS
--- 2/DEVELOPERS
+++ b/DEVELOPERS
@@@ -670,8 -677,14 +672,15 @@@ N:       Derrick Lyndon Pallas <derrick@meter
  F:    package/ipcalc/
  
  N:    Dick Olsson <hi@senzilla.io>
+ F:    board/aarch64-efi/
+ F:    board/pc/
+ F:    board/qemu/aarch64-sbsa/
+ F:    boot/arm-trusted-firmware/
+ F:    boot/edk2/
+ F:    configs/qemu_aarch64_sbsa_defconfig
  F:    package/bearssl/
 +F:    package/bitcoin/
+ F:    package/edk2-platforms/
  F:    package/execline/
  F:    package/mdevd/
  F:    package/s6-dns/

diff --cc package/fluidsynth/fluidsynth.mk
Simple merge

diff --cc package/grpc/grpc.mk
Simple merge

diff --cc package/mesa3d-headers/mesa3d-headers.mk
Simple merge

diff --cc package/mesa3d/mesa3d.mk
Simple merge

diff --cc package/pipewire/pipewire.mk
Simple merge

diff --cc package/pkg-meson.mk
index 18574505649e96ca66b30ec898f4e14cc547aebf,dafad3b1ebda8978858cb9ca8adec84a8305ba62..16a90d157b1e1b420d0514f9cb0423d373ff29c6
--- 1/package/pkg-meson.mk
--- 2/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@@ -89,9 -89,8 +89,9 @@@ define $(2)_CONFIGURE_CMD
                --prefix=/usr \
                --libdir=lib \
                --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \
-               --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
+               --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \
                --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
 +              -Db_pie=false \
                -Dstrip=false \
                -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \
                $$($$(PKG)_CONF_OPTS) \

diff --cc package/udisks/Config.in
Simple merge

diff --cc package/udisks/udisks.mk
index 9f7a02e10ccd98b053d2ccc10208f0082be3e977,3a75421f2a0d7ad1965f98d171689596e595d62e..1090f77846462a7cf9ac03b2522ae60283f20ea0
--- 1/package/udisks/udisks.mk
--- 2/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@@ -4,13 -4,11 +4,12 @@@
  #
  ################################################################################
  
- UDISKS_VERSION = 1.0.5
- UDISKS_SITE = http://hal.freedesktop.org/releases
+ UDISKS_VERSION = 2.9.2
+ UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2
+ UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION)
  UDISKS_LICENSE = GPL-2.0+
  UDISKS_LICENSE_FILES = COPYING
- # For 0002-Fix-systemd-service-file.patch
- UDISKS_AUTORECONF = YES
 +UDISKS_CPE_ID_VENDOR = freedesktop
  
  UDISKS_DEPENDENCIES = \
        host-pkgconf \

diff --cc package/webkitgtk/webkitgtk.mk
Simple merge

diff --cc package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
Simple merge

diff --cc utils/genrandconfig
Simple merge