From 5bd3cd480579cefcf56ccf8155e396c858a96456 Mon Sep 17 00:00:00 2001 From: Viktar Lukashonak Date: Tue, 21 Jul 2026 15:17:55 +0300 Subject: [PATCH] cavaBump --- man/waybar-cava.5.scd | 30 +++++++++++++++++++----------- meson.build | 2 +- nix/default.nix | 4 ++-- src/modules/cava/cava_backend.cpp | 2 -- subprojects/libcava.wrap | 8 ++++---- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/man/waybar-cava.5.scd b/man/waybar-cava.5.scd index 47d2e0dc54..14ab9ef3ef 100644 --- a/man/waybar-cava.5.scd +++ b/man/waybar-cava.5.scd @@ -102,6 +102,14 @@ libcava lives in: :[ integer :[ 0 :[ Delimiter placed between bars in the raw output. Use a decimal ASCII value (e.g. 59 = ";"). 0 means no delimiter. +|[ *data_format* +:[ string +:[ ascii +:[ Raw data format. Can be 'binary' or 'ascii'. **Raw frontend only.** +|[ *raw_target* +:[ string +:[ +:[ Raw output target. A fifo will be created if target does not exist. **Raw frontend only.** |[ *monstercat* :[ bool :[ false @@ -114,14 +122,6 @@ libcava lives in: :[ double :[ 0.77 :[ Smoothing factor between 0.0 and 1.0. Higher values produce slower, smoother animation; lower values are more reactive but noisy. -|[ *gravity* -:[ integer -:[ -:[ Gravity factor. Higher values make bars fall faster. When *noise_reduction* is set, this is derived automatically. -|[ *integral* -:[ integer -:[ -:[ Integral smoothing factor. Higher values produce smoother but less precise animation. When *noise_reduction* is set, this is derived automatically. |[ *input_delay* :[ integer :[ 4 @@ -162,6 +162,14 @@ libcava lives in: :[ integer :[ :[ GLSL frontend height in pixels. **GLSL only.** +|[ *min-length* +:[ integer +:[ +:[ Requested width of the GLSL widget in pixels. If not set, falls back to *max-length*, then *sdl_width*. **GLSL only.** +|[ *max-length* +:[ integer +:[ +:[ Fallback width of the GLSL widget if *min-length* is not set. **GLSL only.** |[ *vertex_shader* :[ string :[ @@ -185,11 +193,11 @@ libcava lives in: |[ *gradient* :[ integer :[ 0 -:[ Enable gradient mode (0 = off, 1 = on). **GLSL only; set in the *[color]* section of the cava configuration file.** +:[ Enable gradient mode (0 = off, 1 = on). **GLSL only.** Can also be set in the *[color]* section of the cava configuration file. |[ *gradient_count* :[ integer :[ 0 -:[ Number of gradient colors (up to 8). **GLSL only; set in the *[color]* section of the cava configuration file.** +:[ Number of gradient colors (up to 8). **GLSL only.** Can also be set in the *[color]* section of the cava configuration file. |[ *gradient_color_N* :[ string :[ @@ -625,7 +633,7 @@ vertex_shader = pass_through.vert fragment_shader = bar_spectrum.frag ; for glsl output mode, keep rendering even if no audio -continuous_rendering = 1; +continuous_rendering = 1 # disable console blank (screen saver) in tty # (Not supported on FreeBSD) diff --git a/meson.build b/meson.build index e3839cf52c..63cbe8edcc 100644 --- a/meson.build +++ b/meson.build @@ -538,7 +538,7 @@ else endif cava = dependency('libcava', - version : '>=0.10.7', + version : '>=1.0.0', required: get_option('cava'), fallback : ['libcava', 'cava_dep'], not_found_message: 'cava is not found. Building waybar without cava') diff --git a/nix/default.nix b/nix/default.nix index 8102363a4e..46514d4f6d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -6,13 +6,13 @@ }: let libcava = rec { - version = "0.10.7"; + version = "1.0.0"; src = pkgs.fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; # NOTE: Needs to match the cava.wrap tag = "${version}"; - hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ="; + hash = "sha256-0r5aAmTs+FcmS501tNYKxG9H+Pq6i32BDRBEjWW6M74="; }; }; in diff --git a/src/modules/cava/cava_backend.cpp b/src/modules/cava/cava_backend.cpp index 002391318e..0d1f2bdfae 100644 --- a/src/modules/cava/cava_backend.cpp +++ b/src/modules/cava/cava_backend.cpp @@ -262,8 +262,6 @@ void waybar::modules::cava::CavaBackend::loadConfig() { new_prm.xaxis = ::cava::xaxis_scale::NONE; new_prm.mono_opt = ::cava::AVERAGE; new_prm.autobars = 0; - if (cfg["gravity"].isInt()) new_prm.gravity = cfg["gravity"].asInt(); - if (cfg["integral"].isInt()) new_prm.integral = cfg["integral"].asInt(); if (cfg["framerate"].isInt()) new_prm.framerate = cfg["framerate"].asInt(); if (cfg["autosens"].isInt()) new_prm.autosens = cfg["autosens"].asInt(); diff --git a/subprojects/libcava.wrap b/subprojects/libcava.wrap index d66d657b31..821bbd5fa8 100644 --- a/subprojects/libcava.wrap +++ b/subprojects/libcava.wrap @@ -4,9 +4,9 @@ #depth = 1 [wrap-file] -directory = cava-0.10.7 -source_url = https://github.com/LukashonakV/cava/archive/0.10.7.tar.gz -source_filename = cava-0.10.7.tar.gz -source_hash = 50cc6413e9c96c503657f814744a2baf429a24ff9fed31a8343e0ed285269eff +directory = cava-1.0.0 +source_url = https://github.com/LukashonakV/cava/archive/1.0.0.tar.gz +source_filename = cava-1.0.0.tar.gz +source_hash = 437df0a29e52e555357a06238f4c5cbe6d51b5dd4225700cb7adbb19d8bb9474 [provide] libcava = cava_dep