Merge remote-tracking branch 'upstream/master'

2025-04-29 19:59:42 +02:00
parent e541936df9 0332d2ebf8
commit 4222032fa1
40 changed files with 877 additions and 389 deletions
--- a/meson.build
+++ b/meson.build
@ -334,6 +334,10 @@ if get_option('niri')
    )
 endif

+if get_option('login-proxy')
+    add_project_arguments('-DHAVE_LOGIN_PROXY', language: 'cpp')
+endif
+
 if libnl.found() and libnlgen.found()
    add_project_arguments('-DHAVE_LIBNL', language: 'cpp')
    src_files += files('src/modules/network.cpp')
@ -483,7 +487,7 @@ if get_option('experimental')
 endif

 cava = dependency('cava',
-                  version : '>=0.10.3',
+                  version : '>=0.10.4',
                  required: get_option('cava'),
                  fallback : ['cava', 'cava_dep'],
                  not_found_message: 'cava is not found. Building waybar without cava')