CVS commit: pkgsrc/audio/jack

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  7 19:04:34 UTC 2023

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

Log Message:
jack: fix build on NetBSD with binutils 2.39

Clean some pkglint while here


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/jack/platform.mk
cvs rdiff -u -r1.5 -r1.6 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.33 pkgsrc/audio/jack/distinfo:1.34
--- pkgsrc/audio/jack/distinfo:1.33     Fri Dec 16 07:36:41 2022
+++ pkgsrc/audio/jack/distinfo  Sat Jan  7 19:04:34 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.33 2022/12/16 07:36:41 wiz Exp $
+$NetBSD: distinfo,v 1.34 2023/01/07 19:04:34 wiz Exp $
 
 BLAKE2s (jack2-1.9.19.tar.gz) = aa43a3ae606c00e7c8e047e89250e068717f44fa0443b8531a6d83ca2a9dff71
 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) = 01d21e983f408d0a423f9c5cb9f12c22017ca783
+SHA1 (patch-common_wscript) = 0f52fd48cd45c08c18650b7a0770ef76ac193362
 SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
 SHA1 (patch-man_wscript) = bc5ce9481d4c911350f260c069a0ce4be732f526
 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d

Index: pkgsrc/audio/jack/platform.mk
diff -u pkgsrc/audio/jack/platform.mk:1.3 pkgsrc/audio/jack/platform.mk:1.4
--- pkgsrc/audio/jack/platform.mk:1.3   Wed Jun 22 10:12:30 2022
+++ pkgsrc/audio/jack/platform.mk       Sat Jan  7 19:04:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.3 2022/06/22 10:12:30 nia Exp $
+# $NetBSD: platform.mk,v 1.4 2023/01/07 19:04:34 wiz Exp $
 
 .if !defined(PLATFORM_SUPPORTS_JACK)
 .  include "../../mk/bsd.fast.prefs.mk"
@@ -6,9 +6,9 @@
 JACK_PLATFORMS+=       Darwin-*-*
 JACK_PLATFORMS+=       Linux-*-*
 
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
+.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 PLATFORM_SUPPORTS_JACK=        yes
-.endif
+.  endif
 
 .  for _jack_platform in ${JACK_PLATFORMS}
 .    if !empty(MACHINE_PLATFORM:M${_jack_platform})

Index: pkgsrc/audio/jack/patches/patch-common_wscript
diff -u pkgsrc/audio/jack/patches/patch-common_wscript:1.5 pkgsrc/audio/jack/patches/patch-common_wscript:1.6
--- pkgsrc/audio/jack/patches/patch-common_wscript:1.5  Thu Oct 21 13:45:12 2021
+++ pkgsrc/audio/jack/patches/patch-common_wscript      Sat Jan  7 19:04:34 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-common_wscript,v 1.5 2021/10/21 13:45:12 jperkin Exp $
+$NetBSD: patch-common_wscript,v 1.6 2023/01/07 19:04:34 wiz Exp $
 
 Add NetBSD support.
 
@@ -130,13 +130,14 @@ Add NetBSD support.
  
          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):
+@@ -422,10 +468,20 @@ def build(bld):
           process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
           process.use += ['ALSA', 'SAMPLERATE']
  
 +    if bld.env['BUILD_ADAPTER'] and bld.env['IS_NETBSD']:
 +         audio_adapter_sources += ['../netbsd/sun/JackSunAdapter.cpp']
 +         process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
++         process.env.append_value('LINKFLAGS', '-lsamplerate')
 +         process.use += 'SAMPLERATE'
 +
      if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: