Update to 0.121.3.

Changelog:
    Make the printed output of jack_iodelay more useful to actual users
    Compilation fixes for OS X (particularly PPC architectures)
    Remove SSE-related messages during startup
    Fix a few argument type declarations for a few functions
    OSS backend: fix a call to yet undefined engine instance

11 files changed, 63 insertions, 87 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index a4a7b9fce97..115e5f7801e 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.22 2012/09/12 00:24:40 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/02/09 19:59:44 ryoon Exp $
 #
 
 DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
 PKGNAME=	jack-${JACK_VERSION}
-PKGREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
+#MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://jackaudio.org/downloads/
 
-JACK_VERSION=	0.115.1
+JACK_VERSION=	0.121.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.jackaudio.org/
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index b620310ac47..4f04d25f66c 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,32 +1,47 @@
-@comment $NetBSD: PLIST,v 1.7 2012/01/04 06:46:59 sbd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/02/09 19:59:44 ryoon Exp $
 bin/jack_alias
+bin/jack_bufsize
 bin/jack_connect
 bin/jack_disconnect
 bin/jack_evmon
 bin/jack_freewheel
 bin/jack_impulse_grabber
+bin/jack_iodelay
+bin/jack_latent_client
 bin/jack_load
+bin/jack_load_test
 bin/jack_lsp
 bin/jack_metro
+bin/jack_midi_dump
 bin/jack_midiseq
 bin/jack_midisine
 bin/jack_monitor_client
 bin/jack_netsource
+bin/jack_rec
+bin/jack_samplerate
+bin/jack_server_control
+bin/jack_session_notify
 bin/jack_showtime
 bin/jack_simple_client
+bin/jack_simple_session_client
 bin/jack_transport
+bin/jack_transport_client
 bin/jack_unload
+bin/jack_wait
 bin/jackd
-bin/jackrec
+include/jack/control.h
 include/jack/intclient.h
 include/jack/jack.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/weakjack.h
+include/jack/weakmacros.h
 lib/jack/inprocess.la
 lib/jack/intime.la
 lib/jack/jack_dummy.la
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
index 8eba2f00239..4e912593a46 100644
--- a/audio/jack/buildlink3.mk
+++ b/audio/jack/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:23:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2013/02/09 19:59:44 ryoon Exp $
 
 BUILDLINK_TREE+=	jack
 
 .if !defined(JACK_BUILDLINK3_MK)
 JACK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.jack+=	jack>=0.110.0
+BUILDLINK_API_DEPENDS.jack+=	jack>=0.121.3
 BUILDLINK_PKGSRCDIR.jack?=	../../audio/jack
 
 .include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 9c019ea90b9..0de52a82075 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.9 2012/01/11 17:51:21 hans Exp $
+$NetBSD: distinfo,v 1.10 2013/02/09 19:59:44 ryoon Exp $
 
-SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838
-RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a
-Size (jack-audio-connection-kit-0.115.1.tar.bz2) = 606162 bytes
+SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
+RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
+Size (jack-audio-connection-kit-0.121.3.tar.gz) = 1083545 bytes
 SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
 SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
-SHA1 (patch-ac) = b7d6a3bdb890afa99a1849a4db694df509c9e19a
 SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
 SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
-SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58
-SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a
-SHA1 (patch-ai) = 6ba07c9c4a3997bc7b121f60d79a997d0b9fe646
-SHA1 (patch-aj) = 9fc6492b6aa28d9b61b7abeced22af9ad90850dc
+SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488
+SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07
 SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
-SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356
 SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
-SHA1 (patch-ap) = 60738eae086bdab7aa1986889da95621353f7aa6
-SHA1 (patch-aq) = 212441bb56a4cf33a213bb299f42e7dbcbc33274
+SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
+SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
 SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
 SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
