diff options
| author | Florian Franzmann | 2016-01-08 23:03:28 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2016-01-08 23:32:19 +0100 |
| commit | bf1dd49522f1910b47f782c13f5685479c5b4fe4 (patch) | |
| tree | ddd388d809540e970d0acea1e60c25bcdbcd43b4 /wm-addons | |
| parent | c5e6d564b9d4943878e5617c8e0d27837bc72944 (diff) | |
wm-addons/i3status: version 2.10
Diffstat (limited to 'wm-addons')
| -rw-r--r-- | wm-addons/i3status/0001-disable-pulseaudio.patch | 42 | ||||
| -rwxr-xr-x | wm-addons/i3status/DEPENDS | 4 | ||||
| -rwxr-xr-x | wm-addons/i3status/DETAILS | 2 | ||||
| -rw-r--r-- | wm-addons/i3status/HISTORY | 6 | ||||
| -rwxr-xr-x | wm-addons/i3status/PRE_BUILD | 6 |
5 files changed, 57 insertions, 3 deletions
diff --git a/wm-addons/i3status/0001-disable-pulseaudio.patch b/wm-addons/i3status/0001-disable-pulseaudio.patch new file mode 100644 index 0000000000..41300eec98 --- /dev/null +++ b/wm-addons/i3status/0001-disable-pulseaudio.patch @@ -0,0 +1,42 @@ +From 99e4891bb79a484932e6b4e6a5221fb3ae05a011 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <siflfran@hawo.net> +Date: Fri, 8 Jan 2016 22:56:14 +0100 +Subject: [PATCH] disable pulseaudio + +--- + Makefile | 4 +--- + src/print_volume.c | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index bb90b1a..cbaf416 100644 +--- a/Makefile ++++ b/Makefile +@@ -70,10 +70,8 @@ CFLAGS += -idirafter yajl-fallback + OBJS:=$(wildcard src/*.c *.c) + OBJS:=$(OBJS:.c=.o) + +-ifeq ($(OS),OpenBSD) + OBJS:=$(filter-out src/pulse.o, $(OBJS)) +-LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread +-endif ++LIBS:=$(filter-out -lpulse, $(LIBS)) + + src/%.o: src/%.c include/i3status.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +diff --git a/src/print_volume.c b/src/print_volume.c +index 58cba2a..151f9b2 100644 +--- a/src/print_volume.c ++++ b/src/print_volume.c +@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * + free(instance); + } + +-#ifndef __OpenBSD__ ++#if 0 + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the +-- +2.7.0 + diff --git a/wm-addons/i3status/DEPENDS b/wm-addons/i3status/DEPENDS index 1f20ddb942..0a6b249beb 100755 --- a/wm-addons/i3status/DEPENDS +++ b/wm-addons/i3status/DEPENDS @@ -1,6 +1,6 @@ depends confuse && depends yajl && -depends wireless_tools && optional_depends alsa-lib '' '' "To get the current volume" && optional_depends libcap '' '' "To get the network status without root permissions" && -optional_depends asciidoc '' '' "To generate documentation" +optional_depends asciidoc '' '' "To generate documentation" && +optional_depends pulseaudio '' '' "To query audio volume through pulseaudio" diff --git a/wm-addons/i3status/DETAILS b/wm-addons/i3status/DETAILS index 8023fdc21d..a9bc3bf642 100755 --- a/wm-addons/i3status/DETAILS +++ b/wm-addons/i3status/DETAILS @@ -1,5 +1,5 @@ SPELL=i3status - VERSION=2.7 + VERSION=2.10 SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE2=$SOURCE.asc SOURCE_URL[0]=http://i3wm.org/${SPELL}/${SOURCE} diff --git a/wm-addons/i3status/HISTORY b/wm-addons/i3status/HISTORY index 44272acadf..b42d206963 100644 --- a/wm-addons/i3status/HISTORY +++ b/wm-addons/i3status/HISTORY @@ -1,3 +1,9 @@ +2016-01-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.10 + * DEPENDS: remove dependency on wireless_tools, add optional dependency on + pulseaudio + * 0001-disable-pulseaudio.patch, PRE_BUILD: remove dependency on pulseaudio + 2013-02-28 Sukneet Basuta <sukneet@sourcemage.org> * DEPENDS: added optional_depends libcap diff --git a/wm-addons/i3status/PRE_BUILD b/wm-addons/i3status/PRE_BUILD new file mode 100755 index 0000000000..59c18cf886 --- /dev/null +++ b/wm-addons/i3status/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +if ! is_depends_enabled $SPELL pulseaudio; then + patch -p1 < "$SPELL_DIRECTORY/0001-disable-pulseaudio.patch" +fi |