diff options
Diffstat (limited to 'audio/jack/patches')
19 files changed, 134 insertions, 187 deletions
diff --git a/audio/jack/patches/patch-ab b/audio/jack/patches/patch-ab deleted file mode 100644 index e307bae44b3..00000000000 --- a/audio/jack/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2008/11/16 11:22:55 bjs Exp $ - -BSD poll returns POLLIN, not POLLHUP, when the socket is closed, -as does Darwin. - ---- jackd/engine.c.orig 2008-11-11 17:36:40.000000000 -0500 -+++ jackd/engine.c -@@ -1385,7 +1385,7 @@ handle_external_client_request (jack_eng - if ((r = read (client->request_fd, &req, sizeof (req))) - < (ssize_t) sizeof (req)) { - if (r == 0) { --#ifdef JACK_USE_MACH_THREADS -+#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 -@@ -1398,7 +1398,7 @@ handle_external_client_request (jack_eng - and remove the client. - */ - jack_mark_client_socket_error (engine, fd); --#endif /* JACK_USE_MACH_THREADS */ -+#endif /* JACK_HOST_HAS_BSD_POLL | JACK_USE_MACH_THREADS */ - return 1; - } else { - jack_error ("cannot read request from client (%d/%d/%s)", diff --git a/audio/jack/patches/patch-ad b/audio/jack/patches/patch-ad deleted file mode 100644 index 2fa40a5cc21..00000000000 --- a/audio/jack/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2016/02/10 09:19:22 wiz Exp $ - ---- drivers/oss/oss_driver.h.orig 2013-10-04 00:45:25.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 diff --git a/audio/jack/patches/patch-aj b/audio/jack/patches/patch-aj deleted file mode 100644 index 4ad46a58536..00000000000 --- a/audio/jack/patches/patch-aj +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-aj,v 1.6 2016/02/14 09:22:48 jperkin Exp $ - -Kill all of the overzealous optimization; if the user wants this, -there is devel/cpuflags and mk.conf. - ---- configure.orig 2014-01-22 20:23:47.000000000 +0000 -+++ configure -@@ -14980,7 +14980,7 @@ eval as_val=\$$as_ac_Header - _ACEOF - - else -- as_fn_error "*** a required header file is missing" "$LINENO" 5 -+ : as_fn_error "*** a required header file is missing" "$LINENO" 5 - fi - - done -@@ -15793,7 +15793,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 -@@ -15828,7 +15828,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 - diff --git a/audio/jack/patches/patch-ao b/audio/jack/patches/patch-ao deleted file mode 100644 index 191e2864be7..00000000000 --- a/audio/jack/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2008/11/16 11:22:55 bjs 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 2008-11-11 17:36:43.000000000 -0500 -+++ drivers/oss/oss_driver.c -@@ -1042,6 +1042,7 @@ static void *io_thread (void *param) - pthread_mutex_lock(&driver->mutex_out); - memcpy(localbuf, driver->outdevbuf, - driver->outdevbufsize); -+ memset(driver->outdevbuf, 0x00, driver->outdevbufsize); - pthread_mutex_unlock(&driver->mutex_out); - - io_res = write(driver->outfd, localbuf, diff --git a/audio/jack/patches/patch-ap b/audio/jack/patches/patch-ap deleted file mode 100644 index ae8db969f63..00000000000 --- a/audio/jack/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.4 2016/02/10 09:19:22 wiz Exp $ - ---- jack/types.h.orig 2013-11-30 16:24:00.000000000 +0000 -+++ jack/types.h -@@ -27,7 +27,7 @@ - - typedef uint64_t jack_uuid_t; - --typedef int32_t jack_shmsize_t; -+typedef size_t jack_shmsize_t; - - /** - * Type used to represent sample frame counts. diff --git a/audio/jack/patches/patch-aq b/audio/jack/patches/patch-aq deleted file mode 100644 index 2ec04bb0841..00000000000 --- a/audio/jack/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.4 2016/02/10 09:19:22 wiz Exp $ - ---- Makefile.in.orig 2014-01-22 20:23:45.000000000 +0000 -+++ Makefile.in -@@ -286,7 +286,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc - stamp-h.in config.log config.cache config.status - - @HAVE_DOXYGEN_FALSE@DOC_DIR = --@HAVE_DOXYGEN_TRUE@DOC_DIR = doc -+@HAVE_DOXYGEN_TRUE@DOC_DIR = - SUBDIRS = libjack jackd drivers example-clients tools config $(DOC_DIR) man python - DIST_SUBDIRS = config libjack jackd include drivers example-clients tools doc man python - pkgconfigdir = $(libdir)/pkgconfig diff --git a/audio/jack/patches/patch-ar b/audio/jack/patches/patch-ar deleted file mode 100644 index f704a812456..00000000000 --- a/audio/jack/patches/patch-ar +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2008/11/16 11:22:55 bjs Exp $ - ---- config/sysdeps/cycles.h.orig 2008-11-11 17:36:35.000000000 -0500 -+++ config/sysdeps/cycles.h -@@ -1,7 +1,11 @@ - #ifndef _jack_sysdep_cycles_h_ - #define _jack_sysdep_cycles_h_ - --#if defined(__i386__) -+#ifdef __alpha__ -+ -+#include <config/cpu/alpha/cycles.h> -+ -+#elif defined(__i386__) - - /* technically, i386 doesn't have a cycle counter, but - running JACK on a real i386 seems like a ridiculuous diff --git a/audio/jack/patches/patch-as b/audio/jack/patches/patch-as deleted file mode 100644 index e841806491b..00000000000 --- a/audio/jack/patches/patch-as +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-as,v 1.2 2008/11/16 11:22:55 bjs Exp $ - ---- drivers/dummy/dummy_driver.c.orig 2008-11-11 17:36:45.000000000 -0500 -+++ drivers/dummy/dummy_driver.c -@@ -109,6 +109,7 @@ dummy_driver_wait (dummy_driver_t *drive - { - jack_nframes_t nframes = driver->period_size; - struct timespec now; -+ struct timespec ts; - - *status = 0; - /* this driver doesn't work so well if we report a delay */ -@@ -133,7 +134,9 @@ dummy_driver_wait (dummy_driver_t *drive - } - driver->next_wakeup = add_ts(driver->next_wakeup, driver->wait_time); - } else { -- if(clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &driver->next_wakeup, NULL)) { -+ ts.tv_sec = 0; -+ ts.tv_nsec = ts_to_nsec(driver->next_wakeup) - ts_to_nsec(now); -+ if(nanosleep(&ts, NULL)) { - jack_error("error while sleeping"); - *status = -1; - } else { diff --git a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h b/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h deleted file mode 100644 index 0da12220530..00000000000 --- a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.4 2015/01/27 04:37:53 dbj Exp $ - -Fix build on Mac OS X - ---- config/os/macosx/pThreadUtilities.h.orig 2008-05-29 12:26:05.000000000 +0000 -+++ config/os/macosx/pThreadUtilities.h -@@ -66,7 +66,7 @@ - #define __PTHREADUTILITIES_H__ - - #import "pthread.h" --#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> -+#import <Carbon/Carbon.h> // Really only need <MacTypes.h>, but that has problems on 10.6 - - #define THREAD_SET_PRIORITY 0 - #define THREAD_SCHEDULED_PRIORITY 1 diff --git a/audio/jack/patches/patch-aa b/audio/jack/patches/patch-config_sysdeps_atomicity.h index e3e1d1aa8a0..626ab35253e 100644 --- a/audio/jack/patches/patch-aa +++ b/audio/jack/patches/patch-config_sysdeps_atomicity.h @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2008/11/16 11:22:55 bjs Exp $ +$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 diff --git a/audio/jack/patches/patch-config_sysdeps_cycles.h b/audio/jack/patches/patch-config_sysdeps_cycles.h new file mode 100644 index 00000000000..94822294882 --- /dev/null +++ b/audio/jack/patches/patch-config_sysdeps_cycles.h @@ -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> diff --git a/audio/jack/patches/patch-configure b/audio/jack/patches/patch-configure new file mode 100644 index 00000000000..b87188691f7 --- /dev/null +++ b/audio/jack/patches/patch-configure @@ -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 + diff --git a/audio/jack/patches/patch-drivers_oss_oss__driver.c b/audio/jack/patches/patch-drivers_oss_oss__driver.c new file mode 100644 index 00000000000..0eabd3663ea --- /dev/null +++ b/audio/jack/patches/patch-drivers_oss_oss__driver.c @@ -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); diff --git a/audio/jack/patches/patch-drivers_oss_oss__driver.h b/audio/jack/patches/patch-drivers_oss_oss__driver.h new file mode 100644 index 00000000000..6ed437f99cc --- /dev/null +++ b/audio/jack/patches/patch-drivers_oss_oss__driver.h @@ -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 diff --git a/audio/jack/patches/patch-ah b/audio/jack/patches/patch-include_engine.h index 4152f4bccad..37407b6c14d 100644 --- a/audio/jack/patches/patch-ah +++ b/audio/jack/patches/patch-include_engine.h @@ -1,11 +1,11 @@ -$NetBSD: patch-ah,v 1.4 2016/02/10 09:19:22 wiz Exp $ +$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 2011-06-08 23:54:48.000000000 +0000 +--- 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]; + char name[JACK_CLIENT_NAME_SIZE]; } jack_reserved_name_t; +#ifndef JACKD_WATCHDOG_TIMEOUT diff --git a/audio/jack/patches/patch-jack_types.h b/audio/jack/patches/patch-jack_types.h new file mode 100644 index 00000000000..f4e41a0c39b --- /dev/null +++ b/audio/jack/patches/patch-jack_types.h @@ -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__ diff --git a/audio/jack/patches/patch-jackd_engine.c b/audio/jack/patches/patch-jackd_engine.c new file mode 100644 index 00000000000..cd71d6c024c --- /dev/null +++ b/audio/jack/patches/patch-jackd_engine.c @@ -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 diff --git a/audio/jack/patches/patch-ak b/audio/jack/patches/patch-libjack_unlock.c index fb29a2cdf93..9f201cb4b80 100644 --- a/audio/jack/patches/patch-ak +++ b/audio/jack/patches/patch-libjack_unlock.c @@ -1,28 +1,28 @@ -$NetBSD: patch-ak,v 1.3 2015/07/04 16:18:28 joerg Exp $ +$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 2008-11-11 17:36:29.000000000 -0500 +--- libjack/unlock.c.orig 2016-02-23 15:13:53.000000000 +0000 +++ libjack/unlock.c -@@ -44,8 +44,9 @@ static char* whitelist[] = { +@@ -44,8 +44,8 @@ static char* whitelist[] = { static char* library_roots[] = { "/lib", "/usr/lib", -+ "@PREFIX@", /* pkgsrc prefix */ -+ "@X11BASE@/lib", - "/usr/local/lib", +- "/usr/local/lib", - "/usr/X11R6/lib", - "/opt/lib", /* solaris-y */ - "/opt/local/lib", /* common on OS X */ ++ "@PREFIX@/lib", ++ "@X11BASE@/lib", + "/opt/lib", /* solaris-y */ + "/opt/local/lib", /* common on OS X */ NULL -@@ -63,7 +64,7 @@ cleanup_mlock () +@@ -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()); +- 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"); diff --git a/audio/jack/patches/patch-af b/audio/jack/patches/patch-tools_transport.c index e200f9110f4..09fd426d64d 100644 --- a/audio/jack/patches/patch-af +++ b/audio/jack/patches/patch-tools_transport.c @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.2 2008/11/16 11:22:55 bjs Exp $ +$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 |