summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-02-10 09:19:22 +0000
committerwiz <wiz@pkgsrc.org>2016-02-10 09:19:22 +0000
commit42f8bfc01b9991a59e749564a180f135c78ac132 (patch)
treee6647d100478fd87284d00f785567b4aef70016d /audio
parentbeb6e2c718b9d9abcb782b10d6e2a6f8dc222358 (diff)
downloadpkgsrc-42f8bfc01b9991a59e749564a180f135c78ac132.tar.gz
Update jack to 0.124.1.
Changes not found. Disable simd option by default, since it breaks compilation for me on 7.99.26/amd64: ./simd.c: In function 'x86_3dnow_add2f': ./simd.c:211:3: error: impossible constraint in 'asm' asm volatile (
Diffstat (limited to 'audio')
-rw-r--r--audio/jack/Makefile21
-rw-r--r--audio/jack/PLIST7
-rw-r--r--audio/jack/distinfo20
-rw-r--r--audio/jack/patches/patch-ad8
-rw-r--r--audio/jack/patches/patch-ah6
-rw-r--r--audio/jack/patches/patch-aj17
-rw-r--r--audio/jack/patches/patch-ap10
-rw-r--r--audio/jack/patches/patch-aq10
8 files changed, 59 insertions, 40 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 2f139f57511..f0210bafa66 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2015/07/04 16:18:28 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.32 2016/02/10 09:19:22 wiz Exp $
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
PKGNAME= jack-${JACK_VERSION}
-PKGREVISION= 2
CATEGORIES= audio
#MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITES= http://jackaudio.org/downloads/
@@ -13,7 +11,7 @@ HOMEPAGE= http://www.jackaudio.org/
COMMENT= JACK audio connection kit
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
-JACK_VERSION= 0.121.3
+JACK_VERSION= 0.124.1
BUILD_DEFS+= JACKD_DEFAULT_TMPDIR
BUILD_DEFS+= JACKD_PROCFS_PATH
@@ -104,22 +102,31 @@ SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH X11BASE
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
PKG_OPTIONS_VAR= PKG_OPTIONS.jack
PKG_SUPPORTED_OPTIONS= simd
-PKG_SUGGESTED_OPTIONS= simd
+# on 7.99.26/amd64:
+# ./simd.c: In function 'x86_3dnow_add2f':
+# ./simd.c:211:3: error: impossible constraint in 'asm'
+# asm volatile (
+#PKG_SUGGESTED_OPTIONS= simd
. include "../../mk/bsd.options.mk"
. if !empty(PKG_OPTIONS:Msimd)
-CONFIGURE_ARGS+= --enable-simd
+CONFIGURE_ARGS+= --enable-dynsimd
. else
-CONFIGURE_ARGS+= --disable-simd
+CONFIGURE_ARGS+= --disable-dynsimd
. endif
.endif
+BDB_ACCEPTED= db2 db3 db4
+BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
+
post-extract:
${RUN} ${MKDIR} ${WRKSRC}/config/os/netbsd && \
${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index 4f04d25f66c..70aba9d64a6 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/02/09 19:59:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/02/10 09:19:22 wiz Exp $
bin/jack_alias
bin/jack_bufsize
bin/jack_connect
@@ -17,6 +17,7 @@ bin/jack_midiseq
bin/jack_midisine
bin/jack_monitor_client
bin/jack_netsource
+bin/jack_property
bin/jack_rec
bin/jack_samplerate
bin/jack_server_control
@@ -32,14 +33,16 @@ bin/jackd
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/inprocess.la
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 341ba0620e3..df5660c1f68 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 01:12:35 agc Exp $
+$NetBSD: distinfo,v 1.18 2016/02/10 09:19:22 wiz Exp $
-SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
-RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
-SHA512 (jack-audio-connection-kit-0.121.3.tar.gz) = 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f
-Size (jack-audio-connection-kit-0.121.3.tar.gz) = 1083545 bytes
+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) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
+SHA1 (patch-ad) = 3f13c886c7564f7f0b494c7891fcc3c945cf15ba
SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
-SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488
-SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07
+SHA1 (patch-ah) = 09965c317dfabfc9f867cfd69d68e69724d17b38
+SHA1 (patch-aj) = af1b33de7e1e2a938f6a21fa3a32ea2834ee1c36
SHA1 (patch-ak) = 90006096f7c4035edea75ebebeff58c18f04e39e
SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
-SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
-SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
+SHA1 (patch-ap) = f80d1547051324d9b241ce64027f13a5120ce5da
+SHA1 (patch-aq) = aad14525e2edf5a665e4de794e5e25930a27eec0
SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 7df929e00bac3612ceb5685d297dd998155b9dd1
diff --git a/audio/jack/patches/patch-ad b/audio/jack/patches/patch-ad
index 51aebaa2740..2fa40a5cc21 100644
--- a/audio/jack/patches/patch-ad
+++ b/audio/jack/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-ad,v 1.3 2016/02/10 09:19:22 wiz Exp $
---- drivers/oss/oss_driver.h.orig 2008-11-11 17:36:43.000000000 -0500
+--- drivers/oss/oss_driver.h.orig 2013-10-04 00:45:25.000000000 +0000
+++ drivers/oss/oss_driver.h
-@@ -34,7 +34,11 @@
- #include <jack/jack.h>
+@@ -35,7 +35,11 @@
+ #include "driver.h"
+#if defined(DEVOSSAUDIO)
diff --git a/audio/jack/patches/patch-ah b/audio/jack/patches/patch-ah
index 296b31c4055..4152f4bccad 100644
--- a/audio/jack/patches/patch-ah
+++ b/audio/jack/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.3 2013/02/09 19:59:44 ryoon Exp $
+$NetBSD: patch-ah,v 1.4 2016/02/10 09:19:22 wiz Exp $
Allow overriding the watchdog timeout.
---- jack/engine.h.orig 2011-06-08 23:54:48.000000000 +0000
-+++ jack/engine.h
+--- include/engine.h.orig 2011-06-08 23:54:48.000000000 +0000
++++ include/engine.h
@@ -56,8 +56,12 @@ typedef struct _jack_reserved_name {
char name[JACK_CLIENT_NAME_SIZE];
} jack_reserved_name_t;
diff --git a/audio/jack/patches/patch-aj b/audio/jack/patches/patch-aj
index 6b797dc6b3d..f235bf38ca2 100644
--- a/audio/jack/patches/patch-aj
+++ b/audio/jack/patches/patch-aj
@@ -1,11 +1,20 @@
-$NetBSD: patch-aj,v 1.4 2013/02/09 19:59:44 ryoon Exp $
+$NetBSD: patch-aj,v 1.5 2016/02/10 09:19:22 wiz Exp $
Kill all of the overzealous optimization; if the user wants this,
there is devel/cpuflags and mk.conf.
---- configure.orig 2011-09-28 13:10:13.000000000 +0000
+--- configure.orig 2014-01-22 20:23:47.000000000 +0000
+++ configure
-@@ -15794,7 +15794,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14969,7 +14969,7 @@ _ACEOF
+ fi
+
+ # headers
+-for ac_header in string.h strings.h alloca.h db.h
++for ac_header in string.h strings.h db.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -15793,7 +15793,7 @@ rm -f core conftest.err conftest.$ac_obj
$as_echo "#define x86 1" >>confdefs.h
@@ -14,7 +23,7 @@ there is devel/cpuflags and mk.conf.
if test x$with_cpu_target != x ; then
-@@ -15832,7 +15832,7 @@ if test "x$enable_dynsimd" = xyes; then
+@@ -15828,7 +15828,7 @@ if test "x$enable_dynsimd" = xyes; then
$as_echo "#define USE_DYNSIMD 1" >>confdefs.h
diff --git a/audio/jack/patches/patch-ap b/audio/jack/patches/patch-ap
index 015d79aff15..ae8db969f63 100644
--- a/audio/jack/patches/patch-ap
+++ b/audio/jack/patches/patch-ap
@@ -1,10 +1,10 @@
-$NetBSD: patch-ap,v 1.3 2013/02/09 19:59:45 ryoon Exp $
+$NetBSD: patch-ap,v 1.4 2016/02/10 09:19:22 wiz Exp $
---- jack/types.h.orig 2011-02-28 18:57:02.000000000 +0000
+--- jack/types.h.orig 2013-11-30 16:24:00.000000000 +0000
+++ jack/types.h
-@@ -24,7 +24,7 @@
- #include <inttypes.h>
- #include <pthread.h>
+@@ -27,7 +27,7 @@
+
+ typedef uint64_t jack_uuid_t;
-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 84e42e1cbf4..2ec04bb0841 100644
--- a/audio/jack/patches/patch-aq
+++ b/audio/jack/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.3 2013/02/09 19:59:45 ryoon Exp $
+$NetBSD: patch-aq,v 1.4 2016/02/10 09:19:22 wiz Exp $
---- Makefile.in.orig 2011-09-28 13:10:11.000000000 +0000
+--- Makefile.in.orig 2014-01-22 20:23:45.000000000 +0000
+++ Makefile.in
-@@ -282,7 +282,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+@@ -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 = 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
+ 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