RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2144 from LukashonakV/cava_bump

pull/2153/head
Alex 2023-04-29 00:13:25 +02:00 committed by GitHub
parent e4faf252b2 f5ef13c7f1
commit b06953757e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/gentoo
View File

@ -8,4 +8,4 @@ RUN export FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -sandbox -usersa
emerge --verbose --update --deep --with-bdeps=y --backtrack=30 --newuse @world && \ emerge --verbose --update --deep --with-bdeps=y --backtrack=30 --newuse @world && \
USE="wayland gtk3 gtk -doc X" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols =dev-cpp/gtkmm-3.24.6 x11-libs/libxkbcommon \ USE="wayland gtk3 gtk -doc X" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols =dev-cpp/gtkmm-3.24.6 x11-libs/libxkbcommon \
x11-libs/gtk+:3 dev-libs/libdbusmenu dev-libs/libnl sys-power/upower media-libs/libpulse dev-libs/libevdev media-libs/libmpdclient \ x11-libs/gtk+:3 dev-libs/libdbusmenu dev-libs/libnl sys-power/upower media-libs/libpulse dev-libs/libevdev media-libs/libmpdclient \
media-sound/sndio gui-libs/gtk-layer-shell app-text/scdoc media-sound/playerctl media-sound/sndio gui-libs/gtk-layer-shell app-text/scdoc media-sound/playerctl dev-libs/iniparser

12
meson.build
View File

@ -341,13 +341,11 @@ if get_option('experimental')
add_project_arguments('-DUSE_EXPERIMENTAL', language: 'cpp') add_project_arguments('-DUSE_EXPERIMENTAL', language: 'cpp')
endif endif
cava = compiler.find_library('cava', cava = dependency('cava',
required: get_option('cava')) version : '>=0.8.4',
if not cava.found() and not get_option('cava').disabled() required: get_option('cava'),
cava = dependency('cava', fallback : ['cava', 'cava_dep'],
required: false, not_found_message: 'cava is not found. Building waybar without cava')
fallback: [ 'cava', 'cava_dep' ])
endif
if cava.found() if cava.found()
add_project_arguments('-DHAVE_LIBCAVA', language: 'cpp') add_project_arguments('-DHAVE_LIBCAVA', language: 'cpp')

6
src/modules/network.cpp
View File

@ -497,8 +497,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
net->ifname_ = new_ifname; net->ifname_ = new_ifname;
net->ifid_ = ifi->ifi_index; net->ifid_ = ifi->ifi_index;
if (ifi->ifi_flags & IFF_POINTOPOINT) if (ifi->ifi_flags & IFF_POINTOPOINT) net->is_p2p_ = true;
net->is_p2p_ = true;
if (carrier.has_value()) { if (carrier.has_value()) {
net->carrier_ = carrier.value(); net->carrier_ = carrier.value();
} }
@ -543,8 +542,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
for (; RTA_OK(ifa_rta, attrlen); ifa_rta = RTA_NEXT(ifa_rta, attrlen)) { for (; RTA_OK(ifa_rta, attrlen); ifa_rta = RTA_NEXT(ifa_rta, attrlen)) {
switch (ifa_rta->rta_type) { switch (ifa_rta->rta_type) {
case IFA_ADDRESS: case IFA_ADDRESS:
if (net->is_p2p_) if (net->is_p2p_) continue;
continue;
case IFA_LOCAL: case IFA_LOCAL:
char ipaddr[INET6_ADDRSTRLEN]; char ipaddr[INET6_ADDRSTRLEN];
if (!is_del_event) { if (!is_del_event) {

8
subprojects/cava.wrap
View File

@ -1,7 +1,7 @@
[wrap-file] [wrap-file]
directory = cava-0.8.3 directory = cava-0.8.4
source_url = https://github.com/LukashonakV/cava/archive/0.8.3.tar.gz source_url = https://github.com/LukashonakV/cava/archive/0.8.4.tar.gz
source_filename = cava-0.8.3.tar.gz source_filename = cava-0.8.4.tar.gz
source_hash = 10f9ec910682102c47dc39d684fd3fc90d38a4d1c2e5a310f132f70ad0e00850 source_hash = 523353f446570277d40b8e1efb84468d70fdec53e1356a555c14bf466557a3ed
[provide] [provide]
cava = cava_dep cava = cava_dep