Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id EEF071A9239 for ; Thu, 21 Oct 2021 13:45:14 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 37E1A84D51; Thu, 21 Oct 2021 13:45:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7144E84D51 for ; Thu, 21 Oct 2021 13:45:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id bdXcOBfKAK6l for ; Thu, 21 Oct 2021 13:45:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7B6B384D1C for ; Thu, 21 Oct 2021 13:45:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74F79FA97; Thu, 21 Oct 2021 13:45:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16348239121460" MIME-Version: 1.0 Date: Thu, 21 Oct 2021 13:45:12 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/audio/jack To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20211021134512.74F79FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16348239121460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Oct 21 13:45:12 UTC 2021 Modified Files: pkgsrc/audio/jack: distinfo pkgsrc/audio/jack/patches: patch-common_wscript patch-tools_wscript patch-wscript Log Message: jack: Various SunOS build fixes. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/jack/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/jack/patches/patch-common_wscript cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-tools_wscript cvs rdiff -u -r1.3 -r1.4 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. --_----------=_16348239121460 Content-Disposition: inline Content-Length: 9189 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/jack/distinfo diff -u pkgsrc/audio/jack/distinfo:1.29 pkgsrc/audio/jack/distinfo:1.30 --- pkgsrc/audio/jack/distinfo:1.29 Thu Oct 7 13:09:29 2021 +++ pkgsrc/audio/jack/distinfo Thu Oct 21 13:45:12 2021 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.29 2021/10/07 13:09:29 nia Exp $ +$NetBSD: distinfo,v 1.30 2021/10/21 13:45:12 jperkin Exp $ RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8 SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d Size (jack2-1.9.19.tar.gz) = 988780 bytes SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585 -SHA1 (patch-common_wscript) = f68886b688d623a87178eed22e3900109409be69 +SHA1 (patch-common_wscript) = 01d21e983f408d0a423f9c5cb9f12c22017ca783 SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab SHA1 (patch-man_wscript) = bc5ce9481d4c911350f260c069a0ce4be732f526 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d @@ -20,5 +20,5 @@ SHA1 (patch-posix_JackNetUnixSocket.h) = SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314 SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0 -SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3 -SHA1 (patch-wscript) = 2d95ee17426992d921c8b2c432abdf39ec2d54c7 +SHA1 (patch-tools_wscript) = fab7472b29fc6e46ba1e8ca94c12aa8808b075da +SHA1 (patch-wscript) = a49c6e7ebd84bb5156576351308676b0b3486492 Index: pkgsrc/audio/jack/patches/patch-common_wscript diff -u pkgsrc/audio/jack/patches/patch-common_wscript:1.4 pkgsrc/audio/jack/patches/patch-common_wscript:1.5 --- pkgsrc/audio/jack/patches/patch-common_wscript:1.4 Sun Sep 12 06:04:44 2021 +++ pkgsrc/audio/jack/patches/patch-common_wscript Thu Oct 21 13:45:12 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-common_wscript,v 1.4 2021/09/12 06:04:44 nia Exp $ +$NetBSD: patch-common_wscript,v 1.5 2021/10/21 13:45:12 jperkin Exp $ Add NetBSD support. @@ -57,7 +57,7 @@ Add NetBSD support. if bld.env['IS_SUN']: clientlib.source += [ '../posix/JackSocketClientChannel.cpp', -@@ -205,6 +228,9 @@ def build(bld): +@@ -205,12 +228,16 @@ def build(bld): if bld.env['IS_LINUX']: clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') @@ -67,7 +67,15 @@ Add NetBSD support. if bld.env['IS_MACOSX']: clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') clientlib.env.append_value('LINKFLAGS', '-single_module') -@@ -281,6 +307,14 @@ def build(bld): + + if bld.env['IS_SUN']: +- clientlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') ++ clientlib.env.append_value('LINKFLAGS', '-lnsl') ++ clientlib.env.append_value('LINKFLAGS', '-lsocket') + + if bld.variant: + # if there is variant defined, we expect it to be the 32bit client lib one +@@ -281,6 +308,14 @@ def build(bld): '../posix/JackNetUnixSocket.cpp', ] @@ -82,7 +90,7 @@ Add NetBSD support. if bld.env['IS_SUN']: serverlib.source += [ '../posix/JackSocketServerChannel.cpp', -@@ -313,9 +347,14 @@ def build(bld): +@@ -313,15 +348,21 @@ def build(bld): elif not bld.env['IS_WINDOWS']: serverlib.vnum = bld.env['JACK_API_VERSION'] @@ -97,7 +105,15 @@ Add NetBSD support. if bld.env['IS_MACOSX']: serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') serverlib.env.append_value('LINKFLAGS', '-single_module') -@@ -360,6 +399,10 @@ def build(bld): + + if bld.env['IS_SUN']: +- serverlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') ++ serverlib.env.append_value('LINKFLAGS', '-lnsl') ++ serverlib.env.append_value('LINKFLAGS', '-lsocket') + + if bld.env['BUILD_NETLIB']: + netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) +@@ -360,10 +401,15 @@ def build(bld): netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../linux/JackLinuxTime.c'] netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') @@ -108,7 +124,13 @@ Add NetBSD support. if bld.env['IS_SUN']: netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../solaris/JackSolarisTime.c'] netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden') -@@ -422,6 +465,11 @@ def build(bld): +- ++ netlib.env.append_value('LINKFLAGS', '-lnsl') ++ netlib.env.append_value('LINKFLAGS', '-lsocket') + + if bld.env['IS_MACOSX']: + netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../macosx/JackMachThread.mm', '../macosx/JackMachTime.c'] +@@ -422,10 +468,19 @@ def build(bld): process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) process.use += ['ALSA', 'SAMPLERATE'] @@ -120,3 +142,11 @@ Add NetBSD support. if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c'] process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) + process.use += 'SAMPLERATE' ++ process.env.append_value('LINKFLAGS', '-lsamplerate') ++ # This is clearly bogus and should be coming from the main flags but it is ++ # far too painful to try and trace why it is not, so a hack it is for now. ++ process.env.append_value('CFLAGS', '-fPIC') + + if bld.env['BUILD_ADAPTER'] and bld.env['IS_WINDOWS']: + audio_adapter_sources += ['../windows/portaudio/JackPortAudioAdapter.cpp', '../windows/portaudio/JackPortAudioDevices.cpp'] Index: pkgsrc/audio/jack/patches/patch-tools_wscript diff -u pkgsrc/audio/jack/patches/patch-tools_wscript:1.2 pkgsrc/audio/jack/patches/patch-tools_wscript:1.3 --- pkgsrc/audio/jack/patches/patch-tools_wscript:1.2 Fri Sep 10 11:14:05 2021 +++ pkgsrc/audio/jack/patches/patch-tools_wscript Thu Oct 21 13:45:12 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-tools_wscript,v 1.2 2021/09/10 11:14:05 nia Exp $ +$NetBSD: patch-tools_wscript,v 1.3 2021/10/21 13:45:12 jperkin Exp $ - Add NetBSD support. - Ensure jack_netsource is built on all Unixes. @@ -23,3 +23,13 @@ $NetBSD: patch-tools_wscript,v 1.2 2021/ prog = bld(features = 'c cprogram') prog.includes = os_incdir + ['.', '..', '../common/jack', '../common'] prog.source = ['netsource.c', '../common/netjack_packet.c'] +@@ -74,6 +76,9 @@ def build(bld): + prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib'] + prog.target = 'jack_netsource' + prog.defines = ['HAVE_CONFIG_H'] ++ if bld.env['IS_SUN']: ++ prog.env.append_value('LINKFLAGS', '-lnsl') ++ prog.env.append_value('LINKFLAGS', '-lsocket') + + if bld.env['IS_LINUX'] and bld.env['BUILD_TOOL_ALSA_IO']: + prog = bld(features = 'c cprogram') Index: pkgsrc/audio/jack/patches/patch-wscript diff -u pkgsrc/audio/jack/patches/patch-wscript:1.3 pkgsrc/audio/jack/patches/patch-wscript:1.4 --- pkgsrc/audio/jack/patches/patch-wscript:1.3 Sun Sep 12 06:04:44 2021 +++ pkgsrc/audio/jack/patches/patch-wscript Thu Oct 21 13:45:12 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-wscript,v 1.3 2021/09/12 06:04:44 nia Exp $ +$NetBSD: patch-wscript,v 1.4 2021/10/21 13:45:12 jperkin Exp $ - Add NetBSD support. - Ensure man pages are installed on all Unixes. @@ -35,7 +35,18 @@ $NetBSD: patch-wscript,v 1.3 2021/09/12 if bld.env['IS_WINDOWS']: obj.includes += ['windows'] -@@ -678,6 +687,11 @@ def build_drivers(bld): +@@ -582,6 +591,10 @@ def create_driver_obj(bld, **kw): + else: + driver.env['cxxshlib_PATTERN'] = 'jack_%s.so' + ++ if bld.env['IS_SUN']: ++ driver.env.append_value('LINKFLAGS', '-lnsl') ++ driver.env.append_value('LINKFLAGS', '-lsocket') ++ + obj_add_includes(bld, driver) + + return driver +@@ -678,6 +691,11 @@ def build_drivers(bld): 'windows/portaudio/JackPortAudioDriver.cpp', ] @@ -47,7 +58,7 @@ $NetBSD: patch-wscript,v 1.3 2021/09/12 winmme_src = [ 'windows/winmme/JackWinMMEDriver.cpp', 'windows/winmme/JackWinMMEInputPort.cpp', -@@ -779,6 +793,12 @@ def build_drivers(bld): +@@ -779,6 +797,12 @@ def build_drivers(bld): target = 'oss', source = oss_src) @@ -60,7 +71,7 @@ $NetBSD: patch-wscript,v 1.3 2021/09/12 def build(bld): if not bld.variant and bld.env['BUILD_WITH_32_64']: Options.commands.append(bld.cmd + '_' + lib32) -@@ -821,9 +841,10 @@ def build(bld): +@@ -821,9 +845,10 @@ def build(bld): bld.recurse('tools') if bld.env['IS_LINUX']: --_----------=_16348239121460--