Received: by mail.netbsd.org (Postfix, from userid 605) id D7DBD84F36; Fri, 10 Sep 2021 11:14:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1BCD884EA5 for ; Fri, 10 Sep 2021 11:14:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id qd4s-E1bzxGa for ; Fri, 10 Sep 2021 11:14:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0D2B684D1C for ; Fri, 10 Sep 2021 11:14:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7BCF8FA97; Fri, 10 Sep 2021 11:14:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1631272445163420" MIME-Version: 1.0 Date: Fri, 10 Sep 2021 11:14:05 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio/jack To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210910111405.7BCF8FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1631272445163420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Sep 10 11:14:05 UTC 2021 Modified Files: pkgsrc/audio/jack: Makefile PLIST distinfo pkgsrc/audio/jack/patches: patch-common_wscript patch-netbsd_sun_JackSunAdapter.cpp patch-netbsd_sun_JackSunDriver.cpp patch-tools_wscript patch-wscript Log Message: jack: Install man pages on non-Linux. Fix Linux PLIST. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/jack/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/jack/PLIST cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/jack/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-common_wscript \ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp \ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/jack/patches/patch-tools_wscript \ pkgsrc/audio/jack/patches/patch-wscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1631272445163420 Content-Disposition: inline Content-Length: 8227 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/jack/Makefile diff -u pkgsrc/audio/jack/Makefile:1.43 pkgsrc/audio/jack/Makefile:1.44 --- pkgsrc/audio/jack/Makefile:1.43 Wed Sep 8 21:04:55 2021 +++ pkgsrc/audio/jack/Makefile Fri Sep 10 11:14:05 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2021/09/08 21:04:55 nia Exp $ +# $NetBSD: Makefile,v 1.44 2021/09/10 11:14:05 nia Exp $ DISTNAME= jack2-1.9.19 PKGNAME= ${DISTNAME:S/jack2/jack/1} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=jackaudio/} GITHUB_PROJECT= jack2 Index: pkgsrc/audio/jack/PLIST diff -u pkgsrc/audio/jack/PLIST:1.11 pkgsrc/audio/jack/PLIST:1.12 --- pkgsrc/audio/jack/PLIST:1.11 Wed Sep 8 19:19:19 2021 +++ pkgsrc/audio/jack/PLIST Fri Sep 10 11:14:05 2021 @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.11 2021/09/08 19:19:19 nia Exp $ +@comment $NetBSD: PLIST,v 1.12 2021/09/10 11:14:05 nia Exp $ +${PLIST.alsa}bin/alsa_in +${PLIST.alsa}bin/alsa_out bin/jack_alias bin/jack_bufsize bin/jack_connect @@ -21,6 +23,7 @@ bin/jack_monitor_client bin/jack_multiple_metro bin/jack_net_master bin/jack_net_slave +bin/jack_netsource bin/jack_property bin/jack_rec bin/jack_samplerate @@ -78,3 +81,25 @@ lib/libjackserver.so lib/libjackserver.so.0 lib/libjackserver.so.0.1.0 lib/pkgconfig/jack.pc +man/alsa_in.1 +man/alsa_out.1 +man/jack_bufsize.1 +man/jack_connect.1 +man/jack_disconnect.1 +man/jack_freewheel.1 +man/jack_impulse_grabber.1 +man/jack_iodelay.1 +man/jack_load.1 +man/jack_lsp.1 +man/jack_metro.1 +man/jack_monitor_client.1 +man/jack_netsource.1 +man/jack_property.1 +man/jack_samplerate.1 +man/jack_showtime.1 +man/jack_simple_client.1 +man/jack_transport.1 +man/jack_unload.1 +man/jack_wait.1 +man/jackd.1 +man/jackrec.1 Index: pkgsrc/audio/jack/distinfo diff -u pkgsrc/audio/jack/distinfo:1.25 pkgsrc/audio/jack/distinfo:1.26 --- pkgsrc/audio/jack/distinfo:1.25 Thu Sep 9 22:41:43 2021 +++ pkgsrc/audio/jack/distinfo Fri Sep 10 11:14:05 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2021/09/09 22:41:43 nia Exp $ +$NetBSD: distinfo,v 1.26 2021/09/10 11:14:05 nia Exp $ SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8 @@ -11,14 +11,14 @@ 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) = 03c8fc59afb5a1ecf090eb9e47b3b2d43720da91 +SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e3d2972dd07919c5de266ae830f043aed2662a2c SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d -SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 78d5bc56a0cbea4bb7f15f0d3c775c69a3ac2a3a +SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = b3f18de879f2d770547ac534bfd4f5bb64db3017 SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9 SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0 -SHA1 (patch-tools_wscript) = c990639f5c1a998dd02d12eb345e78b0a91a1c6f -SHA1 (patch-wscript) = 6514e2e7d10f096deb99effa35974e9253599f74 +SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3 +SHA1 (patch-wscript) = 71c9a1c583b864b6d89c081aa0e259ff898e293d Index: pkgsrc/audio/jack/patches/patch-common_wscript diff -u pkgsrc/audio/jack/patches/patch-common_wscript:1.2 pkgsrc/audio/jack/patches/patch-common_wscript:1.3 --- pkgsrc/audio/jack/patches/patch-common_wscript:1.2 Thu Sep 9 21:10:18 2021 +++ pkgsrc/audio/jack/patches/patch-common_wscript Fri Sep 10 11:14:05 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-common_wscript,v 1.2 2021/09/09 21:10:18 nia Exp $ +$NetBSD: patch-common_wscript,v 1.3 2021/09/10 11:14:05 nia Exp $ Add NetBSD support. Index: pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp diff -u pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.2 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.3 --- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp:1.2 Thu Sep 9 22:41:43 2021 +++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp Fri Sep 10 11:14:05 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $ +$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $ Add NetBSD support. ---- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-09 21:08:54.598607823 +0000 +--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-10 11:08:26.064717543 +0000 +++ netbsd/sun/JackSunAdapter.cpp @@ -0,0 +1,490 @@ +/* Index: pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp diff -u pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.2 pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.3 --- pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp:1.2 Thu Sep 9 22:41:43 2021 +++ pkgsrc/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp Fri Sep 10 11:14:05 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $ +$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $ Add NetBSD support. ---- netbsd/sun/JackSunDriver.cpp.orig 2021-09-09 21:08:54.658178887 +0000 +--- netbsd/sun/JackSunDriver.cpp.orig 2021-09-10 11:08:26.142826553 +0000 +++ netbsd/sun/JackSunDriver.cpp @@ -0,0 +1,569 @@ +/* Index: pkgsrc/audio/jack/patches/patch-tools_wscript diff -u pkgsrc/audio/jack/patches/patch-tools_wscript:1.1 pkgsrc/audio/jack/patches/patch-tools_wscript:1.2 --- pkgsrc/audio/jack/patches/patch-tools_wscript:1.1 Wed Sep 8 19:19:20 2021 +++ pkgsrc/audio/jack/patches/patch-tools_wscript Fri Sep 10 11:14:05 2021 @@ -1,6 +1,7 @@ -$NetBSD: patch-tools_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $ +$NetBSD: patch-tools_wscript,v 1.2 2021/09/10 11:14:05 nia Exp $ -Add NetBSD support. +- Add NetBSD support. +- Ensure jack_netsource is built on all Unixes. --- tools/wscript.orig 2021-07-15 06:18:26.000000000 +0000 +++ tools/wscript @@ -13,3 +14,12 @@ Add NetBSD support. if bld.env['IS_WINDOWS']: os_incdir = ['../windows'] for example_tool, example_tool_source in list(example_tools.items()): +@@ -66,7 +68,7 @@ def build(bld): + prog.env['LIB_PTHREAD'] = [':libwinpthread.a'] + prog.target = 'jack_transport' + +- if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']: ++ if not bld.env['IS_WINDOWS']: + prog = bld(features = 'c cprogram') + prog.includes = os_incdir + ['.', '..', '../common/jack', '../common'] + prog.source = ['netsource.c', '../common/netjack_packet.c'] Index: pkgsrc/audio/jack/patches/patch-wscript diff -u pkgsrc/audio/jack/patches/patch-wscript:1.1 pkgsrc/audio/jack/patches/patch-wscript:1.2 --- pkgsrc/audio/jack/patches/patch-wscript:1.1 Wed Sep 8 19:19:20 2021 +++ pkgsrc/audio/jack/patches/patch-wscript Fri Sep 10 11:14:05 2021 @@ -1,6 +1,7 @@ -$NetBSD: patch-wscript,v 1.1 2021/09/08 19:19:20 nia Exp $ +$NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $ -Add NetBSD support. +- Add NetBSD support. +- Ensure man pages are installed on all Unixes. --- wscript.orig 2021-07-15 06:18:26.000000000 +0000 +++ wscript @@ -47,3 +48,15 @@ Add NetBSD support. def build(bld): if not bld.variant and bld.env['BUILD_WITH_32_64']: Options.commands.append(bld.cmd + '_' + lib32) +@@ -821,9 +836,10 @@ def build(bld): + bld.recurse('tools') + + if bld.env['IS_LINUX']: +- bld.recurse('man') + bld.recurse('systemd') + if not bld.env['IS_WINDOWS']: ++ bld.recurse('man') ++ if not bld.env['IS_WINDOWS']: + bld.recurse('tests') + if bld.env['BUILD_JACKDBUS']: + bld.recurse('dbus') --_----------=_1631272445163420--