pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/jack Update to jack-0.115.1 (from SVN). Changes...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9780ef86bfd3
branches: trunk
changeset: 550158:9780ef86bfd3
user: bjs <bjs%pkgsrc.org@localhost>
date: Sun Nov 16 11:22:55 2008 +0000
description:
Update to jack-0.115.1 (from SVN). Changes: pulled in a patch
to [hopefully] correct errant behavior wrt: non-blocking I/O and sockets.
This is presently untested, however. Also, with this snapshot
we at least have the hope that the network facility works. Includes
other miscellaneous bug fixes, also.
While here, explicitly enable coreaudio on Darwin and add a PLIST
entry for its driver module. This is also untested, but at least
installation on Darwin will not fail due to an incorrect PLIST. Also,
include ../../mk/dlopen.buildlink3.mk in our bl3.mk in order
to heed DLOPEN_REQUIRE_PTHREADS.
diffstat:
audio/jack/Makefile | 55 +++++++++++++++++++++++++++++---------
audio/jack/PLIST | 3 +-
audio/jack/buildlink3.mk | 5 ++-
audio/jack/distinfo | 41 +++++++++++++--------------
audio/jack/patches/patch-aa | 4 +-
audio/jack/patches/patch-ab | 8 ++--
audio/jack/patches/patch-ac | 31 +++++++++-----------
audio/jack/patches/patch-ad | 4 +-
audio/jack/patches/patch-ae | 65 ++++++++++++++++++++++++++++++++++----------
audio/jack/patches/patch-af | 4 +-
audio/jack/patches/patch-ag | 4 +-
audio/jack/patches/patch-ah | 4 +-
audio/jack/patches/patch-ai | 4 +-
audio/jack/patches/patch-ak | 17 ++++++----
audio/jack/patches/patch-am | 4 +-
audio/jack/patches/patch-ao | 4 +-
audio/jack/patches/patch-ap | 4 +-
audio/jack/patches/patch-aq | 4 +-
audio/jack/patches/patch-ar | 4 +-
audio/jack/patches/patch-as | 4 +-
20 files changed, 169 insertions(+), 104 deletions(-)
diffs (truncated from 508 to 300 lines):
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/Makefile
--- a/audio/jack/Makefile Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/Makefile Sun Nov 16 11:22:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/07/31 03:58:05 bjs Exp $
+# $NetBSD: Makefile,v 1.12 2008/11/16 11:22:55 bjs Exp $
#
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
@@ -7,7 +7,7 @@
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
-JACK_VERSION= 0.112.1
+JACK_VERSION= 0.115.1
MAINTAINER= bjs%NetBSD.org@localhost
HOMEPAGE= http://www.jackaudio.org/
@@ -15,6 +15,9 @@
PKG_DESTDIR_SUPPORT= user-destdir
+BUILD_DEFS+= JACKD_DEFAULT_TMPDIR
+BUILD_DEFS+= JACKD_PROCFS_PATH
+
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
@@ -36,12 +39,20 @@
CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
JACKD_DEFAULT_TMPDIR?= /tmp
-JACKD_PROCFS_PATH?= /proc
.include "../../mk/bsd.prefs.mk"
-.if "${OPSYS:M*BSD}" != "" || ${OPSYS} == "Darwin"
-CFLAGS+= -DJACK_HOST_HAS_BSD_POLL
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
+CFLAGS+= -DHOST_HAS_BSD_POLL
+.endif
+###
+### XXX Is there a way to properly use the emulation framework
+### for this?
+###
+.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux"
+JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc
+.else
+JACKD_PROCFS_PATH?= /proc
.endif
.if exists(/dev/shm) && ${OPSYS} == "Linux"
@@ -50,8 +61,15 @@
CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
.endif
-PLIST_VARS= oss sunaudio
-
+PLIST_VARS= coreaudio oss sunaudio
+###
+### XXX This is untested. Please file a PR and/or commit a fix should
+### any problems arise.
+###
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --enable-coreaudio
+PLIST.coreaudio= yes
+.endif
###
### XXX The sun driver is buggy on NetBSD right now. I hope to remedy
### this shortly.
@@ -74,18 +92,29 @@
CONFIGURE_ARGS+= --disable-oss
.endif
-
-SUBST_CLASSES+= jacksrc
+SUBST_CLASSES+= jacksrc
SUBST_FILES.jacksrc= libjack/unlock.c
SUBST_MESSAGE.jacksrc= Peforming substitutions in JACK sources.
SUBST_STAGE.jacksrc= pre-build
SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PKG_OPTIONS_VAR= PKG_OPTIONS.jack
+PKG_SUPPORTED_OPTIONS= simd
+PKG_SUGGESTED_OPTIONS= simd
+
+. include "../../mk/bsd.options.mk"
+
+. if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+= --enable-simd
+. else
+CONFIGURE_ARGS+= --disable-simd
+. endif
+.endif
+
post-extract:
- ${RUN} \
- ${MKDIR} ${WRKSRC}/config/os/netbsd && \
- ${CP} ${FILESDIR}/atomicity.h \
- ${WRKSRC}/config/os/netbsd
+ ${RUN} ${MKDIR} ${WRKSRC}/config/os/netbsd && \
+ ${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/PLIST
--- a/audio/jack/PLIST Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/PLIST Sun Nov 16 11:22:55 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/07/31 03:58:05 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/11/16 11:22:55 bjs Exp $
bin/jack_alias
bin/jack_connect
bin/jack_disconnect
@@ -31,6 +31,7 @@
lib/jack/intime.la
lib/jack/jack_dummy.la
lib/jack/jack_net.la
+${PLIST.coreaudio}lib/jack/jack_coreaudio.la
${PLIST.oss}lib/jack/jack_oss.la
${PLIST.sunaudio}lib/jack/jack_sun.la
lib/libjack.la
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/buildlink3.mk
--- a/audio/jack/buildlink3.mk Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/buildlink3.mk Sun Nov 16 11:22:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/07/31 03:58:05 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2008/11/16 11:22:55 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JACK_BUILDLINK3_MK:= ${JACK_BUILDLINK3_MK}+
@@ -14,10 +14,11 @@
.if ${JACK_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.jack+= jack>=0.110.0
BUILDLINK_PKGSRCDIR.jack?= ../../audio/jack
-DLOPEN_REQUIRE_PTHREADS= yes
.endif # JACK_BUILDLINK3_MK
.include "../../audio/libsamplerate/buildlink3.mk"
+# for DLOPEN_REQUIRE_PTHREADS
.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/distinfo
--- a/audio/jack/distinfo Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/distinfo Sun Nov 16 11:22:55 2008 +0000
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.5 2008/08/09 10:33:16 bjs Exp $
+$NetBSD: distinfo,v 1.6 2008/11/16 11:22:55 bjs Exp $
-SHA1 (jack-audio-connection-kit-0.112.1.tar.bz2) = 9b0d5e33098873d92dcfac82bdf5cc4ec9821c91
-RMD160 (jack-audio-connection-kit-0.112.1.tar.bz2) = b7fe0d94314a298031dbb57ceefbbfc917ef4a13
-Size (jack-audio-connection-kit-0.112.1.tar.bz2) = 603111 bytes
-SHA1 (patch-aa) = 56b3efc83cd989670bdbdcaa45c72ed3b92ea731
-SHA1 (patch-ab) = 7733bbf2c406f7fd327de96368ed6c6af4f919ea
-SHA1 (patch-ac) = f4e5a43544f07118acb26aac3f402566ab6193ee
-SHA1 (patch-ad) = 7323270fdf527836bd5ceda4da7f6a4997b52fc5
-SHA1 (patch-ae) = ca18877262357a3e0d503b171fe42708b59ecec6
-SHA1 (patch-af) = 37d0895a253caed41332f4fb17e90677dfe8055f
-SHA1 (patch-ag) = 04d4ad14874c11dbd3d7c0cb2cf488c5bd6da583
-SHA1 (patch-ah) = ef3f960cb95ac13f3227d918be0b80acd5f90d48
-SHA1 (patch-ai) = 49a2d37005252714cad85609765cb1a57c8f23de
-SHA1 (patch-aj) = 2e3c4255c0400bf3999ee67ef116cf10beb8931e
-SHA1 (patch-ak) = 2309246e48a6d616a481f3bc2dda8e4644ca4adc
-SHA1 (patch-am) = 3626473f43d8169be5014b64071dc8c9c3f213c9
-SHA1 (patch-ao) = 8073ed54210ff5a75696e6b677e2eb3e48078d3d
-SHA1 (patch-ap) = 0d84a4237948573635ceb02bf70ca1568ffb423d
-SHA1 (patch-aq) = a352510f40f1fdec31af3fab3d4c034b5f115a4a
-SHA1 (patch-ar) = 128c12fcd98decd7fc626e5bf24e6ab6f4e55c38
-SHA1 (patch-as) = 1a5f7ca7cc8488a8eefaa306bd60efb2c415cce8
+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 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
+SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
+SHA1 (patch-ac) = b7d6a3bdb890afa99a1849a4db694df509c9e19a
+SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
+SHA1 (patch-ae) = 6e7cad554c6db5b39f14170246f29cc4a2923e3a
+SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
+SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58
+SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a
+SHA1 (patch-ai) = 54dcc152ecf202e99eba71cad394a9a8c431d9e4
+SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
+SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356
+SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
+SHA1 (patch-ap) = 60738eae086bdab7aa1986889da95621353f7aa6
+SHA1 (patch-aq) = 212441bb56a4cf33a213bb299f42e7dbcbc33274
+SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
+SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/patches/patch-aa
--- a/audio/jack/patches/patch-aa Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/patches/patch-aa Sun Nov 16 11:22:55 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2008/11/16 11:22:55 bjs Exp $
---- config/sysdeps/atomicity.h.orig 2008-07-27 08:50:27.000000000 -0400
+--- 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_
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/patches/patch-ab
--- a/audio/jack/patches/patch-ab Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/patches/patch-ab Sun Nov 16 11:22:55 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2008/08/09 10:33:17 bjs Exp $
+$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-07-27 08:50:30.000000000 -0400
+--- jackd/engine.c.orig 2008-11-11 17:36:40.000000000 -0500
+++ jackd/engine.c
-@@ -1383,7 +1383,7 @@ handle_external_client_request (jack_eng
+@@ -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) {
@@ -14,7 +14,7 @@
/* poll is implemented using
select (see the macosx/fakepoll
code). When the socket is closed
-@@ -1396,7 +1396,7 @@ handle_external_client_request (jack_eng
+@@ -1398,7 +1398,7 @@ handle_external_client_request (jack_eng
and remove the client.
*/
jack_mark_client_socket_error (engine, fd);
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/patches/patch-ac
--- a/audio/jack/patches/patch-ac Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/patches/patch-ac Sun Nov 16 11:22:55 2008 +0000
@@ -1,19 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- tools/netsource.c.orig 2008-07-27 22:17:58.000000000 -0400
-+++ tools/netsource.c
-@@ -31,10 +31,14 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #include <stdlib.h>
- #include <string.h>
+--- libjack/simd.c.orig 2008-11-11 17:36:29.000000000 -0500
++++ libjack/simd.c
+@@ -332,9 +332,9 @@ sse_nonalign:
+ void x86_sse_f2i (int *dest, const float *src, int length, float scale)
+ {
+ int i;
+- float max[4] __attribute__((aligned(16))) =
++ static const float max[4] __attribute__((aligned(16))) =
+ { -1.0F, -1.0F, -1.0F, -1.0F };
+- float min[4] __attribute__((aligned(16))) =
++ static const float min[4] __attribute__((aligned(16))) =
+ { 1.0F, 1.0F, 1.0F, 1.0F };
+ float s[4] __attribute__((aligned(16)));
-+#include <sys/socket.h>
-+
- #include <netinet/in.h>
- #include <netdb.h>
-
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
-
- #include <jack/jack.h>
-
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/patches/patch-ad
--- a/audio/jack/patches/patch-ad Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/patches/patch-ad Sun Nov 16 11:22:55 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ad,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- drivers/oss/oss_driver.h.orig 2008-07-27 08:50:33.000000000 -0400
+--- drivers/oss/oss_driver.h.orig 2008-11-11 17:36:43.000000000 -0500
+++ drivers/oss/oss_driver.h
@@ -34,7 +34,11 @@
#include <jack/jack.h>
diff -r 85fe41cd33ea -r 9780ef86bfd3 audio/jack/patches/patch-ae
--- a/audio/jack/patches/patch-ae Sun Nov 16 10:25:34 2008 +0000
+++ b/audio/jack/patches/patch-ae Sun Nov 16 11:22:55 2008 +0000
@@ -1,17 +1,52 @@
-$NetBSD: patch-ae,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ae,v 1.2 2008/11/16 11:22:55 bjs Exp $
-I'm not quite sure what's going on here, but I don't think res
-should be a pointer (quells a warning, has no ill effects that
-I can detect).
+This is currently untested. Please file a PR if there are any problems.
---- libjack/intclient.c.orig 2008-07-27 08:50:23.000000000 -0400
-+++ libjack/intclient.c
-@@ -167,7 +167,7 @@ jack_internal_client_load (jack_client_t
- {
- va_list ap;
- va_start(ap, status);
-- jack_intclient_t* res = jack_internal_client_load_aux(client, client_name, options, status, ap);
-+ jack_intclient_t res = jack_internal_client_load_aux(client, client_name, options, status, ap);
- va_end(ap);
Home |
Main Index |
Thread Index |
Old Index