-SHA1 (patch-drivers_netjack_netjack__packet.c) = 6ac2d470a10a823d66f3836989fa7125eae3e1b9
+SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02
diff --git a/audio/jack/patches/patch-ag b/audio/jack/patches/patch-ag
deleted file mode 100644
index 3e0643d3f1a..00000000000
--- a/audio/jack/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2008/11/16 11:22:55 bjs Exp $
-
---- jack.pc.in.orig	2008-11-11 17:36:46.000000000 -0500
-+++ jack.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: jack
- Description: the Jack Audio Connection Kit: a low-latency synchronous callback-based media server
- Version: @JACK_VERSION@
--Libs: -L${libdir} -ljack -lpthread @OS_LDFLAGS@
--Cflags: -I${includedir}
-+Libs: -L${libdir} -ljack @OS_LDFLAGS@
-+Cflags: -I${includedir} @OS_CPPFLAGS@
diff --git a/audio/jack/patches/patch-ah b/audio/jack/patches/patch-ah
index 943ce6aa1e5..296b31c4055 100644
--- a/audio/jack/patches/patch-ah
+++ b/audio/jack/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-ah,v 1.3 2013/02/09 19:59:44 ryoon Exp $
 
 Allow overriding the watchdog timeout.
 
---- jack/engine.h.orig	2008-11-11 17:36:38.000000000 -0500
+--- jack/engine.h.orig	2011-06-08 23:54:48.000000000 +0000
 +++ jack/engine.h
-@@ -51,8 +51,12 @@ typedef struct _jack_port_buffer_list {
-     jack_port_buffer_info_t *info;	/* jack_buffer_info_t array */
- } jack_port_buffer_list_t;
+@@ -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
diff --git a/audio/jack/patches/patch-aj b/audio/jack/patches/patch-aj
index fd72f4d032e..6b797dc6b3d 100644
--- a/audio/jack/patches/patch-aj
+++ b/audio/jack/patches/patch-aj
@@ -1,34 +1,25 @@
-$NetBSD: patch-aj,v 1.3 2008/11/16 11:55:19 bjs Exp $
+$NetBSD: patch-aj,v 1.4 2013/02/09 19:59:44 ryoon Exp $
 
 Kill all of the overzealous optimization; if the user wants this,
 there is devel/cpuflags and mk.conf.
 
---- configure.orig	2008-11-11 17:43:06.000000000 -0500
+--- configure.orig	2011-09-28 13:10:13.000000000 +0000
 +++ configure
-@@ -23714,7 +23714,7 @@ cat >>confdefs.h <<\_ACEOF
- #define x86 1
- _ACEOF
+@@ -15794,7 +15794,7 @@ rm -f core conftest.err conftest.$ac_obj
  
--    COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
-+    COMMON_X86_OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer"
+ $as_echo "#define x86 1" >>confdefs.h
  
-     if test x$with_cpu_target != x ; then
-         JACK_OPT_CFLAGS="-march=$with_cpu_target"
-@@ -23748,7 +23748,7 @@ cat >>confdefs.h <<\_ACEOF
- #define USE_DYNSIMD 1
- _ACEOF
+-    COMMON_X86_OPT_FLAGS="-O3 -fomit-frame-pointer -ffast-math -funroll-loops"
++    COMMON_X86_OPT_FLAGS="-fomit-frame-pointer"
  
--		SIMD_CFLAGS="-msse -msse2 -m3dnow"
-+		SIMD_CFLAGS=""
  
- fi
+     if test x$with_cpu_target != x ; then
+@@ -15832,7 +15832,7 @@ if test "x$enable_dynsimd" = xyes; then
  
-@@ -26082,7 +26082,7 @@ else
- fi
+ $as_echo "#define USE_DYNSIMD 1" >>confdefs.h
  
+-		SIMD_CFLAGS="-O -msse -msse2 -m3dnow"
++		SIMD_CFLAGS=""
  
--ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile doc/Makefile doc/reference.doxygen drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile"
-+ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile"
+ fi
  
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
diff --git a/audio/jack/patches/patch-am b/audio/jack/patches/patch-am
deleted file mode 100644
index dfd54c18f93..00000000000
--- a/audio/jack/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2008/11/16 11:22:55 bjs Exp $
-
---- drivers/oss/Makefile.in.orig	2008-11-11 17:43:11.000000000 -0500
-+++ drivers/oss/Makefile.in
-@@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
- am__installdirs = "$(DESTDIR)$(plugindir)"
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(plugin_LTLIBRARIES)
--jack_oss_la_LIBADD =
-+jack_oss_la_LIBADD = $(LIBOSSAUDIO)
- am_jack_oss_la_OBJECTS = oss_driver.lo
- jack_oss_la_OBJECTS = $(am_jack_oss_la_OBJECTS)
- jack_oss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
diff --git a/audio/jack/patches/patch-ap b/audio/jack/patches/patch-ap
index a11773be4e8..015d79aff15 100644
--- a/audio/jack/patches/patch-ap
+++ b/audio/jack/patches/patch-ap
@@ -1,10 +1,10 @@
-$NetBSD: patch-ap,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-ap,v 1.3 2013/02/09 19:59:45 ryoon Exp $
 
---- jack/types.h.orig	2008-11-11 17:36:38.000000000 -0500
+--- jack/types.h.orig	2011-02-28 18:57:02.000000000 +0000
 +++ jack/types.h
-@@ -23,7 +23,7 @@
- 
+@@ -24,7 +24,7 @@
  #include <inttypes.h>
+ #include <pthread.h>
  
 -typedef int32_t jack_shmsize_t;
 +typedef size_t jack_shmsize_t;
diff --git a/audio/jack/patches/patch-aq b/audio/jack/patches/patch-aq
index 61d80306da5..84e42e1cbf4 100644
--- a/audio/jack/patches/patch-aq
+++ b/audio/jack/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-aq,v 1.3 2013/02/09 19:59:45 ryoon Exp $
 
---- Makefile.in.orig	2008-11-11 17:43:08.000000000 -0500
+--- Makefile.in.orig	2011-09-28 13:10:11.000000000 +0000
 +++ Makefile.in
-@@ -233,7 +233,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+@@ -282,7 +282,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 = jack libjack jackd drivers example-clients tools config $(DOC_DIR)
- DIST_SUBDIRS = config jack libjack jackd drivers example-clients tools doc
+ SUBDIRS = jack libjack jackd drivers example-clients tools config $(DOC_DIR) man python
+ DIST_SUBDIRS = config jack libjack jackd drivers example-clients tools doc man python
  pkgconfigdir = $(libdir)/pkgconfig
diff --git a/audio/jack/patches/patch-drivers_netjack_netjack__packet.c b/audio/jack/patches/patch-drivers_netjack_netjack__packet.c
index aef26df4658..8b266af09e8 100644
--- a/audio/jack/patches/patch-drivers_netjack_netjack__packet.c
+++ b/audio/jack/patches/patch-drivers_netjack_netjack__packet.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-drivers_netjack_netjack__packet.c,v 1.1 2012/01/11 17:51:21 hans Exp $
+$NetBSD: patch-drivers_netjack_netjack__packet.c,v 1.2 2013/02/09 19:59:45 ryoon Exp $
 
---- drivers/netjack/netjack_packet.c.orig	2008-11-11 23:36:40.000000000 +0100
-+++ drivers/netjack/netjack_packet.c	2011-12-30 03:30:24.997459515 +0100
-@@ -35,6 +35,10 @@
+--- drivers/netjack/netjack_packet.c.orig	2011-06-08 23:54:48.000000000 +0000
++++ drivers/netjack/netjack_packet.c
+@@ -44,6 +44,10 @@
  #include <errno.h>
  #include <stdarg.h>
  
@@ -11,5 +11,5 @@ $NetBSD: patch-drivers_netjack_netjack__packet.c,v 1.1 2012/01/11 17:51:21 hans
 +#endif
 +
  #include <jack/types.h>
- #include <jack/engine.h>
  
+ // for jack_error in jack1