Index: Makefile =================================================================== RCS file: /cvs/ports/audio/jack/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile 24 Jan 2015 11:07:57 -0000 1.29 +++ Makefile 20 Apr 2015 16:34:33 -0000 @@ -4,14 +4,13 @@ SHARED_ONLY = Yes COMMENT = low latency sound server -V = 0.121.3 +V = 0.124.1 DISTNAME = jack-audio-connection-kit-${V} PKGNAME = jack-${V} -REVISION = 4 CATEGORIES = audio -SHARED_LIBS += jack 0.0 # 0.28 -SHARED_LIBS += jackserver 0.0 # 0.28 +SHARED_LIBS += jack 1.0 # 0.28 +SHARED_LIBS += jackserver 1.0 # 0.28 HOMEPAGE = http://jackaudio.org/ @@ -27,8 +26,12 @@ LIB_DEPENDS = audio/libsndfile \ audio/libsamplerate \ audio/celt>=0.11.0 + # uses macros from libtool.m4 -BUILD_DEPENDS = devel/libtool +BUILD_DEPENDS = devel/libtool \ + databases/db/v4 \ + sysutils/e2fsprogs + LIBTOOL_FLAGS += --tag=disable-static AUTOCONF_VERSION = 2.65 @@ -40,7 +43,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --disable-portaudio \ --disable-optimize -CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \ LDFLAGS="-L${LOCALBASE}/lib" \ HAVE_DOXYGEN="false" Index: distinfo =================================================================== RCS file: /cvs/ports/audio/jack/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo 18 Jan 2015 03:12:42 -0000 1.6 +++ distinfo 20 Apr 2015 16:34:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (jack-audio-connection-kit-0.121.3.tar.gz) = twldPeq+7NGXcrNyQeicbHneav1sAxunVnUTz+Ub6vo= -SIZE (jack-audio-connection-kit-0.121.3.tar.gz) = 1083545 +SHA256 (jack-audio-connection-kit-0.124.1.tar.gz) = 60LfYGVXbwj+7rYMuTVdzk61OHRTStcVNNeqMbrlYdY= +SIZE (jack-audio-connection-kit-0.124.1.tar.gz) = 1113456 Index: files/sndio_driver.c =================================================================== RCS file: /cvs/ports/audio/jack/files/sndio_driver.c,v retrieving revision 1.5 diff -u -p -u -p -r1.5 sndio_driver.c --- files/sndio_driver.c 24 Jan 2012 08:03:52 -0000 1.5 +++ files/sndio_driver.c 20 Apr 2015 16:34:33 -0000 @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include Index: files/sndio_driver.h =================================================================== RCS file: /cvs/ports/audio/jack/files/sndio_driver.h,v retrieving revision 1.2 diff -u -p -u -p -r1.2 sndio_driver.h --- files/sndio_driver.h 7 Jun 2010 01:44:38 -0000 1.2 +++ files/sndio_driver.h 20 Apr 2015 16:34:33 -0000 @@ -23,7 +23,7 @@ #include #include -#include +#include #include #define SNDIO_DRIVER_DEF_DEV "default" Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/audio/jack/patches/patch-configure_ac,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-configure_ac --- patches/patch-configure_ac 24 Jan 2012 08:03:52 -0000 1.7 +++ patches/patch-configure_ac 20 Apr 2015 16:34:33 -0000 @@ -1,7 +1,15 @@ -$OpenBSD: patch-configure_ac,v 1.7 2012/01/24 08:03:52 ajacoutot Exp $ ---- configure.ac.orig Wed Sep 28 15:09:59 2011 -+++ configure.ac Mon Jan 23 14:21:11 2012 -@@ -765,7 +765,7 @@ AC_SUBST(NETJACK_CFLAGS) +--- configure.ac.orig Wed Jan 22 12:23:36 2014 ++++ configure.ac Sun Apr 19 15:03:55 2015 +@@ -207,7 +207,7 @@ if test "x$JACK_USE_MACH_THREADS" != "x"; then + fi + + # headers +-AC_CHECK_HEADERS(string.h strings.h alloca.h db.h, [], ++AC_CHECK_HEADERS(string.h strings.h db.h, [], + AC_MSG_ERROR([*** a required header file is missing])) + + AC_CHECK_HEADERS(getopt.h, [], [ +@@ -761,7 +761,7 @@ AC_SUBST(NETJACK_CFLAGS) # Check which backend drivers can be built. The last one successfully # configured becomes the default JACK driver; so the order of @@ -10,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2012/ JACK_DEFAULT_DRIVER=\"dummy\" -@@ -825,6 +825,20 @@ then +@@ -821,6 +821,20 @@ then fi AM_CONDITIONAL(HAVE_SUN, $HAVE_SUN) @@ -31,7 +39,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2012/ AC_ARG_ENABLE(freebob, AC_HELP_STRING([--disable-freebob],[ignore FreeBob driver ]), TRY_FREEBOB=$enableval , TRY_FREEBOB=yes ) HAVE_FREEBOB="false" -@@ -957,6 +971,7 @@ drivers/a2j/Makefile +@@ -953,6 +967,7 @@ drivers/alsa_midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile @@ -39,7 +47,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2012/ drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile -@@ -987,6 +1002,7 @@ echo \| Build with old FireWire \(FreeBob\) support... +@@ -984,6 +999,7 @@ echo \| Build with old FireWire \(FreeBob\) support... echo \| Build with new FireWire \(FFADO\) support............... : $HAVE_FIREWIRE echo \| Build with OSS support................................ : $HAVE_OSS echo \| Build with Sun audio support.......................... : $HAVE_SUN Index: patches/patch-drivers_Makefile_am =================================================================== RCS file: /cvs/ports/audio/jack/patches/patch-drivers_Makefile_am,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-drivers_Makefile_am --- patches/patch-drivers_Makefile_am 24 Jan 2012 08:03:52 -0000 1.2 +++ patches/patch-drivers_Makefile_am 20 Apr 2015 16:34:33 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-drivers_Makefile_am,v 1.2 2012/01/24 08:03:52 ajacoutot Exp $ ---- drivers/Makefile.am.orig Fri Jan 29 20:35:52 2010 -+++ drivers/Makefile.am Mon Jan 23 14:21:11 2012 -@@ -25,6 +25,12 @@ else +--- drivers/Makefile.am.orig Fri Oct 11 09:22:27 2013 ++++ drivers/Makefile.am Sun Apr 19 14:47:08 2015 +@@ -24,6 +24,12 @@ else SUN_DIR = endif @@ -14,11 +14,11 @@ $OpenBSD: patch-drivers_Makefile_am,v 1. if HAVE_PA PA_DIR = portaudio else -@@ -49,5 +55,5 @@ else +@@ -48,5 +54,5 @@ else FIREWIRE_DIR = endif --SUBDIRS = $(ALSA_MIDI_DIR) $(A2J_DIR) $(ALSA_DIR) dummy $(OSS_DIR) $(SUN_DIR) $(PA_DIR) $(CA_DIR) $(FREEBOB_DIR) $(FIREWIRE_DIR) netjack --DIST_SUBDIRS = alsa alsa-midi a2j dummy oss sun portaudio coreaudio freebob firewire netjack +-SUBDIRS = $(ALSA_MIDI_DIR) $(ALSA_DIR) dummy $(OSS_DIR) $(SUN_DIR) $(PA_DIR) $(CA_DIR) $(FREEBOB_DIR) $(FIREWIRE_DIR) netjack +-DIST_SUBDIRS = alsa alsa_midi dummy oss sun portaudio coreaudio freebob firewire netjack +SUBDIRS = $(ALSA_MIDI_DIR) $(ALSA_DIR) dummy $(OSS_DIR) $(SUN_DIR) $(SNDIO_DIR) $(PA_DIR) $(CA_DIR) $(FREEBOB_DIR) $(FIREWIRE_DIR) netjack -+DIST_SUBDIRS = alsa alsa-midi dummy oss sun sndio portaudio coreaudio freebob firewire netjack ++DIST_SUBDIRS = alsa alsa_midi dummy oss sun sndio portaudio coreaudio freebob firewire netjack Index: patches/patch-jackd_engine_c =================================================================== RCS file: /cvs/ports/audio/jack/patches/patch-jackd_engine_c,v retrieving revision 1.9 diff -u -p -u -p -r1.9 patch-jackd_engine_c --- patches/patch-jackd_engine_c 24 Jan 2012 08:03:52 -0000 1.9 +++ patches/patch-jackd_engine_c 20 Apr 2015 16:34:33 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-jackd_engine_c,v 1.9 2012/01/24 08:03:52 ajacoutot Exp $ ---- jackd/engine.c.orig Mon Jan 23 14:37:43 2012 -+++ jackd/engine.c Mon Jan 23 14:38:38 2012 -@@ -1491,7 +1491,7 @@ handle_external_client_request (jack_engine_t *engine, +--- jackd/engine.c.orig Sat Nov 30 09:04:00 2013 ++++ jackd/engine.c Sun Apr 19 14:47:08 2015 +@@ -1415,7 +1415,7 @@ handle_external_client_request (jack_engine_t *engine, if ((r = read (client->request_fd, &req, sizeof (req))) < (ssize_t) sizeof (req)) { if (r == 0) { @@ -10,7 +10,7 @@ $OpenBSD: patch-jackd_engine_c,v 1.9 201 /* poll is implemented using select (see the macosx/fakepoll code). When the socket is closed -@@ -1676,9 +1676,13 @@ jack_server_thread (void *arg) +@@ -1636,9 +1636,13 @@ jack_server_thread (void *arg) } else if (engine->pfd[i].revents & POLLIN) { if (handle_external_client_request (engine, engine->pfd[i].fd)) { Index: patches/patch-jackd_jackd_1_in =================================================================== RCS file: /cvs/ports/audio/jack/patches/patch-jackd_jackd_1_in,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-jackd_jackd_1_in --- patches/patch-jackd_jackd_1_in 24 Jan 2012 08:03:52 -0000 1.2 +++ patches/patch-jackd_jackd_1_in 20 Apr 2015 16:34:33 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-jackd_jackd_1_in,v 1.2 2012/01/24 08:03:52 ajacoutot Exp $ ---- jackd/jackd.1.in.orig Thu Jun 9 01:54:48 2011 -+++ jackd/jackd.1.in Mon Jan 23 14:21:11 2012 +--- jackd/jackd.1.in.orig Wed Jan 22 10:08:05 2014 ++++ jackd/jackd.1.in Sun Apr 19 14:47:08 2015 @@ -28,8 +28,9 @@ For the latest JACK information, please consult the we .br Select the audio interface backend. The current list of supported @@ -10,10 +10,10 @@ $OpenBSD: patch-jackd_jackd_1_in,v 1.2 2 +\fBoss\fR \fBsun\fR \fBsndio\fR and \fBportaudio\fR. They are not +all available on all platforms. All \fIbackend\-parameters\fR are +optional. - .TP \fB\-h, \-\-help\fR -@@ -417,6 +418,43 @@ Specify output device for playback (default: /dev/audi + .br +@@ -490,6 +491,43 @@ Specify output device for playback (default: /dev/audi .TP \fB\-b, \-\-ignorehwbuf \fIboolean\fR Specify, whether to ignore hardware period size (default: false) @@ -57,7 +57,7 @@ $OpenBSD: patch-jackd_jackd_1_in,v 1.2 2 .SS PORTAUDIO BACKEND PARAMETERS .TP \fB\-c \-\-channel\fR -@@ -467,6 +505,8 @@ Print usage message for the parameters specific to eac +@@ -540,6 +578,8 @@ Print usage message for the parameters specific to eac \fBjackd \-d oss \-\-help\fR .br \fBjackd \-d sun \-\-help\fR Index: patches/patch-jackd_jackd_c =================================================================== RCS file: /cvs/ports/audio/jack/patches/patch-jackd_jackd_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-jackd_jackd_c --- patches/patch-jackd_jackd_c 24 Jan 2012 08:03:52 -0000 1.2 +++ patches/patch-jackd_jackd_c 20 Apr 2015 16:34:33 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-jackd_jackd_c,v 1.2 2012/01/24 08:03:52 ajacoutot Exp $ ---- jackd/jackd.c.orig Thu Jun 9 01:54:48 2011 -+++ jackd/jackd.c Mon Jan 23 14:22:51 2012 -@@ -399,7 +399,7 @@ static void usage (FILE *file) +--- jackd/jackd.c.orig Wed Jan 22 09:47:00 2014 ++++ jackd/jackd.c Sun Apr 19 14:47:08 2015 +@@ -551,7 +551,7 @@ static void usage (FILE *file) #ifdef __APPLE__ " Available backends may include: coreaudio, dummy, net, portaudio.\n\n" #else Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/jack/pkg/PLIST,v retrieving revision 1.8 diff -u -p -u -p -r1.8 PLIST --- pkg/PLIST 24 Jan 2012 08:03:52 -0000 1.8 +++ pkg/PLIST 20 Apr 2015 16:34:33 -0000 @@ -17,6 +17,7 @@ @bin bin/jack_midisine @bin bin/jack_monitor_client @bin bin/jack_netsource +@bin bin/jack_property @bin bin/jack_rec @bin bin/jack_samplerate @bin bin/jack_server_control @@ -33,14 +34,16 @@ include/jack/ include/jack/control.h include/jack/intclient.h include/jack/jack.h +include/jack/jslist.h +include/jack/metadata.h include/jack/midiport.h include/jack/ringbuffer.h include/jack/session.h include/jack/statistics.h include/jack/thread.h -include/jack/timestamps.h include/jack/transport.h include/jack/types.h +include/jack/uuid.h include/jack/weakjack.h include/jack/weakmacros.h lib/jack/