CVS commit: pkgsrc/audio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov  5 22:29:58 UTC 2021

Modified Files:
        pkgsrc/audio: Makefile
Added Files:
        pkgsrc/audio/jack_umidi: DESCR Makefile PLIST distinfo
        pkgsrc/audio/jack_umidi/patches: patch-jack__umidi.c

Log Message:
add audio/jack_umidi

jack_umidi is a daemon that converts a BSD/OSS-style raw MIDI device into
a JACK MIDI device.


To generate a diff of this commit:
cvs rdiff -u -r1.640 -r1.641 pkgsrc/audio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/jack_umidi/DESCR \
    pkgsrc/audio/jack_umidi/Makefile pkgsrc/audio/jack_umidi/PLIST \
    pkgsrc/audio/jack_umidi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/jack_umidi/patches/patch-jack__umidi.c

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

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.640 pkgsrc/audio/Makefile:1.641
--- pkgsrc/audio/Makefile:1.640 Sat Sep 11 23:44:48 2021
+++ pkgsrc/audio/Makefile       Fri Nov  5 22:29:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.640 2021/09/11 23:44:48 nia Exp $
+# $NetBSD: Makefile,v 1.641 2021/11/05 22:29:57 nia Exp $
 #
 
 COMMENT=       Audio tools, players, and libraries
@@ -209,6 +209,7 @@ SUBDIR+=    id3v2
 SUBDIR+=       ifp-line
 SUBDIR+=       jack
 SUBDIR+=       jack-rack
+SUBDIR+=       jack_umidi
 SUBDIR+=       juke
 SUBDIR+=       kid3
 SUBDIR+=       ladspa

Added files:

Index: pkgsrc/audio/jack_umidi/DESCR
diff -u /dev/null pkgsrc/audio/jack_umidi/DESCR:1.1
--- /dev/null   Fri Nov  5 22:29:58 2021
+++ pkgsrc/audio/jack_umidi/DESCR       Fri Nov  5 22:29:58 2021
@@ -0,0 +1,2 @@
+jack_umidi is a daemon that converts a BSD/OSS-style raw MIDI device into
+a JACK MIDI device.
Index: pkgsrc/audio/jack_umidi/Makefile
diff -u /dev/null pkgsrc/audio/jack_umidi/Makefile:1.1
--- /dev/null   Fri Nov  5 22:29:58 2021
+++ pkgsrc/audio/jack_umidi/Makefile    Fri Nov  5 22:29:58 2021
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2021/11/05 22:29:58 nia Exp $
+
+DISTNAME=      jack_umidi-1.1.1
+CATEGORIES=    audio
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=hselasky/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/hselasky/jack_umidi
+COMMENT=       Raw/BSD/OSS MIDI to JACK MIDI daemon
+LICENSE=       2-clause-bsd
+
+MAKE_FLAGS+=   HAVE_MAN=yes
+MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
+
+USE_BSD_MAKEFILE=      yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     jack_umidi.c
+SUBST_FILES.paths+=    jack_umidi.8
+SUBST_SED.paths=       -e 's,/dev/umidi0.0,/dev/rmidi0,g'
+.endif
+
+INSTALLATION_DIRS+=    sbin
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man8
+
+.include "../../audio/jack/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/jack_umidi/PLIST
diff -u /dev/null pkgsrc/audio/jack_umidi/PLIST:1.1
--- /dev/null   Fri Nov  5 22:29:58 2021
+++ pkgsrc/audio/jack_umidi/PLIST       Fri Nov  5 22:29:58 2021
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2021/11/05 22:29:58 nia Exp $
+man/man8/jack_umidi.8
+sbin/jack_umidi
Index: pkgsrc/audio/jack_umidi/distinfo
diff -u /dev/null pkgsrc/audio/jack_umidi/distinfo:1.1
--- /dev/null   Fri Nov  5 22:29:58 2021
+++ pkgsrc/audio/jack_umidi/distinfo    Fri Nov  5 22:29:58 2021
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2021/11/05 22:29:58 nia Exp $
+
+BLAKE2s (jack_umidi-1.1.1.tar.gz) = 2e61a8705cf1de7ae4f4202755d036043256fc0430e53df95399e050e1773a66
+SHA512 (jack_umidi-1.1.1.tar.gz) = 457c21a97e0d2b65134e35a11443c2735d84330b2cf0830da85e6b8946aaa3180b4f51887cb57389830cc46adf267d67b7fda68c4d801495fb3f5a2777a92f47
+Size (jack_umidi-1.1.1.tar.gz) = 6750 bytes
+SHA1 (patch-jack__umidi.c) = 407868e09040b3ffa301f0b62c151c2449d734e0

Index: pkgsrc/audio/jack_umidi/patches/patch-jack__umidi.c
diff -u /dev/null pkgsrc/audio/jack_umidi/patches/patch-jack__umidi.c:1.1
--- /dev/null   Fri Nov  5 22:29:58 2021
+++ pkgsrc/audio/jack_umidi/patches/patch-jack__umidi.c Fri Nov  5 22:29:58 2021
@@ -0,0 +1,34 @@
+$NetBSD: patch-jack__umidi.c,v 1.1 2021/11/05 22:29:58 nia Exp $
+
+Fix compilation on NetBSD.
+
+--- jack_umidi.c.orig  2021-06-02 15:38:42.000000000 +0000
++++ jack_umidi.c
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <pthread.h>
+ #include <err.h>
++#include <errno.h>
+ #include <sysexits.h>
+ #include <sys/errno.h>
+ #ifdef HAVE_SYSCTL
+@@ -513,8 +514,8 @@ umidi_watchdog_sub(void)
+       }
+ }
+ 
+-static void *
+-umidi_watchdog(void *arg)
++static void
++umidi_watchdog(void)
+ {
+       while (1) {
+               /* check if we should close */
+@@ -751,7 +752,7 @@ retry:
+       if (jack_activate(jack_client))
+               errx(EX_UNAVAILABLE, "Cannot activate JACK client.");
+ 
+-      umidi_watchdog(NULL);
++      umidi_watchdog();
+ 
+       return (0);
+ }