pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sowm, use mixerctl instead of amixer on NetBSD



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri Apr 10 06:27:29 2020 +0200
Changeset:	477393a699daddee26d226499f3948b372c132a9

Modified Files:
	sowm/Makefile
	sowm/distinfo
	sowm/patches/patch-config.def.h

Log Message:
sowm, use mixerctl instead of amixer on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=477393a699daddee26d226499f3948b372c132a9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sowm/Makefile                   |  5 +++++
 sowm/distinfo                   |  2 +-
 sowm/patches/patch-config.def.h | 12 ++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs:
diff --git a/sowm/Makefile b/sowm/Makefile
index dd95ecfcd6..bf6a43b945 100644
--- a/sowm/Makefile
+++ b/sowm/Makefile
@@ -16,5 +16,10 @@ DEPENDS+=	dmenu-[0-9]*:../../x11/dmenu
 DEPENDS+=	st-term-[0-9]*:../../x11/st-term
 DEPENDS+=	scrot-[0-9]*:../../graphics/scrot
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+DEPENDS+=	alsa-utils-[0-9]*:../../audio/alsa-utils
+.endif
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sowm/distinfo b/sowm/distinfo
index 82b05b9fec..f9f8663907 100644
--- a/sowm/distinfo
+++ b/sowm/distinfo
@@ -4,4 +4,4 @@ SHA1 (sowm-1.6.tar.gz) = 87bd3f40ae70364c15f8e36c78c95e146d1423ac
 RMD160 (sowm-1.6.tar.gz) = f1f5ec85623335214e9e89fc2ce2e48a74679415
 SHA512 (sowm-1.6.tar.gz) = 36f0818d769c224c727713d862201dee7478a04e99c4b0ea0e48a1e1a12a033f704962351ec39df901c196a0ab75fd07b0551b6177f3bb51639dc1ea362b0c16
 Size (sowm-1.6.tar.gz) = 5916 bytes
-SHA1 (patch-config.def.h) = e9281c51708d4ff341fdb552c69ea29c718c5143
+SHA1 (patch-config.def.h) = ecd075f42fccebf51231d0aebc6656cfe6b93851
diff --git a/sowm/patches/patch-config.def.h b/sowm/patches/patch-config.def.h
index 8c2a55f586..e112db302d 100644
--- a/sowm/patches/patch-config.def.h
+++ b/sowm/patches/patch-config.def.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Use amixer only on Linux
+Use mixerctl instead of amixer on NetBSD
 
 --- config.def.h.orig	2020-02-21 16:08:47.000000000 +0000
 +++ config.def.h
@@ -8,14 +8,14 @@ Use amixer only on Linux
  const char* scrot[]   = {"scr",            0};
  const char* briup[]   = {"bri", "10", "+", 0};
  const char* bridown[] = {"bri", "10", "-", 0};
-+#if defined(__Linux__)
++#if defined (__NetBSD__)
++const char* volup[] = {"mixerctl", "-w", "outputs.master+=5", 0};
++const char* voldown[] = {"mixerctl", "-w", "outputs.master-=5", 0};
++const char* volmute[] = {"mixerctl", "-w", "outputs.master=0", 0};
++#elif
  const char* voldown[] = {"amixer", "sset", "Master", "5%-",         0};
  const char* volup[]   = {"amixer", "sset", "Master", "5%+",         0};
  const char* volmute[] = {"amixer", "sset", "Master", "toggle",      0};
-+#elif (__NetBSD__)
-+const char* volup[] = {"mixerctl", "-w", "outputs.master+=5" };
-+const char* voldown[] = {"mixerctl", "-w", "outputs.master-=5" };
-+const char* volmute[] = {"mixerctl", "-w", "outputs.master=0" };
 +#endif
  const char* colors[]  = {"bud", "/home/goldie/Pictures/Wallpapers", 0};
  


Home | Main Index | Thread Index | Old Index