Sun Sep 12 06:04:44 2021 UTC ()
jack: Work around "error: ::vfscanf has not been declared" on NetBSD 9.x


(nia)
diff -r1.26 -r1.27 pkgsrc/audio/jack/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-common_wscript
diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp
diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp
diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-wscript
cvs diff -r1.26 -r1.27 pkgsrc/audio/jack/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/jack/distinfo 2021/09/10 11:14:05 1.26
+++ pkgsrc/audio/jack/distinfo 2021/09/12 06:04:44 1.27
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.26 2021/09/10 11:14:05 nia Exp $ 1$NetBSD: distinfo,v 1.27 2021/09/12 06:04:44 nia Exp $
2 2
3SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f 3SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
4RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8 4RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
5SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d 5SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
6Size (jack2-1.9.19.tar.gz) = 988780 bytes 6Size (jack2-1.9.19.tar.gz) = 988780 bytes
7SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c 7SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c
8SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585 8SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585
9SHA1 (patch-common_wscript) = f68886b688d623a87178eed22e3900109409be69 9SHA1 (patch-common_wscript) = f68886b688d623a87178eed22e3900109409be69
10SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab 10SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
11SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d 11SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
12SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a 12SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
13SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2 13SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
14SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e3d2972dd07919c5de266ae830f043aed2662a2c 14SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = a3680d9dc6bb78c812590f62b1c24a9c78d65b20
15SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d 15SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d
16SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = b3f18de879f2d770547ac534bfd4f5bb64db3017 16SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 7ffa6b659b1df8eee4cfaa3da8d170b0c3f49355
17SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e 17SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
18SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9 18SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
19SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e 19SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e
20SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef 20SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef
21SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 21SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
22SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0 22SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
23SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3 23SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3
24SHA1 (patch-wscript) = 71c9a1c583b864b6d89c081aa0e259ff898e293d 24SHA1 (patch-wscript) = 2d95ee17426992d921c8b2c432abdf39ec2d54c7
cvs diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-common_wscript (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/patch-common_wscript 2021/09/10 11:14:05 1.3
+++ pkgsrc/audio/jack/patches/patch-common_wscript 2021/09/12 06:04:44 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-common_wscript,v 1.3 2021/09/10 11:14:05 nia Exp $ 1$NetBSD: patch-common_wscript,v 1.4 2021/09/12 06:04:44 nia Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- common/wscript.orig 2021-07-15 06:18:26.000000000 +0000 5--- common/wscript.orig 2021-07-15 06:18:26.000000000 +0000
6+++ common/wscript 6+++ common/wscript
7@@ -28,6 +28,8 @@ def create_jack_process_obj(bld, target, 7@@ -28,6 +28,8 @@ def create_jack_process_obj(bld, target,
8 env_includes = ['../macosx', '../posix', '../macosx/coreaudio'] 8 env_includes = ['../macosx', '../posix', '../macosx/coreaudio']
9 if bld.env['IS_LINUX']: 9 if bld.env['IS_LINUX']:
10 env_includes = ['../linux', '../posix', '../linux/alsa'] 10 env_includes = ['../linux', '../posix', '../linux/alsa']
11+ if bld.env['IS_NETBSD']: 11+ if bld.env['IS_NETBSD']:
12+ env_includes = ['../netbsd', '../posix', '../netbsd/sun'] 12+ env_includes = ['../netbsd', '../posix', '../netbsd/sun']
13 if bld.env['IS_SUN']: 13 if bld.env['IS_SUN']:
14 env_includes = ['../solaris', '../posix', '../solaris/oss'] 14 env_includes = ['../solaris', '../posix', '../solaris/oss']
cvs diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp 2021/09/10 11:14:05 1.3
+++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp 2021/09/12 06:04:44 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $ 1$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.4 2021/09/12 06:04:44 nia Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-10 11:08:26.064717543 +0000 5--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-12 05:59:47.131738128 +0000
6+++ netbsd/sun/JackSunAdapter.cpp 6+++ netbsd/sun/JackSunAdapter.cpp
7@@ -0,0 +1,490 @@ 7@@ -0,0 +1,490 @@
8+/* 8+/*
9+Copyright (C) 2008 Grame & RTL 2008 9+Copyright (C) 2008 Grame & RTL 2008
10+ 10+
11+This program is free software; you can redistribute it and/or modify 11+This program is free software; you can redistribute it and/or modify
12+it under the terms of the GNU General Public License as published by 12+it under the terms of the GNU General Public License as published by
13+the Free Software Foundation; either version 2 of the License, or 13+the Free Software Foundation; either version 2 of the License, or
14+(at your option) any later version. 14+(at your option) any later version.
15+ 15+
16+This program is distributed in the hope that it will be useful, 16+This program is distributed in the hope that it will be useful,
17+but WITHOUT ANY WARRANTY; without even the implied warranty of 17+but WITHOUT ANY WARRANTY; without even the implied warranty of
18+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cvs diff -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp 2021/09/10 11:14:05 1.3
+++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp 2021/09/12 06:04:44 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $ 1$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.4 2021/09/12 06:04:44 nia Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- netbsd/sun/JackSunDriver.cpp.orig 2021-09-10 11:08:26.142826553 +0000 5--- netbsd/sun/JackSunDriver.cpp.orig 2021-09-12 05:59:47.195547055 +0000
6+++ netbsd/sun/JackSunDriver.cpp 6+++ netbsd/sun/JackSunDriver.cpp
7@@ -0,0 +1,569 @@ 7@@ -0,0 +1,569 @@
8+/* 8+/*
9+Copyright (C) 2003-2007 Jussi Laako <jussi@sonarnerd.net> 9+Copyright (C) 2003-2007 Jussi Laako <jussi@sonarnerd.net>
10+Copyright (C) 2008 Grame & RTL 2008 10+Copyright (C) 2008 Grame & RTL 2008
11+ 11+
12+This program is free software; you can redistribute it and/or modify 12+This program is free software; you can redistribute it and/or modify
13+it under the terms of the GNU General Public License as published by 13+it under the terms of the GNU General Public License as published by
14+the Free Software Foundation; either version 2 of the License, or 14+the Free Software Foundation; either version 2 of the License, or
15+(at your option) any later version. 15+(at your option) any later version.
16+ 16+
17+This program is distributed in the hope that it will be useful, 17+This program is distributed in the hope that it will be useful,
18+but WITHOUT ANY WARRANTY; without even the implied warranty of 18+but WITHOUT ANY WARRANTY; without even the implied warranty of
cvs diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-wscript (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/patch-wscript 2021/09/10 11:14:05 1.2
+++ pkgsrc/audio/jack/patches/patch-wscript 2021/09/12 06:04:44 1.3
@@ -1,62 +1,74 @@ @@ -1,62 +1,74 @@
1$NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $ 1$NetBSD: patch-wscript,v 1.3 2021/09/12 06:04:44 nia Exp $
2 2
3- Add NetBSD support. 3- Add NetBSD support.
4- Ensure man pages are installed on all Unixes. 4- Ensure man pages are installed on all Unixes.
5 5
6--- wscript.orig 2021-07-15 06:18:26.000000000 +0000 6--- wscript.orig 2021-07-15 06:18:26.000000000 +0000
7+++ wscript 7+++ wscript
8@@ -192,6 +192,7 @@ def detect_platform(conf): 8@@ -192,6 +192,7 @@ def detect_platform(conf):
9 # ('KEY, 'Human readable name', ['strings', 'to', 'check', 'for']) 9 # ('KEY, 'Human readable name', ['strings', 'to', 'check', 'for'])
10 ('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']), 10 ('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']),
11 ('IS_MACOSX', 'MacOS X', ['darwin']), 11 ('IS_MACOSX', 'MacOS X', ['darwin']),
12+ ('IS_NETBSD', 'NetBSD', ['netbsd']), 12+ ('IS_NETBSD', 'NetBSD', ['netbsd']),
13 ('IS_SUN', 'SunOS', ['sunos']), 13 ('IS_SUN', 'SunOS', ['sunos']),
14 ('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32']) 14 ('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32'])
15 ] 15 ]
16@@ -531,6 +532,9 @@ def obj_add_includes(bld, obj): 16@@ -231,6 +232,11 @@ def configure(conf):
 17 conf.env.append_unique('CXXFLAGS', ['-Wall', '-Wno-invalid-offsetof'])
 18 conf.env.append_unique('CXXFLAGS', '-std=gnu++11')
 19
 20+ # Needed to work around "error: ::vfscanf has not been declared" failures
 21+ # prior to NetBSD 9.99.x.
 22+ if conf.env['IS_NETBSD']:
 23+ conf.env.append_unique('CXXFLAGS', '-D_NETBSD_SOURCE')
 24+
 25 if not conf.env['IS_MACOSX']:
 26 conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined')
 27 else:
 28@@ -531,6 +537,9 @@ def obj_add_includes(bld, obj):
17 if bld.env['IS_SUN']: 29 if bld.env['IS_SUN']:
18 obj.includes += ['posix', 'solaris'] 30 obj.includes += ['posix', 'solaris']
19  31
20+ if bld.env['IS_NETBSD']: 32+ if bld.env['IS_NETBSD']:
21+ obj.includes += ['posix', 'netbsd'] 33+ obj.includes += ['posix', 'netbsd']
22+ 34+
23 if bld.env['IS_WINDOWS']: 35 if bld.env['IS_WINDOWS']:
24 obj.includes += ['windows'] 36 obj.includes += ['windows']
25  37
26@@ -678,6 +682,11 @@ def build_drivers(bld): 38@@ -678,6 +687,11 @@ def build_drivers(bld):
27 'windows/portaudio/JackPortAudioDriver.cpp', 39 'windows/portaudio/JackPortAudioDriver.cpp',
28 ] 40 ]
29  41
30+ sun_src = [ 42+ sun_src = [
31+ 'common/memops.c', 43+ 'common/memops.c',
32+ 'netbsd/sun/JackSunDriver.cpp' 44+ 'netbsd/sun/JackSunDriver.cpp'
33+ ] 45+ ]
34+ 46+
35 winmme_src = [ 47 winmme_src = [
36 'windows/winmme/JackWinMMEDriver.cpp', 48 'windows/winmme/JackWinMMEDriver.cpp',
37 'windows/winmme/JackWinMMEInputPort.cpp', 49 'windows/winmme/JackWinMMEInputPort.cpp',
38@@ -779,6 +788,12 @@ def build_drivers(bld): 50@@ -779,6 +793,12 @@ def build_drivers(bld):
39 target = 'oss', 51 target = 'oss',
40 source = oss_src) 52 source = oss_src)
41  53
42+ if bld.env['IS_NETBSD']: 54+ if bld.env['IS_NETBSD']:
43+ create_driver_obj( 55+ create_driver_obj(
44+ bld, 56+ bld,
45+ target = 'sun', 57+ target = 'sun',
46+ source = sun_src) 58+ source = sun_src)
47+ 59+
48 def build(bld): 60 def build(bld):
49 if not bld.variant and bld.env['BUILD_WITH_32_64']: 61 if not bld.variant and bld.env['BUILD_WITH_32_64']:
50 Options.commands.append(bld.cmd + '_' + lib32) 62 Options.commands.append(bld.cmd + '_' + lib32)
51@@ -821,9 +836,10 @@ def build(bld): 63@@ -821,9 +841,10 @@ def build(bld):
52 bld.recurse('tools') 64 bld.recurse('tools')
53  65
54 if bld.env['IS_LINUX']: 66 if bld.env['IS_LINUX']:
55- bld.recurse('man') 67- bld.recurse('man')
56 bld.recurse('systemd') 68 bld.recurse('systemd')
57 if not bld.env['IS_WINDOWS']: 69 if not bld.env['IS_WINDOWS']:
58+ bld.recurse('man') 70+ bld.recurse('man')
59+ if not bld.env['IS_WINDOWS']: 71+ if not bld.env['IS_WINDOWS']:
60 bld.recurse('tests') 72 bld.recurse('tests')
61 if bld.env['BUILD_JACKDBUS']: 73 if bld.env['BUILD_JACKDBUS']:
62 bld.recurse('dbus') 74 bld.recurse('dbus')