From 60a613ae5106e215ce1b95268bb6f8cdbfc3a2d7 Mon Sep 17 00:00:00 2001
From: Viktar Lukashonak <myxabeer@gmail.com>
Date: Thu, 23 May 2024 16:14:06 +0300
Subject: [PATCH] cava bump: 0.10.2

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 meson.build           |  2 +-
 src/modules/cava.cpp  | 13 +------------
 subprojects/cava.wrap |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/meson.build b/meson.build
index d7a5a4eef..102bb8786 100644
--- a/meson.build
+++ b/meson.build
@@ -464,7 +464,7 @@ if get_option('experimental')
 endif
 
 cava = dependency('cava',
-                  version : '>=0.10.1',
+                  version : '>=0.10.2',
                   required: get_option('cava'),
                   fallback : ['cava', 'cava_dep'],
                   not_found_message: 'cava is not found. Building waybar without cava')
diff --git a/src/modules/cava.cpp b/src/modules/cava.cpp
index a98e5a675..431ce5f15 100644
--- a/src/modules/cava.cpp
+++ b/src/modules/cava.cpp
@@ -8,18 +8,7 @@ waybar::modules::Cava::Cava(const std::string& id, const Json::Value& config)
   char cfgPath[PATH_MAX];
   cfgPath[0] = '\0';
 
-  if (config_["cava_config"].isString()) {
-    std::string strPath{config_["cava_config"].asString()};
-    const std::string fnd{"XDG_CONFIG_HOME"};
-    const std::string::size_type npos{strPath.find("$" + fnd)};
-    if (npos != std::string::npos) {
-      if (const char* xdg = getenv(fnd.c_str()))
-        strPath.replace(npos, fnd.length() + 1, xdg);
-      else
-        spdlog::warn("Module {0}. Environment variable \"${1}\" not found", name_, fnd);
-    }
-    strcpy(cfgPath, strPath.data());
-  }
+  if (config_["cava_config"].isString()) strcpy(cfgPath, config_["cava_config"].asString().data());
   // Load cava config
   error_.length = 0;
 
diff --git a/subprojects/cava.wrap b/subprojects/cava.wrap
index 19383d119..275ba114b 100644
--- a/subprojects/cava.wrap
+++ b/subprojects/cava.wrap
@@ -1,7 +1,7 @@
 [wrap-file]
-directory = cava-0.10.1
-source_url = https://github.com/LukashonakV/cava/archive/0.10.1.tar.gz
-source_filename = cava-0.10.1.tar.gz
-source_hash = ae8c7339908d6febeac5ab8df4576c03c9fdbca6c8e8975daf9ce68b57038bb5
+directory = cava-0.10.2
+source_url = https://github.com/LukashonakV/cava/archive/0.10.2.tar.gz
+source_filename = cava-0.10.2.tar.gz
+source_hash = dff78c4787c9843583086408a0a6e5bde7a5dee1fa17ae526847366846cb19c3
 [provide]
 cava = cava_dep