jack: Update to 1.9.21 upstream changes: ----------------- 1.9.21 Latest ============= o Add shell mode to jack_control (executes commands from stdin until EOF) o The waf autooption --example-tools introduced in 1.9.20 is now off by default, o To get the previous behavior back pass --example-tools during build. o This flag (and the related tools and their code) are going to be removed in the next release. o Fix alignas() on non-packed architectures o Fix build of jack-example-tools man pages (1.9.20 regression) o Fix compatibility with macOS 12 o Fix missing symbols from jack client library (error and info callback pointers) o Fix potential memory corruption in midi_latency_test tool o Fix JackWeakAPI on Windows o Use predefined variables in pkg-config file (required for mingw) External changes, related to macOS/Windows installer: o Fix application style in QJackCtl (qwindowsvistastyle.dll was missing) o Update QjackCtl used in macOS/Windows installers to 0.9.7 1.9.20 ====== o Add waf autooption --example-tools to allow optional build of executables, libraries and man pages provided by jack-example-tools (the files are built by default). o Building and installing the additional files can be disabled by using --example-tools=no or --no-example-tools. o Fix 32-bit support in ALSA driver o Fix incomplete ASIO support on Windows o Fix metadata usage with multiple users o Fix netsource tool missing on Windows o Fix semaphore usage on macOS o Official FreeBSD support External changes, related to macOS/Windows installer: o Update Qt5 used in macOS/Windows installers to 5.12.12 o Update QjackCtl used in macOS/Windows installers to 0.9.6diff -r1.53 -r1.54 pkgsrc/audio/jack/Makefile
(triaxx)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.53 2022/09/11 12:51:03 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.54 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | DISTNAME= jack2-1.9.19 | 3 | DISTNAME= jack2-1.9.21 | |
4 | PKGNAME= ${DISTNAME:S/jack2/jack/1} | 4 | PKGNAME= ${DISTNAME:S/jack2/jack/1} | |
5 | PKGREVISION= 6 | |||
6 | CATEGORIES= audio | 5 | CATEGORIES= audio | |
7 | MASTER_SITES= ${MASTER_SITE_GITHUB:=jackaudio/} | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=jackaudio/} | |
8 | GITHUB_PROJECT= jack2 | 7 | GITHUB_PROJECT= jack2 | |
9 | GITHUB_TAG= v${PKGVERSION_NOREV} | 8 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
10 | 9 | |||
11 | MAINTAINER= nia@NetBSD.org | 10 | MAINTAINER= nia@NetBSD.org | |
12 | HOMEPAGE= https://jackaudio.org/ | 11 | HOMEPAGE= https://jackaudio.org/ | |
13 | COMMENT= Low-latency audio server | 12 | COMMENT= Low-latency audio server | |
14 | LICENSE= gnu-gpl-v2 | 13 | LICENSE= gnu-gpl-v2 | |
15 | 14 | |||
16 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
17 | USE_TOOLS+= pkg-config bash | 16 | USE_TOOLS+= pkg-config bash | |
18 | 17 | |||
@@ -41,28 +40,26 @@ PLIST.sun= yes | @@ -41,28 +40,26 @@ PLIST.sun= yes | |||
41 | 40 | |||
42 | PLIST_VARS+= darwin | 41 | PLIST_VARS+= darwin | |
43 | .if ${OPSYS} == "Darwin" | 42 | .if ${OPSYS} == "Darwin" | |
44 | PLIST.darwin= yes | 43 | PLIST.darwin= yes | |
45 | 44 | |||
46 | post-install: | 45 | post-install: | |
47 | ${RUN} cd ${DESTDIR}${PREFIX} && \ | 46 | ${RUN} cd ${DESTDIR}${PREFIX} && \ | |
48 | for f in lib/jack/*.so; do \ | 47 | for f in lib/jack/*.so; do \ | |
49 | install_name_tool -id ${PREFIX}/$$f $$f; \ | 48 | install_name_tool -id ${PREFIX}/$$f $$f; \ | |
50 | done | 49 | done | |
51 | .endif | 50 | .endif | |
52 | 51 | |||
53 | REPLACE_PYTHON+= waf | 52 | REPLACE_PYTHON+= waf | |
54 | REPLACE_PYTHON+= tools/jack_control | |||
55 | REPLACE_BASH+= svnversion_regenerate.sh | |||
56 | 53 | |||
57 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | 54 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | |
58 | 55 | |||
59 | PKGCONFIG_OVERRIDE+= jack.pc.in | 56 | PKGCONFIG_OVERRIDE+= jack.pc.in | |
60 | 57 | |||
61 | .include "../../lang/python/application.mk" | 58 | .include "../../lang/python/application.mk" | |
62 | .include "../../devel/waf/waf.mk" | 59 | .include "../../devel/waf/waf.mk" | |
63 | .if ${OPSYS} == "Darwin" | 60 | .if ${OPSYS} == "Darwin" | |
64 | . include "../../audio/aften/buildlink3.mk" | 61 | . include "../../audio/aften/buildlink3.mk" | |
65 | .endif | 62 | .endif | |
66 | .if ${OPSYS} == "Linux" | 63 | .if ${OPSYS} == "Linux" | |
67 | . include "../../audio/alsa-lib/buildlink3.mk" | 64 | . include "../../audio/alsa-lib/buildlink3.mk" | |
68 | .endif | 65 | .endif |
@@ -1,107 +1,47 @@ | @@ -1,107 +1,47 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.15 2022/04/18 15:56:34 schmonz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.16 2023/01/07 21:20:19 triaxx Exp $ | |
2 | ${PLIST.alsa}bin/alsa_in | 2 | ${PLIST.alsa}bin/alsa_in | |
3 | ${PLIST.alsa}bin/alsa_out | 3 | ${PLIST.alsa}bin/alsa_out | |
4 | bin/jack_alias | |||
5 | bin/jack_bufsize | |||
6 | bin/jack_connect | |||
7 | bin/jack_control | |||
8 | bin/jack_cpu | |||
9 | bin/jack_cpu_load | |||
10 | bin/jack_disconnect | |||
11 | bin/jack_evmon | |||
12 | bin/jack_freewheel | |||
13 | bin/jack_iodelay | |||
14 | bin/jack_latent_client | |||
15 | bin/jack_load | |||
16 | bin/jack_lsp | |||
17 | bin/jack_metro | |||
18 | bin/jack_midi_dump | |||
19 | bin/jack_midi_latency_test | |||
20 | bin/jack_midiseq | |||
21 | bin/jack_midisine | |||
22 | bin/jack_monitor_client | |||
23 | bin/jack_multiple_metro | |||
24 | bin/jack_net_master | |||
25 | bin/jack_net_slave | |||
26 | bin/jack_netsource | |||
27 | bin/jack_property | |||
28 | bin/jack_rec | |||
29 | bin/jack_samplerate | |||
30 | bin/jack_server_control | |||
31 | bin/jack_session_notify | |||
32 | bin/jack_showtime | |||
33 | bin/jack_simdtests | |||
34 | bin/jack_simple_client | |||
35 | bin/jack_simple_session_client | |||
36 | bin/jack_test | |||
37 | bin/jack_thru | |||
38 | bin/jack_unload | |||
39 | bin/jack_wait | |||
40 | bin/jack_zombie | |||
41 | bin/jackd | 4 | bin/jackd | |
42 | include/jack/control.h | 5 | include/jack/control.h | |
43 | include/jack/intclient.h | 6 | include/jack/intclient.h | |
44 | include/jack/jack.h | 7 | include/jack/jack.h | |
45 | include/jack/jslist.h | 8 | include/jack/jslist.h | |
46 | include/jack/metadata.h | 9 | include/jack/metadata.h | |
47 | include/jack/midiport.h | 10 | include/jack/midiport.h | |
48 | include/jack/net.h | 11 | include/jack/net.h | |
49 | include/jack/ringbuffer.h | 12 | include/jack/ringbuffer.h | |
50 | include/jack/session.h | 13 | include/jack/session.h | |
51 | include/jack/statistics.h | 14 | include/jack/statistics.h | |
52 | include/jack/systemdeps.h | 15 | include/jack/systemdeps.h | |
53 | include/jack/thread.h | 16 | include/jack/thread.h | |
54 | include/jack/transport.h | 17 | include/jack/transport.h | |
55 | include/jack/types.h | 18 | include/jack/types.h | |
56 | include/jack/uuid.h | 19 | include/jack/uuid.h | |
57 | include/jack/weakjack.h | 20 | include/jack/weakjack.h | |
58 | include/jack/weakmacros.h | 21 | include/jack/weakmacros.h | |
59 | lib/jack/audioadapter.so | 22 | lib/jack/audioadapter.so | |
60 | lib/jack/inprocess.so | |||
61 | ${PLIST.alsa}lib/jack/jack_alsa.so | 23 | ${PLIST.alsa}lib/jack/jack_alsa.so | |
62 | ${PLIST.alsa}lib/jack/jack_alsarawmidi.so | 24 | ${PLIST.alsa}lib/jack/jack_alsarawmidi.so | |
63 | ${PLIST.boomer}lib/jack/jack_boomer.so | 25 | ${PLIST.boomer}lib/jack/jack_boomer.so | |
64 | ${PLIST.darwin}lib/jack/jack_coreaudio.so | 26 | ${PLIST.darwin}lib/jack/jack_coreaudio.so | |
65 | ${PLIST.darwin}lib/jack/jack_coremidi.so | 27 | ${PLIST.darwin}lib/jack/jack_coremidi.so | |
66 | lib/jack/jack_dummy.so | 28 | lib/jack/jack_dummy.so | |
67 | lib/jack/jack_loopback.so | 29 | lib/jack/jack_loopback.so | |
68 | lib/jack/jack_net.so | 30 | lib/jack/jack_net.so | |
69 | lib/jack/jack_netone.so | 31 | lib/jack/jack_netone.so | |
70 | ${PLIST.oss}lib/jack/jack_oss.so | 32 | ${PLIST.oss}lib/jack/jack_oss.so | |
71 | lib/jack/jack_proxy.so | 33 | lib/jack/jack_proxy.so | |
72 | ${PLIST.sun}lib/jack/jack_sun.so | 34 | ${PLIST.sun}lib/jack/jack_sun.so | |
73 | lib/jack/netadapter.so | 35 | lib/jack/netadapter.so | |
74 | lib/jack/netmanager.so | 36 | lib/jack/netmanager.so | |
75 | lib/jack/profiler.so | 37 | lib/jack/profiler.so | |
76 | lib/libjack.so | 38 | lib/libjack.so | |
77 | lib/libjack.so.0 | 39 | lib/libjack.so.0 | |
78 | lib/libjack.so.0.1.0 | 40 | lib/libjack.so.0.1.0 | |
79 | lib/libjacknet.so | 41 | lib/libjacknet.so | |
80 | lib/libjacknet.so.0 | 42 | lib/libjacknet.so.0 | |
81 | lib/libjacknet.so.0.1.0 | 43 | lib/libjacknet.so.0.1.0 | |
82 | lib/libjackserver.so | 44 | lib/libjackserver.so | |
83 | lib/libjackserver.so.0 | 45 | lib/libjackserver.so.0 | |
84 | lib/libjackserver.so.0.1.0 | 46 | lib/libjackserver.so.0.1.0 | |
85 | lib/pkgconfig/jack.pc | 47 | lib/pkgconfig/jack.pc | |
86 | man/man1/alsa_in.1 | |||
87 | man/man1/alsa_out.1 | |||
88 | man/man1/jack_bufsize.1 | |||
89 | man/man1/jack_connect.1 | |||
90 | man/man1/jack_disconnect.1 | |||
91 | man/man1/jack_freewheel.1 | |||
92 | man/man1/jack_impulse_grabber.1 | |||
93 | man/man1/jack_iodelay.1 | |||
94 | man/man1/jack_load.1 | |||
95 | man/man1/jack_lsp.1 | |||
96 | man/man1/jack_metro.1 | |||
97 | man/man1/jack_monitor_client.1 | |||
98 | man/man1/jack_netsource.1 | |||
99 | man/man1/jack_property.1 | |||
100 | man/man1/jack_samplerate.1 | |||
101 | man/man1/jack_showtime.1 | |||
102 | man/man1/jack_simple_client.1 | |||
103 | man/man1/jack_transport.1 | |||
104 | man/man1/jack_unload.1 | |||
105 | man/man1/jack_wait.1 | |||
106 | man/man1/jackd.1 | |||
107 | man/man1/jackrec.1 |
@@ -1,27 +1,28 @@ | @@ -1,27 +1,28 @@ | |||
1 | $NetBSD: distinfo,v 1.34 2023/01/07 19:04:34 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.35 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | BLAKE2s (jack2-1.9.19.tar.gz) = aa43a3ae606c00e7c8e047e89250e068717f44fa0443b8531a6d83ca2a9dff71 | 3 | BLAKE2s (jack2-1.9.21.tar.gz) = c4f0db4449051bad70a61ab62e67eea5874457459ad6d6866cf4b1efb127119c | |
4 | SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d | 4 | SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 | |
5 | Size (jack2-1.9.19.tar.gz) = 988780 bytes | 5 | Size (jack2-1.9.21.tar.gz) = 1006157 bytes | |
6 | SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c | 6 | SHA1 (patch-common_JackAudioAdapterFactory.cpp) = b66c601cfcd565dbabcbac4747f9d1b17a2241ff | |
7 | SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585 | 7 | SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585 | |
8 | SHA1 (patch-common_wscript) = 0f52fd48cd45c08c18650b7a0770ef76ac193362 | 8 | SHA1 (patch-common_wscript) = 9f229c13f1950b244a2631f486e5ff734b1ed356 | |
9 | SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab | 9 | SHA1 (patch-example-clients_wscript) = d08cd1552925126e28ed4204cda87ebb12ddcd24 | |
10 | SHA1 (patch-man_wscript) = bc5ce9481d4c911350f260c069a0ce4be732f526 | 10 | SHA1 (patch-man_fill__template) = b101ef707733d0d9d78de812a564a17345bee5e1 | |
11 | SHA1 (patch-man_wscript) = 05f58e1a46d22ec3b5f74ed72ebbe44164e50006 | |||
11 | SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d | 12 | SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d | |
12 | SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a | 13 | SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a | |
13 | SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2 | 14 | SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2 | |
14 | SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = a3680d9dc6bb78c812590f62b1c24a9c78d65b20 | 15 | SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = a3680d9dc6bb78c812590f62b1c24a9c78d65b20 | |
15 | SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d | 16 | SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d | |
16 | SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 7ffa6b659b1df8eee4cfaa3da8d170b0c3f49355 | 17 | SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 7ffa6b659b1df8eee4cfaa3da8d170b0c3f49355 | |
17 | SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e | 18 | SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e | |
18 | SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9 | 19 | SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9 | |
19 | SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e | 20 | SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e | |
20 | SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef | 21 | SHA1 (patch-posix_JackPosixSemaphore.cpp) = 7d02f92dd6054014abf13ad1fd3aa7d8681990db | |
21 | SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3 | 22 | SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3 | |
22 | SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 | 23 | SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 | |
23 | SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0 | 24 | SHA1 (patch-tests_wscript) = d79f0c5fefed422c36a3571fce7188a799e57a5d | |
24 | SHA1 (patch-tools_wscript) = fab7472b29fc6e46ba1e8ca94c12aa8808b075da | 25 | SHA1 (patch-tools_wscript) = 67c4b8d4162c3bce737fcb5ee69314b4f6833fc1 | |
25 | SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0 | 26 | SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0 | |
26 | SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da | 27 | SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da | |
27 | SHA1 (patch-wscript) = a49c6e7ebd84bb5156576351308676b0b3486492 | 28 | SHA1 (patch-wscript) = 758ac2e0519d3529e2d5a7214ce1c12a10a5f397 |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | # $NetBSD: platform.mk,v 1.4 2023/01/07 19:04:34 wiz Exp $ | 1 | # $NetBSD: platform.mk,v 1.5 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | .if !defined(PLATFORM_SUPPORTS_JACK) | 3 | .if !defined(PLATFORM_SUPPORTS_JACK) | |
4 | . include "../../mk/bsd.fast.prefs.mk" | 4 | . include "../../mk/bsd.fast.prefs.mk" | |
5 | 5 | |||
6 | JACK_PLATFORMS+= Darwin-*-* | 6 | JACK_PLATFORMS+= Darwin-*-* | |
7 | JACK_PLATFORMS+= Linux-*-* | 7 | JACK_PLATFORMS+= Linux-*-* | |
8 | 8 | |||
9 | . if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 | 9 | . if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 | |
10 | PLATFORM_SUPPORTS_JACK= yes | 10 | PLATFORM_SUPPORTS_JACK= yes | |
11 | . endif | 11 | . endif | |
12 | 12 | |||
13 | . for _jack_platform in ${JACK_PLATFORMS} | 13 | . for jack_platform in ${JACK_PLATFORMS} | |
14 | . if !empty(MACHINE_PLATFORM:M${_jack_platform}) | 14 | . if !empty(MACHINE_PLATFORM:M${jack_platform}) | |
15 | PLATFORM_SUPPORTS_JACK= yes | 15 | PLATFORM_SUPPORTS_JACK= yes | |
16 | . endif | 16 | . endif | |
17 | . endfor | 17 | . endfor | |
18 | 18 | |||
19 | PLATFORM_SUPPORTS_JACK?= no | 19 | PLATFORM_SUPPORTS_JACK?= no | |
20 | 20 | |||
21 | .endif # !defined(PLATFORM_SUPPORTS_JACK) | 21 | .endif # !defined(PLATFORM_SUPPORTS_JACK) |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $ | 1 | $NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.2 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | Add NetBSD support. | 3 | Add NetBSD support. | |
4 | 4 | |||
5 | --- common/JackAudioAdapterFactory.cpp.orig 2021-07-15 06:18:26.000000000 +0000 | 5 | --- common/JackAudioAdapterFactory.cpp.orig 2022-04-15 19:14:06.000000000 +0000 | |
6 | +++ common/JackAudioAdapterFactory.cpp | 6 | +++ common/JackAudioAdapterFactory.cpp | |
7 | @@ -35,6 +35,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg | 7 | @@ -35,6 +35,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg | |
8 | #define JackPlatformAdapter JackAlsaAdapter | 8 | #define JackPlatformAdapter JackAlsaAdapter | |
9 | #endif | 9 | #endif | |
10 | 10 | |||
11 | +#ifdef __NetBSD__ | 11 | +#ifdef __NetBSD__ | |
12 | +#include "JackSunAdapter.h" | 12 | +#include "JackSunAdapter.h" | |
13 | +#define JackPlatformAdapter JackSunAdapter | 13 | +#define JackPlatformAdapter JackSunAdapter | |
14 | +#endif | 14 | +#endif | |
15 | + | 15 | + | |
16 | #if defined(__sun__) || defined(sun) | 16 | #if defined(__sun__) || defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) | |
17 | #include "JackOSSAdapter.h" | 17 | #include "JackOSSAdapter.h" | |
18 | #define JackPlatformAdapter JackOSSAdapter | 18 | #define JackPlatformAdapter JackOSSAdapter |
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | $NetBSD: patch-example-clients_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $ | 1 | $NetBSD: patch-example-clients_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | Add NetBSD support. | 3 | Add NetBSD support. | |
4 | 4 | |||
5 | --- example-clients/wscript.orig 2021-07-15 06:18:26.000000000 +0000 | 5 | --- example-clients/wscript.orig 2022-04-15 19:14:06.000000000 +0000 | |
6 | +++ example-clients/wscript | 6 | +++ example-clients/wscript | |
7 | @@ -33,6 +33,8 @@ def build(bld): | 7 | @@ -35,6 +35,8 @@ def build(bld): | |
8 | os_incdir = ['../macosx', '../posix'] | 8 | os_incdir = ['../macosx', '../posix'] | |
9 | if bld.env['IS_SUN']: | 9 | if bld.env['IS_FREEBSD']: | |
10 | os_incdir = ['../solaris', '../posix'] | 10 | os_incdir = ['../freebsd', '../posix'] | |
11 | + if bld.env['IS_NETBSD']: | 11 | + if bld.env['IS_NETBSD']: | |
12 | + os_incdir = ['../netbsd', '../posix'] | 12 | + os_incdir = ['../netbsd', '../posix'] | |
13 | if bld.env['IS_SUN']: | |||
14 | os_incdir = ['../solaris', '../posix'] | |||
13 | if bld.env['IS_WINDOWS']: | 15 | if bld.env['IS_WINDOWS']: | |
14 | os_incdir = ['../windows'] | 16 | @@ -67,6 +69,8 @@ def build(bld): | |
15 | for example_program, example_program_source in list(example_programs.items()): | |||
16 | @@ -58,6 +60,8 @@ def build(bld): | |||
17 | prog.use = use | 17 | prog.use = use | |
18 | if bld.env['IS_LINUX']: | 18 | if bld.env['IS_LINUX']: | |
19 | prog.use += ['RT', 'M'] | 19 | prog.use += ['RT', 'M'] | |
20 | + if bld.env['IS_NETBSD']: | 20 | + if bld.env['IS_NETBSD']: | |
21 | + prog.use += ['RT', 'M'] | 21 | + prog.use += ['RT', 'M'] | |
22 | if bld.env['IS_SUN']: | 22 | if bld.env['IS_SUN']: | |
23 | prog.use += ['M'] | 23 | prog.use += ['M'] | |
24 | if bld.env['IS_WINDOWS'] and bld.env['BUILD_STATIC']: | 24 | if bld.env['IS_FREEBSD']: | |
25 | @@ -76,6 +80,8 @@ def build(bld): | 25 | @@ -87,6 +91,8 @@ def build(bld): | |
26 | prog.use += ['SNDFILE'] | |||
27 | if bld.env['IS_LINUX']: | |||
28 | prog.use += ['RT', 'SNDFILE'] | 26 | prog.use += ['RT', 'SNDFILE'] | |
27 | if bld.env['IS_FREEBSD']: | |||
28 | prog.use += ['SNDFILE'] | |||
29 | + if bld.env['IS_NETBSD']: | 29 | + if bld.env['IS_NETBSD']: | |
30 | + prog.use += ['RT', 'SNDFILE'] | 30 | + prog.use += ['RT', 'SNDFILE'] | |
31 | if bld.env['IS_SUN']: | 31 | if bld.env['IS_SUN']: | |
32 | prog.use += ['RT', 'SNDFILE'] | 32 | prog.use += ['RT', 'SNDFILE'] | |
33 | if bld.env['IS_WINDOWS']: | 33 | if bld.env['IS_WINDOWS']: |
@@ -1,13 +1,12 @@ | @@ -1,13 +1,12 @@ | |||
1 | $NetBSD: patch-man_wscript,v 1.1 2021/09/15 07:44:37 schmonz Exp $ | 1 | $NetBSD: patch-man_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | Follow hier(7). | 3 | Follow hier(7). | |
4 | 4 | |||
5 | --- man/wscript.orig 2021-07-15 06:18:26.000000000 +0000 | 5 | --- man/wscript.orig 2022-04-15 19:14:06.000000000 +0000 | |
6 | +++ man/wscript | 6 | +++ man/wscript | |
7 | @@ -7,5 +7,5 @@ import os | 7 | @@ -7,4 +7,4 @@ def build(bld): | |
8 | 8 | bld.env['JACK_VERSION'], | ||
9 | def build(bld): | 9 | bld.env['BUILD_JACK_EXAMPLE_TOOLS']) | |
10 | bld.exec_command('cd man ; sh fill_template %s' % bld.env['JACK_VERSION']) | 10 | ) | |
11 | - bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1')) | 11 | - bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1')) | |
12 | + bld.install_files(bld.env['MANDIR'] + '/man1', bld.path.ant_glob('*.1')) | 12 | + bld.install_files(bld.env['MANDIR'] + '/man1', bld.path.ant_glob('*.1')) | |
13 |
@@ -1,24 +1,16 @@ | @@ -1,24 +1,16 @@ | |||
1 | $NetBSD: patch-posix_JackPosixSemaphore.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $ | 1 | $NetBSD: patch-posix_JackPosixSemaphore.cpp,v 1.2 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | NetBSD requires POSIX semaphores to be prefixed with | 3 | NetBSD requires POSIX semaphores to be prefixed with | |
4 | a slash, see sem_open(3). | 4 | a slash, see sem_open(3). | |
5 | 5 | |||
6 | --- posix/JackPosixSemaphore.cpp.orig 2021-07-15 06:18:26.000000000 +0000 | 6 | --- posix/JackPosixSemaphore.cpp.orig 2022-04-15 19:14:06.000000000 +0000 | |
7 | +++ posix/JackPosixSemaphore.cpp | 7 | +++ posix/JackPosixSemaphore.cpp | |
8 | @@ -46,13 +46,13 @@ void JackPosixSemaphore::BuildName(const | 8 | @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit | |
9 | { | 9 | #include "promiscuous.h" | |
10 | char ext_client_name[SYNC_MAX_NAME_SIZE + 1]; | |||
11 | JackTools::RewriteName(client_name, ext_client_name); | |||
12 | -#if __APPLE__ // POSIX semaphore names are limited to 32 characters... | |||
13 | +#if __APPLE__ // POSIX semaphore names are limited to 32 characters... | |||
14 | snprintf(res, 32, "js_%s", ext_client_name); | |||
15 | #else | |||
16 | if (fPromiscuous) { | |||
17 | - snprintf(res, size, "jack_sem.%s_%s", server_name, ext_client_name); | |||
18 | + snprintf(res, size, "/jack_sem.%s_%s", server_name, ext_client_name); | |||
19 | } else { | |||
20 | - snprintf(res, size, "jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name); | |||
21 | + snprintf(res, size, "/jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name); | |||
22 | } | |||
23 | #endif | 10 | #endif | |
24 | } | 11 | ||
12 | -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) | |||
13 | +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) | |||
14 | #define JACK_SEM_PREFIX "/jack_sem" | |||
15 | #define SEM_DEFAULT_O 0 | |||
16 | #else |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-tests_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $ | 1 | $NetBSD: patch-tests_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | Add NetBSD support. | 3 | Add NetBSD support. | |
4 | 4 | |||
5 | --- tests/wscript.orig 2021-07-15 06:18:26.000000000 +0000 | 5 | --- tests/wscript.orig 2022-04-15 19:14:06.000000000 +0000 | |
6 | +++ tests/wscript | 6 | +++ tests/wscript | |
7 | @@ -20,6 +20,8 @@ def build(bld): | 7 | @@ -23,6 +23,8 @@ def build(bld): | |
8 | prog.includes = ['..','../macosx', '../posix', '../common/jack', '../common'] | 8 | prog.includes = ['..', '../linux', '../posix', '../common/jack', '../common'] | |
9 | if bld.env['IS_LINUX']: | 9 | if bld.env['IS_FREEBSD']: | |
10 | prog.includes = ['..','../linux', '../posix', '../common/jack', '../common'] | 10 | prog.includes = ['..', '../freebsd', '../posix', '../common/jack', '../common'] | |
11 | + if bld.env['IS_NETBSD']: | 11 | + if bld.env['IS_NETBSD']: | |
12 | + prog.includes = ['..','../netbsd', '../posix', '../common/jack', '../common'] | 12 | + prog.includes = ['..','../netbsd', '../posix', '../common/jack', '../common'] | |
13 | if bld.env['IS_SUN']: | 13 | if bld.env['IS_SUN']: | |
14 | prog.includes = ['..','../solaris', '../posix', '../common/jack', '../common'] | 14 | prog.includes = ['..', '../solaris', '../posix', '../common/jack', '../common'] | |
15 | prog.source = test_program_sources | 15 | prog.source = test_program_sources |
@@ -1,153 +1,166 @@ | @@ -1,153 +1,166 @@ | |||
1 | $NetBSD: patch-common_wscript,v 1.6 2023/01/07 19:04:34 wiz Exp $ | 1 | $NetBSD: patch-common_wscript,v 1.7 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | Add NetBSD support. | 3 | Add NetBSD support. | |
4 | 4 | |||
5 | --- common/wscript.orig 2021-07-15 06:18:26.000000000 +0000 | 5 | --- common/wscript.orig 2022-04-15 19:14:06.000000000 +0000 | |
6 | +++ common/wscript | 6 | +++ common/wscript | |
7 | @@ -28,6 +28,8 @@ def create_jack_process_obj(bld, target, | 7 | @@ -31,6 +31,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_FREEBSD']: | |||
14 | env_includes = ['../freebsd', '../posix', '../solaris/oss'] | |||
13 | if bld.env['IS_SUN']: | 15 | if bld.env['IS_SUN']: | |
14 | env_includes = ['../solaris', '../posix', '../solaris/oss'] | 16 | @@ -41,7 +43,7 @@ def create_jack_process_obj(bld, target, | |
15 | if bld.env['IS_WINDOWS']: | 17 | process.name = target | |
16 | @@ -36,7 +38,7 @@ def create_jack_process_obj(bld, target, | 18 | process.target = target | |
17 | process.name = target | 19 | process.source = sources | |
18 | process.target = target | 20 | - if bld.env['IS_LINUX'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']: | |
19 | process.source = sources | 21 | + if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']: | |
20 | - if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']: | |||
21 | + if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX']: | |||
22 | process.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 22 | process.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
23 | process.install_path = '${ADDON_DIR}/' | 23 | process.install_path = '${ADDON_DIR}/' | |
24 | process.use = [uselib.name] | 24 | process.use = [uselib.name] | |
25 | @@ -92,6 +94,21 @@ def build(bld): | 25 | @@ -98,6 +100,21 @@ def build(bld): | |
26 | uselib.append('RT') | 26 | uselib.append('RT') | |
27 | uselib.append('DL') | 27 | uselib.append('DL') | |
28 | 28 | |||
29 | + if bld.env['IS_NETBSD']: | 29 | + if bld.env['IS_NETBSD']: | |
30 | + common_libsources += [ | 30 | + common_libsources += [ | |
31 | + 'JackDebugClient.cpp', | 31 | + 'JackDebugClient.cpp', | |
32 | + 'timestamps.c', | 32 | + 'timestamps.c', | |
33 | + 'promiscuous.c', | 33 | + 'promiscuous.c', | |
34 | + '../posix/JackPosixThread.cpp', | 34 | + '../posix/JackPosixThread.cpp', | |
35 | + '../posix/JackPosixSemaphore.cpp', | 35 | + '../posix/JackPosixSemaphore.cpp', | |
36 | + '../posix/JackPosixProcessSync.cpp', | 36 | + '../posix/JackPosixProcessSync.cpp', | |
37 | + '../posix/JackPosixMutex.cpp', | 37 | + '../posix/JackPosixMutex.cpp', | |
38 | + '../posix/JackSocket.cpp', | 38 | + '../posix/JackSocket.cpp', | |
39 | + '../netbsd/JackNetBSDTime.c', | 39 | + '../netbsd/JackNetBSDTime.c', | |
40 | + ] | 40 | + ] | |
41 | + includes = ['../netbsd', '../posix'] + includes | 41 | + includes = ['../netbsd', '../posix'] + includes | |
42 | + uselib.append('RT') | 42 | + uselib.append('RT') | |
43 | + | 43 | + | |
44 | if bld.env['IS_SUN']: | 44 | if bld.env['IS_FREEBSD']: | |
45 | common_libsources += [ | 45 | common_libsources += [ | |
46 | 'JackDebugClient.cpp', | 46 | 'JackDebugClient.cpp', | |
47 | @@ -176,6 +193,12 @@ def build(bld): | 47 | @@ -197,6 +214,12 @@ def build(bld): | |
48 | '../posix/JackPosixServerLaunch.cpp', | 48 | '../posix/JackPosixServerLaunch.cpp', | |
49 | ] | 49 | ] | |
50 | 50 | |||
51 | + if bld.env['IS_NETBSD']: | 51 | + if bld.env['IS_NETBSD']: | |
52 | + clientlib.source += [ | 52 | + clientlib.source += [ | |
53 | + '../posix/JackSocketClientChannel.cpp', | 53 | + '../posix/JackSocketClientChannel.cpp', | |
54 | + '../posix/JackPosixServerLaunch.cpp', | 54 | + '../posix/JackPosixServerLaunch.cpp', | |
55 | + ] | 55 | + ] | |
56 | + | 56 | + | |
57 | if bld.env['IS_SUN']: | 57 | if bld.env['IS_FREEBSD']: | |
58 | clientlib.source += [ | 58 | clientlib.source += [ | |
59 | '../posix/JackSocketClientChannel.cpp', | 59 | '../posix/JackSocketClientChannel.cpp', | |
60 | @@ -205,12 +228,16 @@ def build(bld): | 60 | @@ -232,6 +255,9 @@ def build(bld): | |
61 | if bld.env['IS_LINUX']: | 61 | if bld.env['IS_LINUX']: | |
62 | clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 62 | clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
63 | 63 | |||
64 | + if bld.env['IS_NETBSD']: | 64 | + if bld.env['IS_NETBSD']: | |
65 | + clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 65 | + clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
66 | + | 66 | + | |
67 | if bld.env['IS_MACOSX']: | 67 | if bld.env['IS_FREEBSD']: | |
68 | clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 68 | clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
69 | ||||
70 | @@ -240,7 +266,8 @@ def build(bld): | |||
69 | clientlib.env.append_value('LINKFLAGS', '-single_module') | 71 | clientlib.env.append_value('LINKFLAGS', '-single_module') | |
70 | 72 | |||
71 | if bld.env['IS_SUN']: | 73 | if bld.env['IS_SUN']: | |
72 | - clientlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') | 74 | - clientlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') | |
73 | + clientlib.env.append_value('LINKFLAGS', '-lnsl') | 75 | + clientlib.env.append_value('LINKFLAGS', '-lnsl') | |
74 | + clientlib.env.append_value('LINKFLAGS', '-lsocket') | 76 | + clientlib.env.append_value('LINKFLAGS', '-lsocket') | |
75 | 77 | |||
76 | if bld.variant: | 78 | if bld.variant: | |
77 | # if there is variant defined, we expect it to be the 32bit client lib one | 79 | # if there is variant defined, we expect it to be the 32bit client lib one | |
78 | @@ -281,6 +308,14 @@ def build(bld): | 80 | @@ -311,6 +338,14 @@ def build(bld): | |
79 | '../posix/JackNetUnixSocket.cpp', | 81 | '../posix/JackNetUnixSocket.cpp', | |
80 | ] | 82 | ] | |
81 | 83 | |||
82 | + if bld.env['IS_NETBSD']: | 84 | + if bld.env['IS_NETBSD']: | |
83 | + serverlib.source += [ | 85 | + serverlib.source += [ | |
84 | + '../posix/JackSocketServerChannel.cpp', | 86 | + '../posix/JackSocketServerChannel.cpp', | |
85 | + '../posix/JackSocketNotifyChannel.cpp', | 87 | + '../posix/JackSocketNotifyChannel.cpp', | |
86 | + '../posix/JackSocketServerNotifyChannel.cpp', | 88 | + '../posix/JackSocketServerNotifyChannel.cpp', | |
87 | + '../posix/JackNetUnixSocket.cpp', | 89 | + '../posix/JackNetUnixSocket.cpp', | |
88 | + ] | 90 | + ] | |
89 | + | 91 | + | |
90 | if bld.env['IS_SUN']: | 92 | if bld.env['IS_FREEBSD']: | |
91 | serverlib.source += [ | 93 | serverlib.source += [ | |
92 | '../posix/JackSocketServerChannel.cpp', | 94 | '../posix/JackSocketServerChannel.cpp', | |
93 | @@ -313,15 +348,21 @@ def build(bld): | 95 | @@ -351,15 +386,21 @@ def build(bld): | |
94 | elif not bld.env['IS_WINDOWS']: | 96 | elif not bld.env['IS_WINDOWS']: | |
95 | serverlib.vnum = bld.env['JACK_API_VERSION'] | 97 | serverlib.vnum = bld.env['JACK_API_VERSION'] | |
96 | 98 | |||
97 | + serverlib.env.append_value('LINKFLAGS', '-lsamplerate') | 99 | + serverlib.env.append_value('LINKFLAGS', '-lsamplerate') | |
98 | + | 100 | + | |
99 | if bld.env['IS_LINUX']: | 101 | if bld.env['IS_LINUX']: | |
100 | serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 102 | serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
101 | 103 | |||
102 | + if bld.env['IS_NETBSD']: | 104 | + if bld.env['IS_NETBSD']: | |
103 | + serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 105 | + serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
104 | + | 106 | + | |
105 | if bld.env['IS_MACOSX']: | 107 | if bld.env['IS_MACOSX']: | |
106 | serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 108 | serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
107 | serverlib.env.append_value('LINKFLAGS', '-single_module') | 109 | serverlib.env.append_value('LINKFLAGS', '-single_module') | |
108 | 110 | |||
109 | if bld.env['IS_SUN']: | 111 | if bld.env['IS_SUN']: | |
110 | - serverlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') | 112 | - serverlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') | |
111 | + serverlib.env.append_value('LINKFLAGS', '-lnsl') | 113 | + serverlib.env.append_value('LINKFLAGS', '-lnsl') | |
112 | + serverlib.env.append_value('LINKFLAGS', '-lsocket') | 114 | + serverlib.env.append_value('LINKFLAGS', '-lsocket') | |
113 | 115 | |||
114 | if bld.env['BUILD_NETLIB']: | 116 | if bld.env['BUILD_NETLIB']: | |
115 | netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) | 117 | netlib = bld(features=['c', 'cxx', 'cxxshlib', 'cshlib']) | |
116 | @@ -360,10 +401,15 @@ def build(bld): | 118 | @@ -403,6 +444,15 @@ def build(bld): | |
117 | netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../linux/JackLinuxTime.c'] | 119 | ] | |
118 | netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 120 | netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
119 | 121 | |||
120 | + if bld.env['IS_NETBSD']: | 122 | + if bld.env['IS_NETBSD']: | |
121 | + netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../netbsd/JackNetBSDTime.c'] | 123 | + netlib.source += [ | |
124 | + '../posix/JackNetUnixSocket.cpp', | |||
125 | + '../posix/JackPosixThread.cpp', | |||
126 | + '../posix/JackPosixMutex.cpp', | |||
127 | + '../netbsd/JackNetBSDTime.c' | |||
128 | + ] | |||
122 | + netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 129 | + netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
123 | + | 130 | + | |
124 | if bld.env['IS_SUN']: | 131 | if bld.env['IS_FREEBSD']: | |
125 | netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../solaris/JackSolarisTime.c'] | 132 | netlib.source += [ | |
133 | '../posix/JackNetUnixSocket.cpp', | |||
134 | @@ -420,6 +470,8 @@ def build(bld): | |||
135 | '../solaris/JackSolarisTime.c', | |||
136 | ] | |||
126 | netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | 137 | netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') | |
127 | - | |||
128 | + netlib.env.append_value('LINKFLAGS', '-lnsl') | 138 | + netlib.env.append_value('LINKFLAGS', '-lnsl') | |
129 | + netlib.env.append_value('LINKFLAGS', '-lsocket') | 139 | + netlib.env.append_value('LINKFLAGS', '-lsocket') | |
130 | 140 | |||
131 | if bld.env['IS_MACOSX']: | 141 | if bld.env['IS_MACOSX']: | |
132 | netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../macosx/JackMachThread.mm', '../macosx/JackMachTime.c'] | 142 | netlib.source += [ | |
133 | @@ -422,10 +468,20 @@ def build(bld): | 143 | @@ -490,11 +542,23 @@ def build(bld): | |
134 | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | 144 | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | |
135 | process.use += ['ALSA', 'SAMPLERATE'] | 145 | process.use += ['ALSA', 'SAMPLERATE'] | |
136 | 146 | |||
137 | + if bld.env['BUILD_ADAPTER'] and bld.env['IS_NETBSD']: | 147 | + if bld.env['BUILD_ADAPTER'] and bld.env['IS_NETBSD']: | |
138 | + audio_adapter_sources += ['../netbsd/sun/JackSunAdapter.cpp'] | 148 | + audio_adapter_sources += ['../netbsd/sun/JackSunAdapter.cpp'] | |
139 | + process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | 149 | + process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | |
140 | + process.env.append_value('LINKFLAGS', '-lsamplerate') | 150 | + process.env.append_value('LINKFLAGS', '-lsamplerate') | |
141 | + process.use += 'SAMPLERATE' | 151 | + process.use += 'SAMPLERATE' | |
142 | + | 152 | + | |
143 | if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: | 153 | if bld.env['BUILD_ADAPTER'] and (bld.env['IS_SUN'] or bld.env['IS_FREEBSD']): | |
144 | audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c'] | 154 | audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c'] | |
145 | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | 155 | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | |
146 | process.use += 'SAMPLERATE' | 156 | process.use += 'SAMPLERATE' | |
157 | ||||
158 | + if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: | |||
147 | + process.env.append_value('LINKFLAGS', '-lsamplerate') | 159 | + process.env.append_value('LINKFLAGS', '-lsamplerate') | |
148 | + # This is clearly bogus and should be coming from the main flags but it is | 160 | + # This is clearly bogus and should be coming from the main flags but it is | |
149 | + # far too painful to try and trace why it is not, so a hack it is for now. | 161 | + # far too painful to try and trace why it is not, so a hack it is for now. | |
150 | + process.env.append_value('CFLAGS', '-fPIC') | 162 | + process.env.append_value('CFLAGS', '-fPIC') | |
151 | 163 | + | ||
152 | if bld.env['BUILD_ADAPTER'] and bld.env['IS_WINDOWS']: | 164 | if bld.env['BUILD_ADAPTER'] and bld.env['IS_WINDOWS']: | |
153 | audio_adapter_sources += ['../windows/portaudio/JackPortAudioAdapter.cpp', '../windows/portaudio/JackPortAudioDevices.cpp'] | 165 | audio_adapter_sources += [ | |
166 | '../windows/portaudio/JackPortAudioAdapter.cpp', |
$NetBSD: patch-man_fill__template,v 1.1 2023/01/07 21:20:19 triaxx Exp $
Fix non portable shell test.
--- man/fill_template.orig 2022-04-15 19:14:06.000000000 +0000
+++ man/fill_template
@@ -2,7 +2,7 @@
d=""
[ -z "$SOURCE_DATE_EPOCH" ] || d=--date=@$SOURCE_DATE_EPOCH
-if [ "$2" == "True" ]; then
+if [ "$2" = "True" ]; then
for i in *.0 ; do
sed -e "s/!VERSION!/${1}/g" -e "s/!DATE!/`date $d '+%B %Y'`/g" < ${i} > ${i%%0}1
done
@@ -1,35 +1,26 @@ | @@ -1,35 +1,26 @@ | |||
1 | $NetBSD: patch-tools_wscript,v 1.3 2021/10/21 13:45:12 jperkin Exp $ | 1 | $NetBSD: patch-tools_wscript,v 1.4 2023/01/07 21:20:19 triaxx Exp $ | |
2 | 2 | |||
3 | - Add NetBSD support. | 3 | - Add NetBSD support. | |
4 | - Ensure jack_netsource is built on all Unixes. | 4 | - Ensure jack_netsource is built on all Unixes. | |
5 | 5 | |||
6 | --- tools/wscript.orig 2021-07-15 06:18:26.000000000 +0000 | 6 | --- tools/wscript.orig 2022-04-15 19:14:06.000000000 +0000 | |
7 | +++ tools/wscript | 7 | +++ tools/wscript | |
8 | @@ -30,6 +30,8 @@ def build(bld): | 8 | @@ -35,6 +35,8 @@ def build(bld): | |
9 | os_incdir = ['../macosx', '../posix'] | 9 | os_incdir = ['../freebsd', '../posix'] | |
10 | if bld.env['IS_SUN']: | 10 | if bld.env['IS_SUN']: | |
11 | os_incdir = ['../solaris', '../posix'] | 11 | os_incdir = ['../solaris', '../posix'] | |
12 | + if bld.env['IS_NETBSD']: | 12 | + if bld.env['IS_NETBSD']: | |
13 | + os_incdir = ['../netbsd', '../posix'] | 13 | + os_incdir = ['../netbsd', '../posix'] | |
14 | if bld.env['IS_WINDOWS']: | 14 | if bld.env['IS_WINDOWS']: | |
15 | os_incdir = ['../windows'] | 15 | os_incdir = ['../windows'] | |
16 | for example_tool, example_tool_source in list(example_tools.items()): | 16 | for example_tool, example_tool_source in list(example_tools.items()): | |
17 | @@ -66,7 +68,7 @@ def build(bld): | 17 | @@ -79,6 +81,9 @@ def build(bld): | |
18 | prog.env['LIB_PTHREAD'] = [':libwinpthread.a'] | |||
19 | prog.target = 'jack_transport' | |||
20 | ||||
21 | - if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']: | |||
22 | + if not bld.env['IS_WINDOWS']: | |||
23 | prog = bld(features = 'c cprogram') | |||
24 | prog.includes = os_incdir + ['.', '..', '../common/jack', '../common'] | |||
25 | prog.source = ['netsource.c', '../common/netjack_packet.c'] | |||
26 | @@ -74,6 +76,9 @@ def build(bld): | |||
27 | prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib'] | 18 | prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib'] | |
28 | prog.target = 'jack_netsource' | 19 | prog.target = 'jack_netsource' | |
29 | prog.defines = ['HAVE_CONFIG_H'] | 20 | prog.defines = ['HAVE_CONFIG_H'] | |
30 | + if bld.env['IS_SUN']: | 21 | + if bld.env['IS_SUN']: | |
31 | + prog.env.append_value('LINKFLAGS', '-lnsl') | 22 | + prog.env.append_value('LINKFLAGS', '-lnsl') | |
32 | + prog.env.append_value('LINKFLAGS', '-lsocket') | 23 | + prog.env.append_value('LINKFLAGS', '-lsocket') | |
33 | 24 | |||
34 | if bld.env['IS_LINUX'] and bld.env['BUILD_TOOL_ALSA_IO']: | 25 | if bld.env['IS_LINUX'] and bld.env['BUILD_TOOL_ALSA_IO']: | |
35 | prog = bld(features = 'c cprogram') | 26 | prog = bld(features='c cprogram') |
@@ -1,85 +1,84 @@ | @@ -1,85 +1,84 @@ | |||
1 | $NetBSD: patch-wscript,v 1.4 2021/10/21 13:45:12 jperkin Exp $ | 1 | $NetBSD: patch-wscript,v 1.5 2023/01/07 21:20:19 triaxx 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 2022-04-15 19:14:06.000000000 +0000 | |
7 | +++ wscript | 7 | +++ wscript | |
8 | @@ -192,6 +192,7 @@ def detect_platform(conf): | 8 | @@ -234,6 +234,7 @@ def detect_platform(conf): | |
9 | # ('KEY, 'Human readable name', ['strings', 'to', 'check', 'for']) | |||
10 | ('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']), | 9 | ('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']), | |
10 | ('IS_FREEBSD', 'FreeBSD', ['freebsd']), | |||
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 | @@ -231,6 +232,11 @@ def configure(conf): | 16 | @@ -276,6 +277,11 @@ def configure(conf): | |
17 | conf.env.append_unique('CXXFLAGS', ['-Wall', '-Wno-invalid-offsetof']) | 17 | conf.check(lib='execinfo', uselib='EXECINFO', define_name='EXECINFO') | |
18 | conf.env.append_unique('CXXFLAGS', '-std=gnu++11') | 18 | conf.check_cfg(package='libsysinfo', args='--cflags --libs') | |
19 | 19 | |||
20 | + # Needed to work around "error: ::vfscanf has not been declared" failures | 20 | + # Needed to work around "error: ::vfscanf has not been declared" failures | |
21 | + # prior to NetBSD 9.99.x. | 21 | + # prior to NetBSD 9.99.x. | |
22 | + if conf.env['IS_NETBSD']: | 22 | + if conf.env['IS_NETBSD']: | |
23 | + conf.env.append_unique('CXXFLAGS', '-D_NETBSD_SOURCE') | 23 | + conf.env.append_unique('CXXFLAGS', '-D_NETBSD_SOURCE') | |
24 | + | 24 | + | |
25 | if not conf.env['IS_MACOSX']: | 25 | if not conf.env['IS_MACOSX']: | |
26 | conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined') | 26 | conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined') | |
27 | else: | 27 | else: | |
28 | @@ -531,6 +537,9 @@ def obj_add_includes(bld, obj): | 28 | @@ -568,6 +574,9 @@ def obj_add_includes(bld, obj): | |
29 | if bld.env['IS_SUN']: | 29 | if bld.env['IS_SUN']: | |
30 | obj.includes += ['posix', 'solaris'] | 30 | obj.includes += ['posix', 'solaris'] | |
31 | 31 | |||
32 | + if bld.env['IS_NETBSD']: | 32 | + if bld.env['IS_NETBSD']: | |
33 | + obj.includes += ['posix', 'netbsd'] | 33 | + obj.includes += ['posix', 'netbsd'] | |
34 | + | 34 | + | |
35 | if bld.env['IS_WINDOWS']: | 35 | if bld.env['IS_WINDOWS']: | |
36 | obj.includes += ['windows'] | 36 | obj.includes += ['windows'] | |
37 | 37 | |||
38 | @@ -582,6 +591,10 @@ def create_driver_obj(bld, **kw): | 38 | @@ -624,6 +633,10 @@ def create_driver_obj(bld, **kw): | |
39 | else: | 39 | else: | |
40 | driver.env['cxxshlib_PATTERN'] = 'jack_%s.so' | 40 | driver.env['cxxshlib_PATTERN'] = 'jack_%s.so' | |
41 | 41 | |||
42 | + if bld.env['IS_SUN']: | 42 | + if bld.env['IS_SUN']: | |
43 | + driver.env.append_value('LINKFLAGS', '-lnsl') | 43 | + driver.env.append_value('LINKFLAGS', '-lnsl') | |
44 | + driver.env.append_value('LINKFLAGS', '-lsocket') | 44 | + driver.env.append_value('LINKFLAGS', '-lsocket') | |
45 | + | 45 | + | |
46 | obj_add_includes(bld, driver) | 46 | obj_add_includes(bld, driver) | |
47 | 47 | |||
48 | return driver | 48 | return driver | |
49 | @@ -678,6 +691,11 @@ def build_drivers(bld): | 49 | @@ -726,6 +739,11 @@ def build_drivers(bld): | |
50 | 'windows/portaudio/JackPortAudioDriver.cpp', | 50 | 'windows/portaudio/JackPortAudioDriver.cpp', | |
51 | ] | 51 | ] | |
52 | 52 | |||
53 | + sun_src = [ | 53 | + sun_src = [ | |
54 | + 'common/memops.c', | 54 | + 'common/memops.c', | |
55 | + 'netbsd/sun/JackSunDriver.cpp' | 55 | + 'netbsd/sun/JackSunDriver.cpp' | |
56 | + ] | 56 | + ] | |
57 | + | 57 | + | |
58 | winmme_src = [ | 58 | winmme_src = [ | |
59 | 'windows/winmme/JackWinMMEDriver.cpp', | 59 | 'windows/winmme/JackWinMMEDriver.cpp', | |
60 | 'windows/winmme/JackWinMMEInputPort.cpp', | 60 | 'windows/winmme/JackWinMMEInputPort.cpp', | |
61 | @@ -779,6 +797,12 @@ def build_drivers(bld): | 61 | @@ -834,6 +852,11 @@ def build_drivers(bld): | |
62 | target = 'oss', | 62 | target='oss', | |
63 | source = oss_src) | 63 | source=oss_src) | |
64 | 64 | |||
65 | + if bld.env['IS_NETBSD']: | 65 | + if bld.env['IS_NETBSD']: | |
66 | + create_driver_obj( | 66 | + create_driver_obj( | |
67 | + bld, | 67 | + bld, | |
68 | + target = 'sun', | 68 | + target = 'sun', | |
69 | + source = sun_src) | 69 | + source = sun_src) | |
70 | + | 70 | ||
71 | def build(bld): | 71 | def build(bld): | |
72 | if not bld.variant and bld.env['BUILD_WITH_32_64']: | 72 | if not bld.variant and bld.env['BUILD_WITH_32_64']: | |
73 | Options.commands.append(bld.cmd + '_' + lib32) | 73 | @@ -858,9 +881,10 @@ def build(bld): | |
74 | @@ -821,9 +845,10 @@ def build(bld): | 74 | bld.recurse('tools') | |
75 | bld.recurse('tools') | |||
76 | 75 | |||
77 | if bld.env['IS_LINUX']: | 76 | if bld.env['IS_LINUX'] or bld.env['IS_FREEBSD']: | |
78 | - bld.recurse('man') | 77 | - bld.recurse('man') | |
79 | bld.recurse('systemd') | 78 | bld.recurse('systemd') | |
80 | if not bld.env['IS_WINDOWS']: | 79 | if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']: | |
81 | + bld.recurse('man') | 80 | + bld.recurse('man') | |
82 | + if not bld.env['IS_WINDOWS']: | 81 | + if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']: | |
83 | bld.recurse('tests') | 82 | bld.recurse('tests') | |
84 | if bld.env['BUILD_JACKDBUS']: | 83 | if bld.env['BUILD_JACKDBUS']: | |
85 | bld.recurse('dbus') | 84 | bld.recurse('dbus') |