Module Name: pkgsrc
Committed By: nia
Date: Wed Mar 11 22:46:36 UTC 2020
Modified Files:
pkgsrc/sysutils/i3status: Makefile distinfo
Added Files:
pkgsrc/sysutils/i3status/patches: patch-src_print__volume.c
patch-src_pulse.c
Removed Files:
pkgsrc/sysutils/i3status/patches: patch-configure
Log Message:
i3status: Use sun audio for volume mixing on NetBSD
Remove pulseaudio dependency for non-Linux
Remove our bad patching for pulse=false on Free/DragonFlyBSD, it breaks
the non-pulseaudio case because it's missing an automake check.
Bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/i3status/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/i3status/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/i3status/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/i3status/patches/patch-src_print__volume.c \
pkgsrc/sysutils/i3status/patches/patch-src_pulse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/i3status/Makefile
diff -u pkgsrc/sysutils/i3status/Makefile:1.12 pkgsrc/sysutils/i3status/Makefile:1.13
--- pkgsrc/sysutils/i3status/Makefile:1.12 Sun Mar 8 16:51:18 2020
+++ pkgsrc/sysutils/i3status/Makefile Wed Mar 11 22:46:36 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2020/03/08 16:51:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2020/03/11 22:46:36 nia Exp $
DISTNAME= i3status-2.13
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= https://i3wm.org/i3status/
EXTRACT_SUFX= .tar.bz2
@@ -35,7 +35,8 @@ post-install:
.include "../../devel/confuse/buildlink3.mk"
.include "../../devel/yajl/buildlink3.mk"
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly"
-.include "../../audio/pulseaudio/buildlink3.mk"
+.if ${OPSYS} == "Linux"
+. include "../../audio/alsa-lib/buildlink3.mk"
+. include "../../audio/pulseaudio/buildlink3.mk"
.endif
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/i3status/distinfo
diff -u pkgsrc/sysutils/i3status/distinfo:1.3 pkgsrc/sysutils/i3status/distinfo:1.4
--- pkgsrc/sysutils/i3status/distinfo:1.3 Mon Jul 22 23:04:31 2019
+++ pkgsrc/sysutils/i3status/distinfo Wed Mar 11 22:46:36 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2019/07/22 23:04:31 wiz Exp $
+$NetBSD: distinfo,v 1.4 2020/03/11 22:46:36 nia Exp $
SHA1 (i3status-2.13.tar.bz2) = b09fd2f322046daaca22f60cf6bfc7dbebea1b11
RMD160 (i3status-2.13.tar.bz2) = 8432809add78a0086ce8181160528f5e34b7c0d3
SHA512 (i3status-2.13.tar.bz2) = 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
Size (i3status-2.13.tar.bz2) = 201409 bytes
SHA1 (patch-Makefile.in) = e50ed614d41a1bcef33feb6414322affa5e20a92
-SHA1 (patch-configure) = e372bf638683a2b30a13f6fd5b58d0293e5bd767
+SHA1 (patch-src_print__volume.c) = 68dd7489b9e7748edf2e326ffb8d320788960c42
SHA1 (patch-src_print__wireless__info.c) = 7039b7fbd2f43b798763793cd4296035610eeee0
+SHA1 (patch-src_pulse.c) = bfc5265c5c11f3a56e9b88c936b9856245b998f4
Added files:
Index: pkgsrc/sysutils/i3status/patches/patch-src_print__volume.c
diff -u /dev/null pkgsrc/sysutils/i3status/patches/patch-src_print__volume.c:1.1
--- /dev/null Wed Mar 11 22:46:36 2020
+++ pkgsrc/sysutils/i3status/patches/patch-src_print__volume.c Wed Mar 11 22:46:36 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_print__volume.c,v 1.1 2020/03/11 22:46:36 nia Exp $
+
+Use sunaudio on NetBSD.
+
+--- src/print_volume.c.orig 2019-01-23 08:03:56.000000000 +0000
++++ src/print_volume.c
+@@ -21,7 +21,7 @@
+ #include <sys/soundcard.h>
+ #endif
+
+-#ifdef __OpenBSD__
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/audioio.h>
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, cha
+ free(instance);
+ }
+
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if defined(__linux__)
+ /* Try PulseAudio first */
+
+ /* If the device name has the format "pulse[:N]" where N is the
+@@ -272,7 +272,7 @@ void print_volume(yajl_gen json_gen, cha
+ if (mixer_idx > 0)
+ free(mixerpath);
+
+-#if defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ int oclass_idx = -1, master_idx = -1, master_mute_idx = -1;
+ int master_next = AUDIO_MIXER_LAST;
+ mixer_devinfo_t devinfo, devinfo2;
Index: pkgsrc/sysutils/i3status/patches/patch-src_pulse.c
diff -u /dev/null pkgsrc/sysutils/i3status/patches/patch-src_pulse.c:1.1
--- /dev/null Wed Mar 11 22:46:36 2020
+++ pkgsrc/sysutils/i3status/patches/patch-src_pulse.c Wed Mar 11 22:46:36 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_pulse.c,v 1.1 2020/03/11 22:46:36 nia Exp $
+
+The makefile forgets to conditionally build this file even
+when pulseaudio isn't available. Hack around this.
+
+--- src/pulse.c.orig 2019-01-23 08:03:56.000000000 +0000
++++ src/pulse.c
+@@ -1,3 +1,4 @@
++#if defined(__linux__)
+ // vim:ts=4:sw=4:expandtab
+ #include <config.h>
+ #include <string.h>
+@@ -337,3 +338,4 @@ bool pulse_initialize(void) {
+ }
+ return true;
+ }
++#endif