CVS commit: pkgsrc/audio/jack

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep  9 21:10:18 UTC 2021

Modified Files:
        pkgsrc/audio/jack: distinfo
        pkgsrc/audio/jack/patches: patch-common_wscript

Log Message:
jack: restore hack to ensure libsamplerate gets linked


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/jack/patches/patch-common_wscript

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.23 pkgsrc/audio/jack/distinfo:1.24
--- pkgsrc/audio/jack/distinfo:1.23     Wed Sep  8 19:19:19 2021
+++ pkgsrc/audio/jack/distinfo  Thu Sep  9 21:10:18 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/09/08 19:19:19 nia Exp $
+$NetBSD: distinfo,v 1.24 2021/09/09 21:10:18 nia Exp $
 
 SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
 RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
@@ -6,7 +6,7 @@ SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e
 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) = a86ba367fcb4892b3a34f395840ecbd1c5358005
+SHA1 (patch-common_wscript) = f68886b688d623a87178eed22e3900109409be69
 SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
 SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a

Index: pkgsrc/audio/jack/patches/patch-common_wscript
diff -u pkgsrc/audio/jack/patches/patch-common_wscript:1.1 pkgsrc/audio/jack/patches/patch-common_wscript:1.2
--- pkgsrc/audio/jack/patches/patch-common_wscript:1.1  Wed Sep  8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-common_wscript      Thu Sep  9 21:10:18 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-common_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-common_wscript,v 1.2 2021/09/09 21:10:18 nia Exp $
 
 Add NetBSD support.
 
@@ -82,7 +82,12 @@ Add NetBSD support.
      if bld.env['IS_SUN']:
          serverlib.source += [
              '../posix/JackSocketServerChannel.cpp',
-@@ -316,6 +350,9 @@ def build(bld):
+@@ -313,9 +347,14 @@ def build(bld):
+     elif not bld.env['IS_WINDOWS']:
+         serverlib.vnum = bld.env['JACK_API_VERSION']
+ 
++    serverlib.env.append_value('LINKFLAGS', '-lsamplerate')
++
      if bld.env['IS_LINUX']:
          serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
  
@@ -92,7 +97,7 @@ Add NetBSD support.
      if bld.env['IS_MACOSX']:
          serverlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
          serverlib.env.append_value('LINKFLAGS', '-single_module')
-@@ -360,6 +397,10 @@ def build(bld):
+@@ -360,6 +399,10 @@ def build(bld):
              netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../linux/JackLinuxTime.c']
              netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
  
@@ -103,7 +108,7 @@ 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 +463,11 @@ def build(bld):
+@@ -422,6 +465,11 @@ def build(bld):
           process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
           process.use += ['ALSA', 'SAMPLERATE']