95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
# reason: make pulseaudio optional
|
|
# upstream: yes (>2.13)
|
|
# ```
|
|
# cd i3status
|
|
# git diff --no-prefix 2.13..23da59920c -- configure.ac Makefile.am i3status.c src/print_volume.c
|
|
# ```
|
|
|
|
diff --git Makefile.am Makefile.am
|
|
index bb251f0..c2c1c0a 100644
|
|
--- Makefile.am
|
|
+++ Makefile.am
|
|
@@ -68,8 +68,11 @@ i3status_SOURCES = \
|
|
src/print_volume.c \
|
|
src/print_wireless_info.c \
|
|
src/print_file_contents.c \
|
|
- src/process_runs.c \
|
|
- src/pulse.c
|
|
+ src/process_runs.c
|
|
+
|
|
+if PULSE
|
|
+i3status_SOURCES += src/pulse.c
|
|
+endif
|
|
|
|
dist_sysconf_DATA = \
|
|
i3status.conf
|
|
diff --git configure.ac configure.ac
|
|
index cf9e430..11caa33 100644
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -80,11 +80,24 @@ AC_CANONICAL_HOST
|
|
PKG_CHECK_MODULES([CONFUSE], [libconfuse])
|
|
PKG_CHECK_MODULES([YAJL], [yajl])
|
|
|
|
+AC_ARG_ENABLE(pulseaudio,
|
|
+ AS_HELP_STRING(
|
|
+ [--disable-pulseaudio],
|
|
+ [build without pulseaudio support]),
|
|
+ [ax_pulse=$enableval],
|
|
+ [ax_pulse=yes])
|
|
+AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
|
|
+AS_IF([test x"$ax_pulse" = x"yes"],
|
|
+ [PKG_CHECK_MODULES([PULSE], [libpulse])])
|
|
+pulse_def=0
|
|
+AS_IF([test x"$ax_pulse" = x"yes"],
|
|
+ [pulse_def=1])
|
|
+AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
|
|
+
|
|
case $host_os in
|
|
linux*)
|
|
PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
|
|
PKG_CHECK_MODULES([ALSA], [alsa])
|
|
- PKG_CHECK_MODULES([PULSE], [libpulse])
|
|
;;
|
|
netbsd*)
|
|
AC_SEARCH_LIBS([prop_string_create], [prop])
|
|
@@ -151,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}])
|
|
AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
|
|
AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
|
|
AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
|
|
+AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
|
|
|
|
To compile, run:
|
|
|
|
diff --git i3status.c i3status.c
|
|
index 0898da3..1ab8400 100644
|
|
--- i3status.c
|
|
+++ i3status.c
|
|
@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
|
|
return 0;
|
|
break;
|
|
case 'v':
|
|
- printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
|
|
+ printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
|
|
+#if HAS_PULSEAUDIO
|
|
+ "Built with pulseaudio support\n"
|
|
+#else
|
|
+ "Built without pulseaudio support\n"
|
|
+#endif
|
|
+ );
|
|
return 0;
|
|
break;
|
|
case 0:
|
|
diff --git src/print_volume.c src/print_volume.c
|
|
index 91e8ce2..7364d47 100644
|
|
--- src/print_volume.c
|
|
+++ src/print_volume.c
|
|
@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
|
|
free(instance);
|
|
}
|
|
|
|
-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
|
|
+#if HAS_PULSEAUDIO
|
|
/* Try PulseAudio first */
|
|
|
|
/* If the device name has the format "pulse[:N]" where N is the
|