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: adam
Date: Sat Jun 15 08:21:33 UTC 2019
Modified Files:
pkgsrc/audio/jack: Makefile buildlink3.mk distinfo
Added Files:
pkgsrc/audio/jack/patches: patch-config_sysdeps_atomicity.h
patch-config_sysdeps_cycles.h patch-configure
patch-drivers_oss_oss__driver.c patch-drivers_oss_oss__driver.h
patch-include_engine.h patch-jack_types.h patch-jackd_engine.c
patch-libjack_unlock.c patch-tools_transport.c
Removed Files:
pkgsrc/audio/jack/patches: patch-aa patch-ab patch-ad patch-af patch-ah
patch-aj patch-ak patch-ao patch-ap patch-aq patch-ar patch-as
patch-config_os_macosx_pThreadUtilities.h
Log Message:
jack: updated to 0.125.0
0.125.0:
Bug fixes
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/audio/jack/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/jack/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/jack/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/jack/patches/patch-aa \
pkgsrc/audio/jack/patches/patch-ad pkgsrc/audio/jack/patches/patch-ak
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/jack/patches/patch-ab \
pkgsrc/audio/jack/patches/patch-ah pkgsrc/audio/jack/patches/patch-ap \
pkgsrc/audio/jack/patches/patch-aq \
pkgsrc/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/jack/patches/patch-af \
pkgsrc/audio/jack/patches/patch-ao pkgsrc/audio/jack/patches/patch-ar \
pkgsrc/audio/jack/patches/patch-as
cvs rdiff -u -r1.6 -r0 pkgsrc/audio/jack/patches/patch-aj
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/jack/patches/patch-config_sysdeps_atomicity.h \
pkgsrc/audio/jack/patches/patch-config_sysdeps_cycles.h \
pkgsrc/audio/jack/patches/patch-configure \
pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.c \
pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.h \
pkgsrc/audio/jack/patches/patch-include_engine.h \
pkgsrc/audio/jack/patches/patch-jack_types.h \
pkgsrc/audio/jack/patches/patch-jackd_engine.c \
pkgsrc/audio/jack/patches/patch-libjack_unlock.c \
pkgsrc/audio/jack/patches/patch-tools_transport.c
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.35 pkgsrc/audio/jack/Makefile:1.36
--- pkgsrc/audio/jack/Makefile:1.35 Sat Jul 9 06:37:48 2016
+++ pkgsrc/audio/jack/Makefile Sat Jun 15 08:21:32 2019
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2016/07/09 06:37:48 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/06/15 08:21:32 adam Exp $
-DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
-PKGNAME= jack-${JACK_VERSION}
-PKGREVISION= 2
+DISTNAME= jack-audio-connection-kit-0.125.0
+PKGNAME= ${DISTNAME:S/audio-connection-kit-//}
CATEGORIES= audio
-#MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITES= http://jackaudio.org/downloads/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -12,34 +10,29 @@ HOMEPAGE= http://www.jackaudio.org/
COMMENT= JACK audio connection kit
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
-JACK_VERSION= 0.124.1
-
BUILD_DEFS+= JACKD_DEFAULT_TMPDIR
BUILD_DEFS+= JACKD_PROCFS_PATH
-GNU_CONFIGURE= yes
SET_LIBDIR= yes
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
-
-PKGCONFIG_OVERRIDE+= jack.pc.in
-
-PTHREAD_OPTS+= require native
-
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-alsa
-CONFIGURE_ARGS+= --disable-freebob
-CONFIGURE_ARGS+= --disable-coreaudio
CONFIGURE_ARGS+= --disable-firewire
+CONFIGURE_ARGS+= --disable-freebob
CONFIGURE_ARGS+= --disable-optimize
-CONFIGURE_ARGS+= --enable-resize
CONFIGURE_ARGS+= --enable-timestamps
+CONFIGURE_ARGS+= --enable-resize
+CONFIGURE_ENV+= HAVE_DOXYGEN=no
+CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
+PKGCONFIG_OVERRIDE+= jack.pc.in
+
+PTHREAD_OPTS+= require native
CFLAGS.NetBSD+= -D_NETBSD_SOURCE -lossaudio
CFLAGS.Linux+= -D_GNU_SOURCE
CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
-CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
-
JACKD_DEFAULT_TMPDIR?= /tmp
.include "../../mk/bsd.prefs.mk"
@@ -71,6 +64,8 @@ PLIST_VARS= coreaudio oss sunaudio
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --enable-coreaudio
PLIST.coreaudio= yes
+.else
+CONFIGURE_ARGS+= --disable-coreaudio
.endif
###
### XXX The sun driver is buggy on NetBSD right now. I hope to remedy
@@ -88,7 +83,7 @@ CONFIGURE_ARGS+= --disable-sun
.if ${OSS_TYPE} != "none"
CONFIGURE_ARGS+= --enable-oss
PLIST.oss= yes
-MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
+MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO}
CFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
.else
CONFIGURE_ARGS+= --disable-oss
@@ -118,16 +113,17 @@ CONFIGURE_ARGS+= --disable-dynsimd
. endif
.endif
-BUILDLINK_TRANSFORM+= l:db:db4
+BDB_ACCEPTED= db4 db5
+BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
post-extract:
- ${RUN} ${MKDIR} ${WRKSRC}/config/os/netbsd && \
- ${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
+ ${MKDIR} ${WRKSRC}/config/os/netbsd
+ ${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../devel/libuuid/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/jack/buildlink3.mk
diff -u pkgsrc/audio/jack/buildlink3.mk:1.9 pkgsrc/audio/jack/buildlink3.mk:1.10
--- pkgsrc/audio/jack/buildlink3.mk:1.9 Sun Feb 14 09:53:10 2016
+++ pkgsrc/audio/jack/buildlink3.mk Sat Jun 15 08:21:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2016/02/14 09:53:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/06/15 08:21:32 adam Exp $
BUILDLINK_TREE+= jack
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.jack?= ../../audio/j
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../devel/libuuid/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
# for DLOPEN_REQUIRE_PTHREADS
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/audio/jack/distinfo
diff -u pkgsrc/audio/jack/distinfo:1.19 pkgsrc/audio/jack/distinfo:1.20
--- pkgsrc/audio/jack/distinfo:1.19 Sun Feb 14 09:22:47 2016
+++ pkgsrc/audio/jack/distinfo Sat Jun 15 08:21:32 2019
@@ -1,24 +1,21 @@
-$NetBSD: distinfo,v 1.19 2016/02/14 09:22:47 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2019/06/15 08:21:32 adam Exp $
-SHA1 (jack-audio-connection-kit-0.124.1.tar.gz) = e9ba4a4c754ec95fbe653dcf7344edd6cc47cd60
-RMD160 (jack-audio-connection-kit-0.124.1.tar.gz) = 075c6ce5342d31e359908c01d7123f20818021aa
-SHA512 (jack-audio-connection-kit-0.124.1.tar.gz) = 9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2
-Size (jack-audio-connection-kit-0.124.1.tar.gz) = 1113456 bytes
-SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
-SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
-SHA1 (patch-ad) = 3f13c886c7564f7f0b494c7891fcc3c945cf15ba
-SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
-SHA1 (patch-ah) = 09965c317dfabfc9f867cfd69d68e69724d17b38
-SHA1 (patch-aj) = f03901740098fdebf7711c333f959a2d6c2f20f7
-SHA1 (patch-ak) = 90006096f7c4035edea75ebebeff58c18f04e39e
-SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
-SHA1 (patch-ap) = f80d1547051324d9b241ce64027f13a5120ce5da
-SHA1 (patch-aq) = aad14525e2edf5a665e4de794e5e25930a27eec0
-SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
-SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
-SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 7df929e00bac3612ceb5685d297dd998155b9dd1
+SHA1 (jack-audio-connection-kit-0.125.0.tar.gz) = 6b7516b442878ffd1ca875310084b33d0edee400
+RMD160 (jack-audio-connection-kit-0.125.0.tar.gz) = 25f1baa1d8f03f0bbfc0b48c300b63d89d4e881b
+SHA512 (jack-audio-connection-kit-0.125.0.tar.gz) = acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
+Size (jack-audio-connection-kit-0.125.0.tar.gz) = 1217977 bytes
+SHA1 (patch-config_sysdeps_atomicity.h) = f2346262d7590491f005af1c450f4436ec60c58e
+SHA1 (patch-config_sysdeps_cycles.h) = cbaefbefd0758625210c94bcba008b22c2c3a9d4
+SHA1 (patch-configure) = 79abcf4d7514cb4e66e3246fcd897f82c6d75e78
SHA1 (patch-drivers_coreaudio_Makefile.in) = 13f5e5914ae0304c93dca54518fecb19f5ecdec5
SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02
+SHA1 (patch-drivers_oss_oss__driver.c) = 302f20e82abde4a5b1678d2c3e9cbc8a63fad5ad
+SHA1 (patch-drivers_oss_oss__driver.h) = f23595db3fe80cae36ce222d89cdfbc37916e325
+SHA1 (patch-include_engine.h) = c58651bccc910131ffc9b263a75fa732a7a2b168
SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a
+SHA1 (patch-jack_types.h) = a58fcdafab7e014760287d763c944c8a77281f7f
+SHA1 (patch-jackd_engine.c) = 703242e74bb6d0cae1274b5e4f2c477a689432d9
+SHA1 (patch-libjack_unlock.c) = 4e346eb5dc2bce74968b894158cb3871d5076149
SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1
SHA1 (patch-tools_session__notify.c) = 6ab077be462993a054289803ffc3e8a6654c533e
+SHA1 (patch-tools_transport.c) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
Added files:
Index: pkgsrc/audio/jack/patches/patch-config_sysdeps_atomicity.h
diff -u /dev/null pkgsrc/audio/jack/patches/patch-config_sysdeps_atomicity.h:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-config_sysdeps_atomicity.h Sat Jun 15 08:21:32 2019
@@ -0,0 +1,28 @@
+$NetBSD: patch-config_sysdeps_atomicity.h,v 1.1 2019/06/15 08:21:32 adam Exp $
+
+--- config/sysdeps/atomicity.h.orig 2008-11-11 17:36:35.000000000 -0500
++++ config/sysdeps/atomicity.h
+@@ -1,7 +1,11 @@
+ #ifndef _jack_sysdep_atomicity_h_
+ #define _jack_sysdep_atomicity_h_
+
+-#if defined(__i386__)
++#if defined(HAVE_NETBSD_ATOMIC_OPS)
++
++#include <config/os/netbsd/atomicity.h>
++
++#elif defined(__i386__)
+
+ #include <config/cpu/i386/atomicity.h>
+
+@@ -15,6 +19,10 @@
+
+ #include <config/cpu/powerpc/atomicity.h>
+
++#elif defined(__mips__) || defined(__mips64__)
++
++#include <config/cpu/mips/atomicity.h>
++
+ #else
+
+ #include <config/cpu/generic/atomicity.h>
Index: pkgsrc/audio/jack/patches/patch-config_sysdeps_cycles.h
diff -u /dev/null pkgsrc/audio/jack/patches/patch-config_sysdeps_cycles.h:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-config_sysdeps_cycles.h Sat Jun 15 08:21:32 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-config_sysdeps_cycles.h,v 1.1 2019/06/15 08:21:32 adam Exp $
+
+Add support for Alpha.
+
+--- config/sysdeps/cycles.h.orig 2016-02-23 15:13:53.000000000 +0000
++++ config/sysdeps/cycles.h
+@@ -19,6 +19,10 @@
+
+ #include <config/cpu/powerpc/cycles.h>
+
++#elif defined(__alpha__)
++
++#include <config/cpu/alpha/cycles.h>
++
+ #else
+
+ #include <config/cpu/generic/cycles.h>
Index: pkgsrc/audio/jack/patches/patch-configure
diff -u /dev/null pkgsrc/audio/jack/patches/patch-configure:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-configure Sat Jun 15 08:21:32 2019
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure,v 1.1 2019/06/15 08:21:32 adam Exp $
+
+Do not set -mmacosx-version-min.
+Kill all of the overzealous optimization; if the user wants this,
+there is devel/cpuflags and mk.conf.
+
+--- configure.orig 2016-09-14 22:02:13.000000000 +0000
++++ configure
+@@ -16589,10 +16589,6 @@ fi
+
+ JACK_CORE_CFLAGS="$JACK_CORE_CFLAGS $JACK_LIBC_HELPER_FLAGS"
+
+-case $build_os in
+- # we need weak linkage which appeared in 10.2, but lets ask for 10.4 anyway
+- darwin*) JACK_CORE_CFLAGS="$JACK_CORE_CFLAGS -mmacosx-version-min=10.4" ;;
+-esac
+
+
+ # Check whether --with-cpu-target was given.
+@@ -16759,7 +16755,7 @@ rm -f core conftest.err conftest.$ac_obj
+
+ $as_echo "#define x86 1" >>confdefs.h
+
+- COMMON_X86_OPT_FLAGS="-O3 -fomit-frame-pointer -ffast-math -funroll-loops"
++ COMMON_X86_OPT_FLAGS="-fomit-frame-pointer"
+
+
+ if test x$with_cpu_target != x ; then
+@@ -16794,7 +16790,7 @@ if test "x$enable_dynsimd" = xyes; then
+
+ $as_echo "#define USE_DYNSIMD 1" >>confdefs.h
+
+- SIMD_CFLAGS="-O -msse -msse2 -m3dnow"
++ SIMD_CFLAGS=""
+
+ fi
+
Index: pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.c
diff -u /dev/null pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.c:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.c Sat Jun 15 08:21:32 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_oss_oss__driver.c,v 1.1 2019/06/15 08:21:32 adam Exp $
+
+We want to make sure there's no garbage in the output buffer, otherwise
+untoward stuff can happen.
+
+--- drivers/oss/oss_driver.c.orig 2016-02-23 15:13:53.000000000 +0000
++++ drivers/oss/oss_driver.c
+@@ -949,6 +949,7 @@ static void *io_thread (void *param)
+ while (driver->run) {
+ pthread_mutex_lock (&driver->mutex_out);
+ memcpy (localbuf, driver->outdevbuf, localsize);
++ memset(driver->outdevbuf, 0, driver->outdevbufsize);
+ pthread_mutex_unlock (&driver->mutex_out);
+
+ io_res = write (driver->outfd, localbuf, localsize);
Index: pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.h
diff -u /dev/null pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.h:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-drivers_oss_oss__driver.h Sat Jun 15 08:21:33 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-drivers_oss_oss__driver.h,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+Use proper OSS device.
+
+--- drivers/oss/oss_driver.h.orig 2016-02-23 15:13:53.000000000 +0000
++++ drivers/oss/oss_driver.h
+@@ -35,7 +35,11 @@
+ #include "driver.h"
+
+
++#if defined(DEVOSSAUDIO)
++#define OSS_DRIVER_DEF_DEV DEVOSSAUDIO
++#else
+ #define OSS_DRIVER_DEF_DEV "/dev/dsp"
++#endif
+ #define OSS_DRIVER_DEF_FS 48000
+ #define OSS_DRIVER_DEF_BLKSIZE 1024
+ #define OSS_DRIVER_DEF_NPERIODS 2
Index: pkgsrc/audio/jack/patches/patch-include_engine.h
diff -u /dev/null pkgsrc/audio/jack/patches/patch-include_engine.h:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-include_engine.h Sat Jun 15 08:21:33 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_engine.h,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+Allow overriding the watchdog timeout.
+
+--- include/engine.h.orig 2016-03-02 22:50:14.000000000 +0000
++++ include/engine.h
+@@ -56,8 +56,12 @@ typedef struct _jack_reserved_name {
+ char name[JACK_CLIENT_NAME_SIZE];
+ } jack_reserved_name_t;
+
++#ifndef JACKD_WATCHDOG_TIMEOUT
+ #define JACKD_WATCHDOG_TIMEOUT 10000
++#endif
++#ifndef JACKD_CLIENT_EVENT_TIMEOUT
+ #define JACKD_CLIENT_EVENT_TIMEOUT 2000
++#endif
+
+ /* The main engine structure in local memory. */
+ struct _jack_engine {
Index: pkgsrc/audio/jack/patches/patch-jack_types.h
diff -u /dev/null pkgsrc/audio/jack/patches/patch-jack_types.h:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-jack_types.h Sat Jun 15 08:21:33 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-jack_types.h,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+size_t is more suitable for jack_shmsize_t.
+
+--- jack/types.h.orig 2016-09-14 22:01:23.000000000 +0000
++++ jack/types.h
+@@ -26,7 +26,7 @@
+
+ typedef uint64_t jack_uuid_t;
+
+-typedef int32_t jack_shmsize_t;
++typedef size_t jack_shmsize_t;
+
+ #ifndef POST_PACKED_STRUCTURE
+ #ifdef __GNUC__
Index: pkgsrc/audio/jack/patches/patch-jackd_engine.c
diff -u /dev/null pkgsrc/audio/jack/patches/patch-jackd_engine.c:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-jackd_engine.c Sat Jun 15 08:21:33 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-jackd_engine.c,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+BSD poll returns POLLIN, not POLLHUP, when the socket is closed,
+as does Darwin.
+
+--- jackd/engine.c.orig 2016-09-14 17:41:53.000000000 +0000
++++ jackd/engine.c
+@@ -1435,7 +1435,7 @@ handle_external_client_request (jack_eng
+ if ((r = read (client->request_fd, &req, sizeof(req)))
+ < (ssize_t)sizeof(req)) {
+ if (r == 0) {
+-#if defined(JACK_USE_MACH_THREADS) || defined(__OpenBSD__)
++#if defined(JACK_HOST_HAS_BSD_POLL) || defined(JACK_USE_MACH_THREADS)
+ /* poll is implemented using
+ select (see the macosx/fakepoll
+ code). When the socket is closed
Index: pkgsrc/audio/jack/patches/patch-libjack_unlock.c
diff -u /dev/null pkgsrc/audio/jack/patches/patch-libjack_unlock.c:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-libjack_unlock.c Sat Jun 15 08:21:33 2019
@@ -0,0 +1,28 @@
+$NetBSD: patch-libjack_unlock.c,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+Yuck. At least let's attempt to make this somewhat sane.
+When I have the time and figure out the Right Thing(tm)
+to do, perhaps I'll rewrite some of the shm code.
+
+--- libjack/unlock.c.orig 2016-02-23 15:13:53.000000000 +0000
++++ libjack/unlock.c
+@@ -44,8 +44,8 @@ static char* whitelist[] = {
+ static char* library_roots[] = {
+ "/lib",
+ "/usr/lib",
+- "/usr/local/lib",
+- "/usr/X11R6/lib",
++ "@PREFIX@/lib",
++ "@X11BASE@/lib",
+ "/opt/lib", /* solaris-y */
+ "/opt/local/lib", /* common on OS X */
+ NULL
+@@ -63,7 +63,7 @@ cleanup_mlock ()
+ int whoknows;
+ int looks_like_library;
+
+- snprintf (path, sizeof(path), "/proc/%d/maps", getpid ());
++ snprintf (path, sizeof(path), "@JACKD_PROCFS_PATH@/%d/maps", getpid ());
+
+ if ((map = fopen (path, "r")) == NULL) {
+ jack_error ("can't open map file");
Index: pkgsrc/audio/jack/patches/patch-tools_transport.c
diff -u /dev/null pkgsrc/audio/jack/patches/patch-tools_transport.c:1.1
--- /dev/null Sat Jun 15 08:21:33 2019
+++ pkgsrc/audio/jack/patches/patch-tools_transport.c Sat Jun 15 08:21:33 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_transport.c,v 1.1 2019/06/15 08:21:33 adam Exp $
+
+--- tools/transport.c.orig 2008-11-11 17:36:30.000000000 -0500
++++ tools/transport.c
+@@ -29,6 +29,10 @@
+ #include <jack/jack.h>
+ #include <jack/transport.h>
+
++#ifndef whitespace
++#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
++#endif
++
+ char *package; /* program name */
+ int done = 0;
+ jack_client_t *client;
Home |
Main Index |
Thread Index |
Old Index