diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2019-10-01 21:38:28 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-10-09 19:00:26 +0300 |
| commit | f9459dc6210542a71da5547331e3f3fa00947bff (patch) | |
| tree | c76404635c8ce13afb093f83011babcb86e36985 /testing/i3status/no-pulseaudio.patch | |
| parent | 7d8306372d92fc6d57a120fd172de14c8a8959b0 (diff) | |
| download | aports-f9459dc6210542a71da5547331e3f3fa00947bff.tar.bz2 aports-f9459dc6210542a71da5547331e3f3fa00947bff.tar.xz | |
testing/i3status: upgrade to 2.13
Diffstat (limited to 'testing/i3status/no-pulseaudio.patch')
| -rw-r--r-- | testing/i3status/no-pulseaudio.patch | 104 |
1 files changed, 77 insertions, 27 deletions
diff --git a/testing/i3status/no-pulseaudio.patch b/testing/i3status/no-pulseaudio.patch index 532e4ef623..863d2ad824 100644 --- a/testing/i3status/no-pulseaudio.patch +++ b/testing/i3status/no-pulseaudio.patch @@ -1,38 +1,88 @@ ---- a/Makefile -+++ b/Makefile -@@ -24,7 +24,6 @@ - CFLAGS+=-Iinclude - LIBS+=-lconfuse - LIBS+=-lyajl --LIBS+=-lpulse - LIBS+=-lm - LIBS+=-lpthread +diff --git a/configure.ac b/configure.ac +index a6c31d7..11caa33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,11 +80,24 @@ + PKG_CHECK_MODULES([CONFUSE], [libconfuse]) + PKG_CHECK_MODULES([YAJL], [yajl]) -@@ -80,7 +79,14 @@ - OBJS:=$(sort $(wildcard src/*.c *.c)) - OBJS:=$(OBJS:.c=.o) ++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([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}]) --ifeq ($(OS),OpenBSD) -+ifneq ($(OS),OpenBSD) -+HAVE_PULSE ?=1 -+endif + To compile, run: + +diff --git a/Makefile.am b/Makefile.am +index bb251f0..c2c1c0a 100644 +--- a/Makefile.am ++++ b/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 + -+ifeq ($(HAVE_PULSE),1) -+LIBS+=-lpulse -+CFLAGS+=-DHAVE_PULSE -+else - OBJS:=$(filter-out src/pulse.o, $(OBJS)) - LIBS:=$(filter-out -lpulse, $(LIBS)) - endif -Only in /tmp/i3status-2.12/: Makefile.orig ++if PULSE ++i3status_SOURCES += src/pulse.c ++endif + + dist_sysconf_DATA = \ + i3status.conf +diff --git a/i3status.c b/i3status.c +index 0898da3..1ab8400 100644 +--- a/i3status.c ++++ b/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 a/src/print_volume.c b/src/print_volume.c +index 91e8ce2..7364d47 100644 --- a/src/print_volume.c +++ b/src/print_volume.c -@@ -61,7 +61,7 @@ +@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * free(instance); } --#ifndef __OpenBSD__ -+#if defined(HAVE_PULSE) +-#if !defined(__DragonFly__) && !defined(__OpenBSD__) ++#if HAS_PULSEAUDIO /* Try PulseAudio first */ /* If the device name has the format "pulse[:N]" where N is the |