pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/jack
Module Name: pkgsrc
Committed By: triaxx
Date: Sat Jan 7 21:20:19 UTC 2023
Modified Files:
pkgsrc/audio/jack: Makefile PLIST distinfo platform.mk
pkgsrc/audio/jack/patches: patch-common_JackAudioAdapterFactory.cpp
patch-common_wscript patch-example-clients_wscript
patch-man_wscript patch-posix_JackPosixSemaphore.cpp
patch-tests_wscript patch-tools_wscript patch-wscript
Added Files:
pkgsrc/audio/jack/patches: patch-man_fill__template
Log Message:
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.6
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/audio/jack/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/jack/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/jack/platform.mk
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp \
pkgsrc/audio/jack/patches/patch-example-clients_wscript \
pkgsrc/audio/jack/patches/patch-man_wscript \
pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp \
pkgsrc/audio/jack/patches/patch-tests_wscript
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/jack/patches/patch-common_wscript
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/jack/patches/patch-man_fill__template
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/jack/patches/patch-tools_wscript
cvs rdiff -u -r1.4 -r1.5 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.
Modified files:
Index: pkgsrc/audio/jack/Makefile
diff -u pkgsrc/audio/jack/Makefile:1.53 pkgsrc/audio/jack/Makefile:1.54
--- pkgsrc/audio/jack/Makefile:1.53 Sun Sep 11 12:51:03 2022
+++ pkgsrc/audio/jack/Makefile Sat Jan 7 21:20:19 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2022/09/11 12:51:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2023/01/07 21:20:19 triaxx Exp $
-DISTNAME= jack2-1.9.19
+DISTNAME= jack2-1.9.21
PKGNAME= ${DISTNAME:S/jack2/jack/1}
-PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=jackaudio/}
GITHUB_PROJECT= jack2
@@ -51,8 +50,6 @@ post-install:
.endif
REPLACE_PYTHON+= waf
-REPLACE_PYTHON+= tools/jack_control
-REPLACE_BASH+= svnversion_regenerate.sh
PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/audio/jack/PLIST
diff -u pkgsrc/audio/jack/PLIST:1.15 pkgsrc/audio/jack/PLIST:1.16
--- pkgsrc/audio/jack/PLIST:1.15 Mon Apr 18 15:56:34 2022
+++ pkgsrc/audio/jack/PLIST Sat Jan 7 21:20:19 2023
@@ -1,43 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2022/04/18 15:56:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.16 2023/01/07 21:20:19 triaxx Exp $
${PLIST.alsa}bin/alsa_in
${PLIST.alsa}bin/alsa_out
-bin/jack_alias
-bin/jack_bufsize
-bin/jack_connect
-bin/jack_control
-bin/jack_cpu
-bin/jack_cpu_load
-bin/jack_disconnect
-bin/jack_evmon
-bin/jack_freewheel
-bin/jack_iodelay
-bin/jack_latent_client
-bin/jack_load
-bin/jack_lsp
-bin/jack_metro
-bin/jack_midi_dump
-bin/jack_midi_latency_test
-bin/jack_midiseq
-bin/jack_midisine
-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
-bin/jack_server_control
-bin/jack_session_notify
-bin/jack_showtime
-bin/jack_simdtests
-bin/jack_simple_client
-bin/jack_simple_session_client
-bin/jack_test
-bin/jack_thru
-bin/jack_unload
-bin/jack_wait
-bin/jack_zombie
bin/jackd
include/jack/control.h
include/jack/intclient.h
@@ -57,7 +20,6 @@ include/jack/uuid.h
include/jack/weakjack.h
include/jack/weakmacros.h
lib/jack/audioadapter.so
-lib/jack/inprocess.so
${PLIST.alsa}lib/jack/jack_alsa.so
${PLIST.alsa}lib/jack/jack_alsarawmidi.so
${PLIST.boomer}lib/jack/jack_boomer.so
@@ -83,25 +45,3 @@ lib/libjackserver.so
lib/libjackserver.so.0
lib/libjackserver.so.0.1.0
lib/pkgconfig/jack.pc
-man/man1/alsa_in.1
-man/man1/alsa_out.1
-man/man1/jack_bufsize.1
-man/man1/jack_connect.1
-man/man1/jack_disconnect.1
-man/man1/jack_freewheel.1
-man/man1/jack_impulse_grabber.1
-man/man1/jack_iodelay.1
-man/man1/jack_load.1
-man/man1/jack_lsp.1
-man/man1/jack_metro.1
-man/man1/jack_monitor_client.1
-man/man1/jack_netsource.1
-man/man1/jack_property.1
-man/man1/jack_samplerate.1
-man/man1/jack_showtime.1
-man/man1/jack_simple_client.1
-man/man1/jack_transport.1
-man/man1/jack_unload.1
-man/man1/jack_wait.1
-man/man1/jackd.1
-man/man1/jackrec.1
Index: pkgsrc/audio/jack/distinfo
diff -u pkgsrc/audio/jack/distinfo:1.34 pkgsrc/audio/jack/distinfo:1.35
--- pkgsrc/audio/jack/distinfo:1.34 Sat Jan 7 19:04:34 2023
+++ pkgsrc/audio/jack/distinfo Sat Jan 7 21:20:19 2023
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.34 2023/01/07 19:04:34 wiz Exp $
+$NetBSD: distinfo,v 1.35 2023/01/07 21:20:19 triaxx 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
+BLAKE2s (jack2-1.9.21.tar.gz) = c4f0db4449051bad70a61ab62e67eea5874457459ad6d6866cf4b1efb127119c
+SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
+Size (jack2-1.9.21.tar.gz) = 1006157 bytes
+SHA1 (patch-common_JackAudioAdapterFactory.cpp) = b66c601cfcd565dbabcbac4747f9d1b17a2241ff
SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585
-SHA1 (patch-common_wscript) = 0f52fd48cd45c08c18650b7a0770ef76ac193362
-SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
-SHA1 (patch-man_wscript) = bc5ce9481d4c911350f260c069a0ce4be732f526
+SHA1 (patch-common_wscript) = 9f229c13f1950b244a2631f486e5ff734b1ed356
+SHA1 (patch-example-clients_wscript) = d08cd1552925126e28ed4204cda87ebb12ddcd24
+SHA1 (patch-man_fill__template) = b101ef707733d0d9d78de812a564a17345bee5e1
+SHA1 (patch-man_wscript) = 05f58e1a46d22ec3b5f74ed72ebbe44164e50006
SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
@@ -17,11 +18,11 @@ SHA1 (patch-netbsd_sun_JackSunDriver.cpp
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_JackPosixSemaphore.cpp) = 7d02f92dd6054014abf13ad1fd3aa7d8681990db
SHA1 (patch-posix_JackPosixThread.h) = 0aa94425ad44cc36fb583e48bdfa9f5f33a5eaa3
SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
-SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
-SHA1 (patch-tools_wscript) = fab7472b29fc6e46ba1e8ca94c12aa8808b075da
+SHA1 (patch-tests_wscript) = d79f0c5fefed422c36a3571fce7188a799e57a5d
+SHA1 (patch-tools_wscript) = 67c4b8d4162c3bce737fcb5ee69314b4f6833fc1
SHA1 (patch-waflib_ConfigSet.py) = 8f4cf15e16dae9f64ee7d5f65fe8c633cea7d1c0
SHA1 (patch-waflib_Context.py) = b68ec440239d877680e1425907a42f8412f7e7da
-SHA1 (patch-wscript) = a49c6e7ebd84bb5156576351308676b0b3486492
+SHA1 (patch-wscript) = 758ac2e0519d3529e2d5a7214ce1c12a10a5f397
Index: pkgsrc/audio/jack/platform.mk
diff -u pkgsrc/audio/jack/platform.mk:1.4 pkgsrc/audio/jack/platform.mk:1.5
--- pkgsrc/audio/jack/platform.mk:1.4 Sat Jan 7 19:04:34 2023
+++ pkgsrc/audio/jack/platform.mk Sat Jan 7 21:20:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.4 2023/01/07 19:04:34 wiz Exp $
+# $NetBSD: platform.mk,v 1.5 2023/01/07 21:20:19 triaxx Exp $
.if !defined(PLATFORM_SUPPORTS_JACK)
. include "../../mk/bsd.fast.prefs.mk"
@@ -10,8 +10,8 @@ JACK_PLATFORMS+= Linux-*-*
PLATFORM_SUPPORTS_JACK= yes
. endif
-. for _jack_platform in ${JACK_PLATFORMS}
-. if !empty(MACHINE_PLATFORM:M${_jack_platform})
+. for jack_platform in ${JACK_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${jack_platform})
PLATFORM_SUPPORTS_JACK= yes
. endif
. endfor
Index: pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp
diff -u pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp:1.1 pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp:1.2
--- pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp:1.1 Wed Sep 8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-common_JackAudioAdapterFactory.cpp Sat Jan 7 21:20:19 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-common_JackAudioAdapterFactory.cpp,v 1.2 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- common/JackAudioAdapterFactory.cpp.orig 2021-07-15 06:18:26.000000000 +0000
+--- common/JackAudioAdapterFactory.cpp.orig 2022-04-15 19:14:06.000000000 +0000
+++ common/JackAudioAdapterFactory.cpp
@@ -35,6 +35,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#define JackPlatformAdapter JackAlsaAdapter
@@ -13,6 +13,6 @@ Add NetBSD support.
+#define JackPlatformAdapter JackSunAdapter
+#endif
+
- #if defined(__sun__) || defined(sun)
+ #if defined(__sun__) || defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include "JackOSSAdapter.h"
#define JackPlatformAdapter JackOSSAdapter
Index: pkgsrc/audio/jack/patches/patch-example-clients_wscript
diff -u pkgsrc/audio/jack/patches/patch-example-clients_wscript:1.1 pkgsrc/audio/jack/patches/patch-example-clients_wscript:1.2
--- pkgsrc/audio/jack/patches/patch-example-clients_wscript:1.1 Wed Sep 8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-example-clients_wscript Sat Jan 7 21:20:19 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-example-clients_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-example-clients_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- example-clients/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- example-clients/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ example-clients/wscript
-@@ -33,6 +33,8 @@ def build(bld):
+@@ -35,6 +35,8 @@ def build(bld):
os_incdir = ['../macosx', '../posix']
- if bld.env['IS_SUN']:
- os_incdir = ['../solaris', '../posix']
+ if bld.env['IS_FREEBSD']:
+ os_incdir = ['../freebsd', '../posix']
+ if bld.env['IS_NETBSD']:
+ os_incdir = ['../netbsd', '../posix']
+ if bld.env['IS_SUN']:
+ os_incdir = ['../solaris', '../posix']
if bld.env['IS_WINDOWS']:
- os_incdir = ['../windows']
- for example_program, example_program_source in list(example_programs.items()):
-@@ -58,6 +60,8 @@ def build(bld):
+@@ -67,6 +69,8 @@ def build(bld):
prog.use = use
if bld.env['IS_LINUX']:
prog.use += ['RT', 'M']
@@ -21,11 +21,11 @@ Add NetBSD support.
+ prog.use += ['RT', 'M']
if bld.env['IS_SUN']:
prog.use += ['M']
- if bld.env['IS_WINDOWS'] and bld.env['BUILD_STATIC']:
-@@ -76,6 +80,8 @@ def build(bld):
- prog.use += ['SNDFILE']
- if bld.env['IS_LINUX']:
+ if bld.env['IS_FREEBSD']:
+@@ -87,6 +91,8 @@ def build(bld):
prog.use += ['RT', 'SNDFILE']
+ if bld.env['IS_FREEBSD']:
+ prog.use += ['SNDFILE']
+ if bld.env['IS_NETBSD']:
+ prog.use += ['RT', 'SNDFILE']
if bld.env['IS_SUN']:
Index: pkgsrc/audio/jack/patches/patch-man_wscript
diff -u pkgsrc/audio/jack/patches/patch-man_wscript:1.1 pkgsrc/audio/jack/patches/patch-man_wscript:1.2
--- pkgsrc/audio/jack/patches/patch-man_wscript:1.1 Wed Sep 15 07:44:37 2021
+++ pkgsrc/audio/jack/patches/patch-man_wscript Sat Jan 7 21:20:19 2023
@@ -1,13 +1,12 @@
-$NetBSD: patch-man_wscript,v 1.1 2021/09/15 07:44:37 schmonz Exp $
+$NetBSD: patch-man_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $
Follow hier(7).
---- man/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- man/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ man/wscript
-@@ -7,5 +7,5 @@ import os
-
- def build(bld):
- bld.exec_command('cd man ; sh fill_template %s' % bld.env['JACK_VERSION'])
+@@ -7,4 +7,4 @@ def build(bld):
+ bld.env['JACK_VERSION'],
+ bld.env['BUILD_JACK_EXAMPLE_TOOLS'])
+ )
- bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1'))
+ bld.install_files(bld.env['MANDIR'] + '/man1', bld.path.ant_glob('*.1'))
-
Index: pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp
diff -u pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp:1.1 pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp:1.2
--- pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp:1.1 Wed Sep 8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-posix_JackPosixSemaphore.cpp Sat Jan 7 21:20:19 2023
@@ -1,24 +1,16 @@
-$NetBSD: patch-posix_JackPosixSemaphore.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-posix_JackPosixSemaphore.cpp,v 1.2 2023/01/07 21:20:19 triaxx Exp $
NetBSD requires POSIX semaphores to be prefixed with
a slash, see sem_open(3).
---- posix/JackPosixSemaphore.cpp.orig 2021-07-15 06:18:26.000000000 +0000
+--- posix/JackPosixSemaphore.cpp.orig 2022-04-15 19:14:06.000000000 +0000
+++ posix/JackPosixSemaphore.cpp
-@@ -46,13 +46,13 @@ void JackPosixSemaphore::BuildName(const
- {
- char ext_client_name[SYNC_MAX_NAME_SIZE + 1];
- JackTools::RewriteName(client_name, ext_client_name);
--#if __APPLE__ // POSIX semaphore names are limited to 32 characters...
-+#if __APPLE__ // POSIX semaphore names are limited to 32 characters...
- snprintf(res, 32, "js_%s", ext_client_name);
- #else
- if (fPromiscuous) {
-- snprintf(res, size, "jack_sem.%s_%s", server_name, ext_client_name);
-+ snprintf(res, size, "/jack_sem.%s_%s", server_name, ext_client_name);
- } else {
-- snprintf(res, size, "jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name);
-+ snprintf(res, size, "/jack_sem.%d_%s_%s", JackTools::GetUID(), server_name, ext_client_name);
- }
+@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include "promiscuous.h"
#endif
- }
+
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ #define JACK_SEM_PREFIX "/jack_sem"
+ #define SEM_DEFAULT_O 0
+ #else
Index: pkgsrc/audio/jack/patches/patch-tests_wscript
diff -u pkgsrc/audio/jack/patches/patch-tests_wscript:1.1 pkgsrc/audio/jack/patches/patch-tests_wscript:1.2
--- pkgsrc/audio/jack/patches/patch-tests_wscript:1.1 Wed Sep 8 19:19:20 2021
+++ pkgsrc/audio/jack/patches/patch-tests_wscript Sat Jan 7 21:20:19 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-tests_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-tests_wscript,v 1.2 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- tests/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- tests/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ tests/wscript
-@@ -20,6 +20,8 @@ def build(bld):
- prog.includes = ['..','../macosx', '../posix', '../common/jack', '../common']
- if bld.env['IS_LINUX']:
- prog.includes = ['..','../linux', '../posix', '../common/jack', '../common']
+@@ -23,6 +23,8 @@ def build(bld):
+ prog.includes = ['..', '../linux', '../posix', '../common/jack', '../common']
+ if bld.env['IS_FREEBSD']:
+ prog.includes = ['..', '../freebsd', '../posix', '../common/jack', '../common']
+ if bld.env['IS_NETBSD']:
+ prog.includes = ['..','../netbsd', '../posix', '../common/jack', '../common']
if bld.env['IS_SUN']:
- prog.includes = ['..','../solaris', '../posix', '../common/jack', '../common']
+ prog.includes = ['..', '../solaris', '../posix', '../common/jack', '../common']
prog.source = test_program_sources
Index: pkgsrc/audio/jack/patches/patch-common_wscript
diff -u pkgsrc/audio/jack/patches/patch-common_wscript:1.6 pkgsrc/audio/jack/patches/patch-common_wscript:1.7
--- pkgsrc/audio/jack/patches/patch-common_wscript:1.6 Sat Jan 7 19:04:34 2023
+++ pkgsrc/audio/jack/patches/patch-common_wscript Sat Jan 7 21:20:19 2023
@@ -1,28 +1,28 @@
-$NetBSD: patch-common_wscript,v 1.6 2023/01/07 19:04:34 wiz Exp $
+$NetBSD: patch-common_wscript,v 1.7 2023/01/07 21:20:19 triaxx Exp $
Add NetBSD support.
---- common/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- common/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ common/wscript
-@@ -28,6 +28,8 @@ def create_jack_process_obj(bld, target,
+@@ -31,6 +31,8 @@ def create_jack_process_obj(bld, target,
env_includes = ['../macosx', '../posix', '../macosx/coreaudio']
if bld.env['IS_LINUX']:
env_includes = ['../linux', '../posix', '../linux/alsa']
+ if bld.env['IS_NETBSD']:
+ env_includes = ['../netbsd', '../posix', '../netbsd/sun']
+ if bld.env['IS_FREEBSD']:
+ env_includes = ['../freebsd', '../posix', '../solaris/oss']
if bld.env['IS_SUN']:
- env_includes = ['../solaris', '../posix', '../solaris/oss']
- if bld.env['IS_WINDOWS']:
-@@ -36,7 +38,7 @@ def create_jack_process_obj(bld, target,
- process.name = target
- process.target = target
- process.source = sources
-- if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
-+ if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX']:
+@@ -41,7 +43,7 @@ def create_jack_process_obj(bld, target,
+ process.name = target
+ process.target = target
+ process.source = sources
+- if bld.env['IS_LINUX'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']:
++ if bld.env['IS_LINUX'] or bld.env['IS_NETBSD'] or bld.env['IS_MACOSX'] or bld.env['IS_FREEBSD']:
process.env.append_value('CPPFLAGS', '-fvisibility=hidden')
process.install_path = '${ADDON_DIR}/'
process.use = [uselib.name]
-@@ -92,6 +94,21 @@ def build(bld):
+@@ -98,6 +100,21 @@ def build(bld):
uselib.append('RT')
uselib.append('DL')
@@ -41,10 +41,10 @@ Add NetBSD support.
+ includes = ['../netbsd', '../posix'] + includes
+ uselib.append('RT')
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
common_libsources += [
'JackDebugClient.cpp',
-@@ -176,6 +193,12 @@ def build(bld):
+@@ -197,6 +214,12 @@ def build(bld):
'../posix/JackPosixServerLaunch.cpp',
]
@@ -54,18 +54,20 @@ Add NetBSD support.
+ '../posix/JackPosixServerLaunch.cpp',
+ ]
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
clientlib.source += [
'../posix/JackSocketClientChannel.cpp',
-@@ -205,12 +228,16 @@ def build(bld):
+@@ -232,6 +255,9 @@ def build(bld):
if bld.env['IS_LINUX']:
clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+ if bld.env['IS_NETBSD']:
+ clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
- if bld.env['IS_MACOSX']:
+ if bld.env['IS_FREEBSD']:
clientlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
+@@ -240,7 +266,8 @@ def build(bld):
clientlib.env.append_value('LINKFLAGS', '-single_module')
if bld.env['IS_SUN']:
@@ -75,7 +77,7 @@ Add NetBSD support.
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):
+@@ -311,6 +338,14 @@ def build(bld):
'../posix/JackNetUnixSocket.cpp',
]
@@ -87,10 +89,10 @@ Add NetBSD support.
+ '../posix/JackNetUnixSocket.cpp',
+ ]
+
- if bld.env['IS_SUN']:
+ if bld.env['IS_FREEBSD']:
serverlib.source += [
'../posix/JackSocketServerChannel.cpp',
-@@ -313,15 +348,21 @@ def build(bld):
+@@ -351,15 +386,21 @@ def build(bld):
elif not bld.env['IS_WINDOWS']:
serverlib.vnum = bld.env['JACK_API_VERSION']
@@ -112,27 +114,35 @@ Add NetBSD support.
+ 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 = bld(features=['c', 'cxx', 'cxxshlib', 'cshlib'])
+@@ -403,6 +444,15 @@ def build(bld):
+ ]
netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+ if bld.env['IS_NETBSD']:
-+ netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../netbsd/JackNetBSDTime.c']
++ netlib.source += [
++ '../posix/JackNetUnixSocket.cpp',
++ '../posix/JackPosixThread.cpp',
++ '../posix/JackPosixMutex.cpp',
++ '../netbsd/JackNetBSDTime.c'
++ ]
+ netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
+
- if bld.env['IS_SUN']:
- netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../posix/JackPosixMutex.cpp', '../solaris/JackSolarisTime.c']
+ if bld.env['IS_FREEBSD']:
+ netlib.source += [
+ '../posix/JackNetUnixSocket.cpp',
+@@ -420,6 +470,8 @@ def build(bld):
+ '../solaris/JackSolarisTime.c',
+ ]
netlib.env.append_value('CPPFLAGS', '-fvisibility=hidden')
--
+ 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,20 @@ def build(bld):
- process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
- process.use += ['ALSA', 'SAMPLERATE']
+ netlib.source += [
+@@ -490,11 +542,23 @@ 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']
@@ -140,14 +150,17 @@ Add NetBSD support.
+ process.env.append_value('LINKFLAGS', '-lsamplerate')
+ process.use += 'SAMPLERATE'
+
- 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'
+ if bld.env['BUILD_ADAPTER'] and (bld.env['IS_SUN'] or bld.env['IS_FREEBSD']):
+ audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c']
+ process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
+ process.use += 'SAMPLERATE'
+
++ if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']:
+ 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']
+ audio_adapter_sources += [
+ '../windows/portaudio/JackPortAudioAdapter.cpp',
Index: pkgsrc/audio/jack/patches/patch-tools_wscript
diff -u pkgsrc/audio/jack/patches/patch-tools_wscript:1.3 pkgsrc/audio/jack/patches/patch-tools_wscript:1.4
--- pkgsrc/audio/jack/patches/patch-tools_wscript:1.3 Thu Oct 21 13:45:12 2021
+++ pkgsrc/audio/jack/patches/patch-tools_wscript Sat Jan 7 21:20:19 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_wscript,v 1.3 2021/10/21 13:45:12 jperkin Exp $
+$NetBSD: patch-tools_wscript,v 1.4 2023/01/07 21:20:19 triaxx Exp $
- Add NetBSD support.
- Ensure jack_netsource is built on all Unixes.
---- tools/wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- tools/wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ tools/wscript
-@@ -30,6 +30,8 @@ def build(bld):
- os_incdir = ['../macosx', '../posix']
+@@ -35,6 +35,8 @@ def build(bld):
+ os_incdir = ['../freebsd', '../posix']
if bld.env['IS_SUN']:
os_incdir = ['../solaris', '../posix']
+ if bld.env['IS_NETBSD']:
@@ -14,16 +14,7 @@ $NetBSD: patch-tools_wscript,v 1.3 2021/
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']
-@@ -74,6 +76,9 @@ def build(bld):
+@@ -79,6 +81,9 @@ def build(bld):
prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib']
prog.target = 'jack_netsource'
prog.defines = ['HAVE_CONFIG_H']
@@ -32,4 +23,4 @@ $NetBSD: patch-tools_wscript,v 1.3 2021/
+ prog.env.append_value('LINKFLAGS', '-lsocket')
if bld.env['IS_LINUX'] and bld.env['BUILD_TOOL_ALSA_IO']:
- prog = bld(features = 'c cprogram')
+ prog = bld(features='c cprogram')
Index: pkgsrc/audio/jack/patches/patch-wscript
diff -u pkgsrc/audio/jack/patches/patch-wscript:1.4 pkgsrc/audio/jack/patches/patch-wscript:1.5
--- pkgsrc/audio/jack/patches/patch-wscript:1.4 Thu Oct 21 13:45:12 2021
+++ pkgsrc/audio/jack/patches/patch-wscript Sat Jan 7 21:20:19 2023
@@ -1,21 +1,21 @@
-$NetBSD: patch-wscript,v 1.4 2021/10/21 13:45:12 jperkin Exp $
+$NetBSD: patch-wscript,v 1.5 2023/01/07 21:20:19 triaxx Exp $
- Add NetBSD support.
- Ensure man pages are installed on all Unixes.
---- wscript.orig 2021-07-15 06:18:26.000000000 +0000
+--- wscript.orig 2022-04-15 19:14:06.000000000 +0000
+++ wscript
-@@ -192,6 +192,7 @@ def detect_platform(conf):
- # ('KEY, 'Human readable name', ['strings', 'to', 'check', 'for'])
+@@ -234,6 +234,7 @@ def detect_platform(conf):
('IS_LINUX', 'Linux', ['gnu0', 'gnukfreebsd', 'linux', 'posix']),
+ ('IS_FREEBSD', 'FreeBSD', ['freebsd']),
('IS_MACOSX', 'MacOS X', ['darwin']),
+ ('IS_NETBSD', 'NetBSD', ['netbsd']),
('IS_SUN', 'SunOS', ['sunos']),
('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32'])
]
-@@ -231,6 +232,11 @@ def configure(conf):
- conf.env.append_unique('CXXFLAGS', ['-Wall', '-Wno-invalid-offsetof'])
- conf.env.append_unique('CXXFLAGS', '-std=gnu++11')
+@@ -276,6 +277,11 @@ def configure(conf):
+ conf.check(lib='execinfo', uselib='EXECINFO', define_name='EXECINFO')
+ conf.check_cfg(package='libsysinfo', args='--cflags --libs')
+ # Needed to work around "error: ::vfscanf has not been declared" failures
+ # prior to NetBSD 9.99.x.
@@ -25,7 +25,7 @@ $NetBSD: patch-wscript,v 1.4 2021/10/21
if not conf.env['IS_MACOSX']:
conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined')
else:
-@@ -531,6 +537,9 @@ def obj_add_includes(bld, obj):
+@@ -568,6 +574,9 @@ def obj_add_includes(bld, obj):
if bld.env['IS_SUN']:
obj.includes += ['posix', 'solaris']
@@ -35,7 +35,7 @@ $NetBSD: patch-wscript,v 1.4 2021/10/21
if bld.env['IS_WINDOWS']:
obj.includes += ['windows']
-@@ -582,6 +591,10 @@ def create_driver_obj(bld, **kw):
+@@ -624,6 +633,10 @@ def create_driver_obj(bld, **kw):
else:
driver.env['cxxshlib_PATTERN'] = 'jack_%s.so'
@@ -46,7 +46,7 @@ $NetBSD: patch-wscript,v 1.4 2021/10/21
obj_add_includes(bld, driver)
return driver
-@@ -678,6 +691,11 @@ def build_drivers(bld):
+@@ -726,6 +739,11 @@ def build_drivers(bld):
'windows/portaudio/JackPortAudioDriver.cpp',
]
@@ -58,28 +58,27 @@ $NetBSD: patch-wscript,v 1.4 2021/10/21
winmme_src = [
'windows/winmme/JackWinMMEDriver.cpp',
'windows/winmme/JackWinMMEInputPort.cpp',
-@@ -779,6 +797,12 @@ def build_drivers(bld):
- target = 'oss',
- source = oss_src)
+@@ -834,6 +852,11 @@ def build_drivers(bld):
+ target='oss',
+ source=oss_src)
+ if bld.env['IS_NETBSD']:
+ create_driver_obj(
+ bld,
+ target = 'sun',
+ source = sun_src)
-+
+
def build(bld):
if not bld.variant and bld.env['BUILD_WITH_32_64']:
- Options.commands.append(bld.cmd + '_' + lib32)
-@@ -821,9 +845,10 @@ def build(bld):
- bld.recurse('tools')
+@@ -858,9 +881,10 @@ def build(bld):
+ bld.recurse('tools')
- if bld.env['IS_LINUX']:
+ if bld.env['IS_LINUX'] or bld.env['IS_FREEBSD']:
- bld.recurse('man')
bld.recurse('systemd')
- if not bld.env['IS_WINDOWS']:
+ if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']:
+ bld.recurse('man')
-+ if not bld.env['IS_WINDOWS']:
++ if not bld.env['IS_WINDOWS'] and bld.env['BUILD_JACK_EXAMPLE_TOOLS']:
bld.recurse('tests')
if bld.env['BUILD_JACKDBUS']:
bld.recurse('dbus')
Added files:
Index: pkgsrc/audio/jack/patches/patch-man_fill__template
diff -u /dev/null pkgsrc/audio/jack/patches/patch-man_fill__template:1.1
--- /dev/null Sat Jan 7 21:20:19 2023
+++ pkgsrc/audio/jack/patches/patch-man_fill__template Sat Jan 7 21:20:19 2023
@@ -0,0 +1,15 @@
+$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
Home |
Main Index |
Thread Index |
Old Index