CVS commit: pkgsrc/audio/jack

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep  9 22:41:43 UTC 2021

Modified Files:
        pkgsrc/audio/jack: distinfo
        pkgsrc/audio/jack/patches: patch-netbsd_sun_JackSunAdapter.cpp
            patch-netbsd_sun_JackSunDriver.cpp

Log Message:
jack: support systems without AUDIO_GETFORMAT (NetBSD 8)


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp \
    pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp

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

Modified files:

Index: pkgsrc/audio/jack/distinfo
diff -u pkgsrc/audio/jack/distinfo:1.24 pkgsrc/audio/jack/distinfo:1.25
--- pkgsrc/audio/jack/distinfo:1.24     Thu Sep  9 21:10:18 2021
+++ pkgsrc/audio/jack/distinfo  Thu Sep  9 22:41:43 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2021/09/09 21:10:18 nia Exp $
+$NetBSD: distinfo,v 1.25 2021/09/09 22:41:43 nia Exp $
 
 SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
 RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
@@ -11,9 +11,9 @@ SHA1 (patch-example-clients_wscript) = 9
 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
 SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
 SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
-SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e6c02653840ad02fdee9168796d129504ca29f92
+SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = 03c8fc59afb5a1ecf090eb9e47b3b2d43720da91
 SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d
-SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 43a7126b68076f45292df67f59239c9febf014ff
+SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 78d5bc56a0cbea4bb7f15f0d3c775c69a3ac2a3a
 SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
 SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
 SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e

Index: pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp
diff -u pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.1 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.2
--- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.1   Wed Sep  8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp       Thu Sep  9 22:41:43 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
 
 Add NetBSD support.
 
---- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-08 13:51:19.685213690 +0000
+--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-09 21:08:54.598607823 +0000
 +++ netbsd/sun/JackSunAdapter.cpp
-@@ -0,0 +1,478 @@
+@@ -0,0 +1,490 @@
 +/*
 +Copyright (C) 2008 Grame & RTL 2008
 +
@@ -186,11 +186,17 @@ Add NetBSD support.
 +        return -1;
 +    }
 +
++#ifdef AUDIO_GETFORMAT
 +    if (fCaptureChannels == 0) {
 +        if (ioctl(fInFD, AUDIO_GETFORMAT, &info) != -1) {
 +            fCaptureChannels = info.record.channels;
 +        }
 +    }
++#else
++    if (fCaptureChannels == 0) {
++        fCaptureChannels = 2;
++    }
++#endif
 +
 +    jack_log("JackSunAdapter::OpenInput input fInFD = %d", fInFD);
 +
@@ -246,11 +252,17 @@ Add NetBSD support.
 +        return -1;
 +    }
 +
++#ifdef AUDIO_GETFORMAT
 +    if (fPlaybackChannels == 0) {
 +        if (ioctl(fOutFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fPlaybackChannels = info.play.channels;
 +        }
 +    }
++#else
++    if (fPlaybackChannels == 0) {
++        fPlaybackChannels = 2;
++    }
++#endif
 +
 +    jack_log("JackSunAdapter::OpenOutput input fOutFD = %d", fOutFD);
 +
Index: pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp
diff -u pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.1 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.2
--- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.1    Wed Sep  8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp        Thu Sep  9 22:41:43 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
 
 Add NetBSD support.
 
---- netbsd/sun/JackSunDriver.cpp.orig  2021-09-08 13:51:19.686819398 +0000
+--- netbsd/sun/JackSunDriver.cpp.orig  2021-09-09 21:08:54.658178887 +0000
 +++ netbsd/sun/JackSunDriver.cpp
-@@ -0,0 +1,557 @@
+@@ -0,0 +1,569 @@
 +/*
 +Copyright (C) 2003-2007 Jussi Laako <jussi%sonarnerd.net@localhost>
 +Copyright (C) 2008 Grame & RTL 2008
@@ -114,11 +114,17 @@ Add NetBSD support.
 +        return -1;
 +    }
 +
++#ifdef AUDIO_GETFORMAT
 +    if (fCaptureChannels == 0) {
 +        if (ioctl(fInFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fCaptureChannels = info.record.channels;
 +        }
 +    }
++#else
++    if (fCaptureChannels == 0) {
++        fCaptureChannels = 2;
++    }
++#endif
 +
 +    jack_log("JackSunDriver::OpenInput input fInFD = %d", fInFD);
 +
@@ -172,11 +178,17 @@ Add NetBSD support.
 +        return -1;
 +    }
 +
++#ifdef AUDIO_GETFORMAT
 +    if (fPlaybackChannels == 0) {
 +        if (ioctl(fOutFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fPlaybackChannels = info.play.channels;
 +        }
 +    }
++#else
++    if (fPlaybackChannels == 0) {
++        fPlaybackChannels = 2;
++    }
++#endif
 +
 +    jack_log("JackSunDriver::OpenOutput input fOutFD = %d", fOutFD);
 +