Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cava bump: 0.10.2 #3294

Merged
merged 1 commit into from
May 23, 2024
Merged

cava bump: 0.10.2 #3294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
13 changes: 1 addition & 12 deletions src/modules/cava.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions subprojects/cava.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading