[pull] master from buildroot:master

package/meson/0003-ninjabackend-do-not-fail-if-only-the-build-machine-u.patch

@@ -0,0 +1,45 @@
+From c1db93be859b360b64fe20d49a286278b56df64e Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 3 Feb 2026 12:56:36 +0100
+Subject: [PATCH] ninjabackend: do not fail if only the build machine uses C++
+
+This is caused by the introduction of the cpp_importstd option; while
+target_uses_import_std() tries to protect from the option not existing,
+this does not work if cpp_importstd exists but build.cpp_importstd does
+not, and get_option_for_target() wants to look at the latter.
+
+Just return false on a KeyError for simplicity.
+
+Fixes: #15497
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream: https://github.com/mesonbuild/meson/commit/c1db93be859b360b64fe20d49a286278b56df64e
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ mesonbuild/backend/ninjabackend.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
+index 42f24d47d..e0aaa39c4 100644
+--- a/mesonbuild/backend/ninjabackend.py
++++ b/mesonbuild/backend/ninjabackend.py
+@@ -3297,11 +3297,11 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
+     def target_uses_import_std(self, target: build.BuildTarget) -> bool:
+         if 'cpp' not in target.compilers:
+             return False
+-        if 'cpp_importstd' not in self.environment.coredata.optstore:
+-            return False
+-        if self.environment.coredata.get_option_for_target(target, 'cpp_importstd') == 'false':
++        try:
++            if self.environment.coredata.get_option_for_target(target, 'cpp_importstd') == 'true':
++                return True
++        except KeyError:
+             return False
+-        return True
+
+     def handle_cpp_import_std(self, target: build.BuildTarget, compiler):
+         istd_args = []
+-- 
+2.47.3
+

package/sane-airscan/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SANE_AIRSCAN
 	bool "sane-airscan"
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS # avahi, gnutls, sane-backends
 	depends on BR2_TOOLCHAIN_HAS_THREADS # avahi, dbus
 	depends on BR2_USE_WCHAR # avahi, gnutls
@@ -23,7 +24,7 @@ config BR2_PACKAGE_SANE_AIRSCAN
 
 	  https://github.com/alexpevzner/sane-airscan
 
-comment "sane-airscan needs a toolchain w/ wchar, dynamic library, threads"
+comment "sane-airscan needs a toolchain w/ wchar, dynamic library, threads, C++"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

package/sane-airscan/sane-airscan.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256  647f41f84f9bce743c796ca84c1fda67e519968fab407490c28fd0cc6d7ac485  sane-airscan-0.99.33.tar.gz
+sha256  43d3436c0199496ee18aca4f875fe3926a40a0fae781bc280cdb96f7b5068ac0  sane-airscan-0.99.36.tar.gz
 sha256  a2631c1b81992bd6f66db6be8b009ed7e3e998d1e2db4de497fa82d65011d373  LICENSE

package/sane-airscan/sane-airscan.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SANE_AIRSCAN_VERSION = 0.99.33
+SANE_AIRSCAN_VERSION = 0.99.36
 SANE_AIRSCAN_SITE = $(call github,alexpevzner,sane-airscan,$(SANE_AIRSCAN_VERSION))
 SANE_AIRSCAN_DEPENDENCIES = avahi gnutls jpeg libpng libxml2 sane-backends tiff
 SANE_AIRSCAN_LICENSE = GPL-2.0+-with-exception