tibequadorian
Andrew Benson
parent
14a96e9660
commit
5d801c153e
2 changed files with 10 additions and 106 deletions
|
|
@ -1,95 +0,0 @@
|
|||
# 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
|
||||
--- 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
|
||||
+
|
||||
+if PULSE
|
||||
+i3status_SOURCES += src/pulse.c
|
||||
+endif
|
||||
|
||||
dist_sysconf_DATA = \
|
||||
i3status.conf
|
||||
diff --git configure.ac configure.ac
|
||||
index cf9e430..11caa33 100644
|
||||
--- a/configure.ac
|
||||
+++ b/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
|
||||
--- 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 src/print_volume.c src/print_volume.c
|
||||
index 91e8ce2..7364d47 100644
|
||||
--- a/src/print_volume.c
|
||||
+++ b/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
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'i3status'
|
||||
pkgname=i3status
|
||||
version=2.13
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-builddir $(vopt_enable pulseaudio)"
|
||||
hostmakedepends="automake asciidoc pkg-config xmlto"
|
||||
version=2.14
|
||||
revision=1
|
||||
build_style=meson
|
||||
configure_args="-Dmans=true $(vopt_bool pulseaudio pulseaudio)"
|
||||
hostmakedepends="asciidoc pkg-config xmlto perl"
|
||||
makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel
|
||||
yajl-devel $(vopt_if pulseaudio pulseaudio-devel)"
|
||||
depends="libcap-progs"
|
||||
|
|
@ -13,17 +13,16 @@ maintainer="Lugubris <lugubris@disroot.org>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="https://www.i3wm.org/i3status/"
|
||||
#changelog="https://raw.githubusercontent.com/i3/i3status/master/CHANGELOG"
|
||||
distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466
|
||||
distfiles="https://i3wm.org/i3status/i3status-${version}.tar.xz"
|
||||
checksum=5c4d0273410f9fa3301fd32065deda32e9617fcae8b3cb34793061bf21644924
|
||||
conf_files="/etc/i3status.conf"
|
||||
|
||||
# tests fail in a chroot
|
||||
make_check=no
|
||||
|
||||
build_options="pulseaudio"
|
||||
build_options_default="pulseaudio"
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue