pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/jack jack: updated to 0.125.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1c203732430
branches: trunk
changeset: 397045:c1c203732430
user: adam <adam%pkgsrc.org@localhost>
date: Sat Jun 15 08:21:32 2019 +0000
description:
jack: updated to 0.125.0
0.125.0:
Bug fixes
diffstat:
audio/jack/Makefile | 46 +++++------
audio/jack/buildlink3.mk | 4 +-
audio/jack/distinfo | 33 +++----
audio/jack/patches/patch-aa | 28 -------
audio/jack/patches/patch-ab | 25 ------
audio/jack/patches/patch-ad | 16 ----
audio/jack/patches/patch-af | 15 ---
audio/jack/patches/patch-ah | 19 ----
audio/jack/patches/patch-aj | 34 --------
audio/jack/patches/patch-ak | 28 -------
audio/jack/patches/patch-ao | 15 ---
audio/jack/patches/patch-ap | 13 ---
audio/jack/patches/patch-aq | 13 ---
audio/jack/patches/patch-ar | 17 ----
audio/jack/patches/patch-as | 23 ------
audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h | 15 ---
audio/jack/patches/patch-config_sysdeps_atomicity.h | 28 +++++++
audio/jack/patches/patch-config_sysdeps_cycles.h | 17 ++++
audio/jack/patches/patch-configure | 37 +++++++++
audio/jack/patches/patch-drivers_oss_oss__driver.c | 15 +++
audio/jack/patches/patch-drivers_oss_oss__driver.h | 18 ++++
audio/jack/patches/patch-include_engine.h | 19 ++++
audio/jack/patches/patch-jack_types.h | 15 +++
audio/jack/patches/patch-jackd_engine.c | 16 ++++
audio/jack/patches/patch-libjack_unlock.c | 28 +++++++
audio/jack/patches/patch-tools_transport.c | 15 +++
26 files changed, 246 insertions(+), 306 deletions(-)
diffs (truncated from 724 to 300 lines):
diff -r f1228f128d62 -r c1c203732430 audio/jack/Makefile
--- a/audio/jack/Makefile Sat Jun 15 07:21:43 2019 +0000
+++ b/audio/jack/Makefile Sat Jun 15 08:21:32 2019 +0000
@@ -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 @@
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
-
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-alsa
+CONFIGURE_ARGS+= --disable-firewire
+CONFIGURE_ARGS+= --disable-freebob
+CONFIGURE_ARGS+= --disable-optimize
+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
-CONFIGURE_ARGS+= --disable-alsa
-CONFIGURE_ARGS+= --disable-freebob
-CONFIGURE_ARGS+= --disable-coreaudio
-CONFIGURE_ARGS+= --disable-firewire
-CONFIGURE_ARGS+= --disable-optimize
-CONFIGURE_ARGS+= --enable-resize
-CONFIGURE_ARGS+= --enable-timestamps
-
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 @@
.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 @@
.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 @@
. 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"
diff -r f1228f128d62 -r c1c203732430 audio/jack/buildlink3.mk
--- a/audio/jack/buildlink3.mk Sat Jun 15 07:21:43 2019 +0000
+++ b/audio/jack/buildlink3.mk Sat Jun 15 08:21:32 2019 +0000
@@ -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 @@
.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"
diff -r f1228f128d62 -r c1c203732430 audio/jack/distinfo
--- a/audio/jack/distinfo Sat Jun 15 07:21:43 2019 +0000
+++ b/audio/jack/distinfo Sat Jun 15 08:21:32 2019 +0000
@@ -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
diff -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-aa
--- a/audio/jack/patches/patch-aa Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/11/16 11:22:55 bjs 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>
diff -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-ab
--- a/audio/jack/patches/patch-ab Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-ad
--- a/audio/jack/patches/patch-ad Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-af
--- a/audio/jack/patches/patch-af Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2008/11/16 11:22:55 bjs 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;
diff -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-ah
--- a/audio/jack/patches/patch-ah Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2016/02/10 09:19:22 wiz Exp $
-
-Allow overriding the watchdog timeout.
-
---- 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;
-
-+#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 {
diff -r f1228f128d62 -r c1c203732430 audio/jack/patches/patch-aj
--- a/audio/jack/patches/patch-aj Sat Jun 15 07:21:43 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
-
Home |
Main Index |
Thread Index |
Old Index