pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/jack-devel Behold: The JACK audio connection ki...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a1f6497a9cb
branches: trunk
changeset: 539901:2a1f6497a9cb
user: bjs <bjs%pkgsrc.org@localhost>
date: Sun Mar 16 09:26:46 2008 +0000
description:
Behold: The JACK audio connection kit version 0.109.10 (SVN).
This update was long overdue from version 0.100.0. Especially of note:
native audio(4) support (OSS driver initially converted by
jakemsr%openbsd.org@localhost), with certain changes/fixups by me (both in the
driver code and elsewhere ... it is very much still a work in progress,
but it is a work that does work, heh).
Also, some patches to do the "right thing" throughout, i.e. press the
"we are not linux" button. More fixes/enhancements coming soon.
One outstanding issue I know of: an mmap failure when trying to run
with realtime scheduling that I haven't been able to look into enough yet.
A good player which supports this is audio/moc ... I hope to add
a gstreamer plugin and much more shortly.
I am in the planning stages of a rewrite of the driver using kqueue, also.
diffstat:
audio/jack-devel/DESCR | 6 +
audio/jack-devel/MESSAGE | 18 +
audio/jack-devel/Makefile | 71 +++
audio/jack-devel/PLIST | 43 +
audio/jack-devel/buildlink3.mk | 19 +
audio/jack-devel/distinfo | 18 +
audio/jack-devel/patches/patch-ab | 49 ++
audio/jack-devel/patches/patch-ac | 14 +
audio/jack-devel/patches/patch-ad | 16 +
audio/jack-devel/patches/patch-ae | 15 +
audio/jack-devel/patches/patch-af | 15 +
audio/jack-devel/patches/patch-ag | 12 +
audio/jack-devel/patches/patch-ah | 15 +
audio/jack-devel/patches/patch-ai | 50 ++
audio/jack-devel/patches/patch-aj | 21 +
audio/jack-devel/patches/patch-ak | 21 +
audio/jack-devel/patches/patch-al | 48 ++
audio/jack-devel/patches/patch-am | 13 +
audio/jack-devel/patches/patch-an | 871 ++++++++++++++++++++++++++++++++++++++
19 files changed, 1335 insertions(+), 0 deletions(-)
diffs (truncated from 1411 to 300 lines):
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/DESCR Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,6 @@
+JACK is a low-latency audio server, written for POSIX conformant
+operating systems such as GNU/Linux and Apple's OS X. It can connect a
+number of different applications to an audio device, as well as allowing
+them to share audio between themselves. Its clients can run in their own
+processes (ie. as normal applications), or can they can run within the
+JACK server (ie. as a "plugin").
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/MESSAGE Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,18 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+NOTE: Unfortunately, JACK wants to use a linux /proc filesystem to
+perform shared memory housekeeping tasks. Therefore, if your platform
+supports a "Linux-compliant" proc filesystem, we recommend mounting one
+prior to using jack. On NetBSD, this can be accomplished with the
+following command:
+
+ mount_procfs -orw,linux /proc <mount point>
+
+Conventionally, the mount point is /proc. If you wish to use a different
+pathname for this filesystem, you may define the JACKD_PROCFS_PATH
+variable in your build environment or mk.conf as shown below.
+
+ JACKD_PROCFS_PATH= /emul/linux/proc
+
+===========================================================================
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/Makefile Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+#
+
+DISTNAME= jack-0.109.10
+PKGNAME= ${DISTNAME:C/jack/&-devel/}
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= bjs%NetBSD.org@localhost
+HOMEPAGE= http://www.jackaudio.org/
+COMMENT= JACK audio connection kit
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
+
+CONFIGURE_ARGS+= --disable-alsa
+CONFIGURE_ARGS+= --disable-freebob
+CONFIGURE_ARGS+= --disable-coreaudio
+CONFIGURE_ARGS+= --disable-firewire
+CONFIGURE_ARGS+= --disable-optimize
+CONFIGURE_ARGS+= --disable-sse
+
+CONFIGURE_ARGS+= --enable-resize
+CONFIGURE_ARGS+= --enable-timestamps
+
+CONFIGURE_ARGS+= --with-default-tmpdir=/tmp/
+
+.include "../../mk/bsd.prefs.mk"
+
+.if exists(/usr/include/sys/audioio.h)
+CONFIGURE_ARGS+= --enable-sun
+PLIST_SUBST+= SUN=""
+.else
+CONFIGURE_ARGS+= --disable-sun
+PLIST_SUBST+= SUN="@comment "
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+CONFIGURE_ARGS+= --enable-oss
+PLIST_SUBST+= OSS=""
+MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
+.else
+CONFIGURE_ARGS+= --disable-oss
+PLIST_SUBST+= OSS="@comment "
+.endif
+
+
+PKGCONFIG_OVERRIDE+= jack.pc.in
+PTHREAD_OPTS+= require native
+
+CFLAGS.NetBSD+= -DJACKD_WATCHDOG_TIMEOUT=900
+
+JACKD_PROCFS_PATH?= /proc
+
+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
+
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/PLIST Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,43 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/16 09:26:46 bjs 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_load
+bin/jack_lsp
+bin/jack_metro
+bin/jack_midiseq
+bin/jack_midisine
+bin/jack_monitor_client
+bin/jack_showtime
+bin/jack_simple_client
+bin/jack_transport
+bin/jack_unload
+bin/jackd
+bin/jackrec
+include/jack/intclient.h
+include/jack/jack.h
+include/jack/midiport.h
+include/jack/ringbuffer.h
+include/jack/statistics.h
+include/jack/thread.h
+include/jack/timestamps.h
+include/jack/transport.h
+include/jack/types.h
+lib/jack/inprocess.la
+lib/jack/intime.la
+lib/jack/jack_dummy.la
+lib/jack/jack_net.la
+lib/jack/jack_oss.la
+lib/jack/jack_sun.la
+lib/jack/netsource.la
+lib/libjack.la
+lib/libjackserver.la
+lib/pkgconfig/jack.pc
+man/man1/jackd.1
+man/man1/jackstart.1
+@dirrm lib/jack
+@dirrm include/jack
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/buildlink3.mk Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+JACK_DEVEL_BUILDLINK3_MK:= ${JACK_DEVEL_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+= jack-devel
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njack-devel}
+BUILDLINK_PACKAGES+= jack-devel
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack-devel
+
+.if ${JACK_DEVEL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.jack-devel+= jack-devel>=0.109.10
+BUILDLINK_PKGSRCDIR.jack-devel?= ../../audio/jack-devel
+.endif # JACK_DEVEL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/distinfo Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+SHA1 (jack-0.109.10.tar.bz2) = a82376dcb3610967eac82789dc543b64b9702e39
+RMD160 (jack-0.109.10.tar.bz2) = 20efa1e19cbe74718c07b262de9e8af5f2f72e58
+Size (jack-0.109.10.tar.bz2) = 577713 bytes
+SHA1 (patch-ab) = e7d7f7266afc5841ebf83ceb98fb7e4f0b821f05
+SHA1 (patch-ac) = 7052322d44700b0bf81642a5e68ae53a3da62df1
+SHA1 (patch-ad) = 9632ad3a03015688f02bc4b715d74e21ae293c8f
+SHA1 (patch-ae) = a18c44b803e340d2b1317a539ffb2123490badc3
+SHA1 (patch-af) = 6e7c16137434c601f09da982528f3f8c81bdd354
+SHA1 (patch-ag) = e7a5e878cdd47355f8d6213163b8560939708f32
+SHA1 (patch-ah) = b3445eea50978ff83b16fbe2cfe2f8d111fd67aa
+SHA1 (patch-ai) = aacea684a8d31cfb2e22087d425e5fd457ad215d
+SHA1 (patch-aj) = 46805c358c60a92d6d680a9ea847d32c15af1708
+SHA1 (patch-ak) = 7d1eaa5cecc5f1c3b725ff768089dfd4a133ea45
+SHA1 (patch-al) = fc7311171027b71cbd7572431f45d69ed81dcd92
+SHA1 (patch-am) = c4d1d5562dace10971ef7fba37ddfcf07ad2fdb5
+SHA1 (patch-an) = 90939c5e0a8a53bf701d93ba88a2900439866142
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/patches/patch-ab Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+--- configure.orig 2008-03-15 02:20:31.000000000 -0400
++++ configure
+@@ -19793,7 +19793,7 @@ case "${host_os}" in
+ # barrier code, this may be fixed in 5.3, stay tuned.
+ USE_BARRIER="no"
+ ;;
+- openbsd*)
++ openbsd*|netbsd*)
+ # pthread_barrier* not implemented
+ USE_BARRIER="no"
+ # need small realtime stack
+@@ -23039,8 +23039,7 @@ fi
+
+ JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
+ -I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -g"
+-JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -march=pentium2 -mcpu=pentium4 -O3 \
+--ffast-math -funroll-loops -fprefetch-loop-arrays"
++JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS"
+ JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
+
+
+@@ -23122,7 +23121,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+
+
+- JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++ JACK_OPT_CFLAGS="-D_REENTRANT -O2 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
+
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+
+@@ -23294,14 +23293,14 @@ cat >>confdefs.h <<\_ACEOF
+ #define x86 1
+ _ACEOF
+
+- COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
++ COMMON_X86_OPT_FLAGS="-DREENTRANT"
+
+ if test "$target_cpu" = "i586"; then
+ JACK_OPT_CFLAGS="-march=i586 "
+ elif test "$target_cpu" = "i686"; then
+ JACK_OPT_CFLAGS="-march=i686"
+ elif test "$target_cpu" = "x86_64"; then
+- JACK_OPT_CFLAGS="-march=k8"
++ JACK_OPT_CFLAGS=""
+ else
+ :
+ fi
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/patches/patch-ac Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+--- drivers/netjack/net_source.c.orig 2008-03-11 09:37:32.000000000 -0400
++++ drivers/netjack/net_source.c
+@@ -11,7 +11,9 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+
++#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
++#endif
+
+ #include <jack/jack.h>
+
diff -r d14666832e62 -r 2a1f6497a9cb audio/jack-devel/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/patches/patch-ad Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+--- drivers/oss/oss_driver.h.orig 2007-06-12 16:46:40.000000000 -0400
++++ drivers/oss/oss_driver.h
+@@ -34,7 +34,11 @@
+ #include <jack/jack.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 d14666832e62 -r 2a1f6497a9cb audio/jack-devel/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/jack-devel/patches/patch-ae Sun Mar 16 09:26:46 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+
+--- drivers/Makefile.in.orig 2008-03-15 02:20:34.000000000 -0400
++++ drivers/Makefile.in
+@@ -219,7 +219,9 @@ MAINTAINERCLEANFILES = Makefile.in
+ @HAVE_FREEBOB_TRUE@FREEBOB_DIR = freebob
Home |
Main Index |
Thread Index |
Old Index