pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio Move audio/jack-devel to audio/jack: jack 0.100....
details: https://anonhg.NetBSD.org/pkgsrc/rev/512e0f69ddc2
branches: trunk
changeset: 545329:512e0f69ddc2
user: bjs <bjs%pkgsrc.org@localhost>
date: Thu Jul 31 03:58:05 2008 +0000
description:
Move audio/jack-devel to audio/jack: jack 0.100.0 was broken on many
platforms and a hideous anachronism. On NetBSD-current/i386 and amd64,
at least, I can say that this package works very well. If you have issues
with the audio skipping and are running NetBSD 4.99.x, try updating to
rev. 1.241 of sys/dev/audio.c; the changes to audio_poll() and the pause
attribute handling (in large part thanks to help from jakemsr%openbsd.org@localhost)
are important for proper functioning of jack (though you may find it
works regardless, depending upon your audio driver, how demanding your
"workload" is, etc.). I will submit a pullup request for this change
for NetBSD 4 as well.
JACK now supports both our native audio API and OSS--I recommend
trying both.
diffstat:
audio/Makefile | 3 +-
audio/jack-devel/DESCR | 6 --
audio/jack-devel/MESSAGE | 24 ---------
audio/jack-devel/Makefile | 94 ------------------------------------
audio/jack-devel/PLIST | 42 ----------------
audio/jack-devel/buildlink3.mk | 21 --------
audio/jack-devel/distinfo | 19 -------
audio/jack-devel/files/atomicity.h | 24 ---------
audio/jack-devel/patches/patch-aa | 28 ----------
audio/jack-devel/patches/patch-ab | 25 ---------
audio/jack-devel/patches/patch-ac | 19 -------
audio/jack-devel/patches/patch-ad | 16 ------
audio/jack-devel/patches/patch-ae | 17 ------
audio/jack-devel/patches/patch-af | 15 -----
audio/jack-devel/patches/patch-ag | 12 ----
audio/jack-devel/patches/patch-ah | 17 ------
audio/jack-devel/patches/patch-ai | 14 -----
audio/jack-devel/patches/patch-aj | 47 ------------------
audio/jack-devel/patches/patch-ak | 25 ---------
audio/jack-devel/patches/patch-am | 13 -----
audio/jack-devel/patches/patch-ao | 15 -----
audio/jack-devel/patches/patch-ap | 13 -----
audio/jack/MESSAGE | 24 +++++++++
audio/jack/Makefile | 98 +++++++++++++++++++++++++++++++------
audio/jack/PLIST | 15 ++++-
audio/jack/buildlink3.mk | 15 +++--
audio/jack/distinfo | 27 ++++++++--
audio/jack/files/atomicity.h | 24 +++++++++
audio/jack/patches/patch-aa | 67 +++++++++----------------
audio/jack/patches/patch-ab | 38 +++++++++-----
audio/jack/patches/patch-ac | 19 +++++++
audio/jack/patches/patch-ad | 16 ++++++
audio/jack/patches/patch-ae | 17 ++++++
audio/jack/patches/patch-af | 15 +++++
audio/jack/patches/patch-ag | 12 ++++
audio/jack/patches/patch-ah | 19 +++++++
audio/jack/patches/patch-ai | 39 +++++++++++++++
audio/jack/patches/patch-aj | 25 +++++++++
audio/jack/patches/patch-ak | 25 +++++++++
audio/jack/patches/patch-am | 13 +++++
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 ++++++++
45 files changed, 502 insertions(+), 596 deletions(-)
diffs (truncated from 1346 to 300 lines):
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/Makefile
--- a/audio/Makefile Thu Jul 31 02:48:11 2008 +0000
+++ b/audio/Makefile Thu Jul 31 03:58:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.376 2008/06/21 20:51:24 bjs Exp $
+# $NetBSD: Makefile,v 1.377 2008/07/31 03:58:05 bjs Exp $
#
COMMENT= Audio tools
@@ -144,7 +144,6 @@
SUBDIR+= id3v2
SUBDIR+= ifp-line
SUBDIR+= jack
-SUBDIR+= jack-devel
SUBDIR+= juke
SUBDIR+= kid3
SUBDIR+= kmp
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/DESCR
--- a/audio/jack-devel/DESCR Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-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 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/MESSAGE
--- a/audio/jack-devel/MESSAGE Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2008/05/07 12:15:02 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
-
-ATTENTION: NetBSD-current users who wish to run jackd with real-time
- scheduling will likely find that the loader fails to mmap
- the driver module(s) when using -R. Until this issue is re-
- solved, one may work around this problem by using the -m
- (--no-mlock) option.
-
-===========================================================================
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/Makefile
--- a/audio/jack-devel/Makefile Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2008/05/04 01:02:07 bjs Exp $
-#
-
-DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
-PKGNAME= jack-${JACK_VERSION}
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tar.bz2
-
-JACK_VERSION= 0.111.5
-
-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
-
-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
-
-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
-.endif
-
-.if exists(/dev/shm) && ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm
-.else
-CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
-.endif
-
-PLIST_VARS= oss sunaudio
-
-###
-### XXX The sun driver is buggy on NetBSD right now. I hope to remedy
-### this shortly.
-###
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Solaris"
-CONFIGURE_ARGS+= --enable-sun
-PLIST.sunaudio= yes
-.else
-CONFIGURE_ARGS+= --disable-sun
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-
-.if ${OSS_TYPE} != "none"
-CONFIGURE_ARGS+= --enable-oss
-PLIST.oss= yes
-MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
-CFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
-.else
-CONFIGURE_ARGS+= --disable-oss
-.endif
-
-
-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
-
-post-extract:
- ${RUN} \
- ${MKDIR} ${WRKSRC}/config/os/netbsd && \
- ${CP} ${FILESDIR}/atomicity.h \
- ${WRKSRC}/config/os/netbsd
-
-.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 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/PLIST
--- a/audio/jack-devel/PLIST Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2008/05/04 01:02:07 bjs Exp $
-bin/jack_alias
-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_netsource
-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
-${PLIST.oss}lib/jack/jack_oss.la
-${PLIST.sunaudio}lib/jack/jack_sun.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 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/buildlink3.mk
--- a/audio/jack-devel/buildlink3.mk Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/06/21 20:37:40 bjs Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JACK_BUILDLINK3_MK:= ${JACK_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= jack
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njack}
-BUILDLINK_PACKAGES+= jack
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
-
-.if ${JACK_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.jack+= jack>=0.110.0
-BUILDLINK_PKGSRCDIR.jack?= ../../audio/jack-devel
-.endif # JACK_BUILDLINK3_MK
-
-.include "../../audio/libsamplerate/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/distinfo
--- a/audio/jack-devel/distinfo Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.4 2008/05/04 01:02:07 bjs Exp $
-
-SHA1 (jack-audio-connection-kit-0.111.5.tar.bz2) = b6efab7e206762a60e092d8dbe70001bd996d44f
-RMD160 (jack-audio-connection-kit-0.111.5.tar.bz2) = 3af9409582da307b98317add7ebfe60d8204dd44
-Size (jack-audio-connection-kit-0.111.5.tar.bz2) = 508591 bytes
-SHA1 (patch-aa) = 169403b0eacff27b6f77f714b07eab571c0e6455
-SHA1 (patch-ab) = b201a2a4db7c7d1565049e5d3534cee9a0ccbd20
-SHA1 (patch-ac) = 7bde8dcf5bf4b6f946c3eb6a568f7d66c1c69c35
-SHA1 (patch-ad) = 9632ad3a03015688f02bc4b715d74e21ae293c8f
-SHA1 (patch-ae) = 7fb1deae5473cc9df556176c878610805baf66dc
-SHA1 (patch-af) = 446bbcb0a835279c7821bcebfd6eec04a0fd7870
-SHA1 (patch-ag) = e7a5e878cdd47355f8d6213163b8560939708f32
-SHA1 (patch-ah) = d5dd0c8718b6f07277444d0cce02340eb849e092
-SHA1 (patch-ai) = 89817ae9c013d0da37307f9bc673bf370784e869
-SHA1 (patch-aj) = 478c44fc5a82b2ffa108e985baae49765c793828
-SHA1 (patch-ak) = 334e03bc426034c0c231af40b48ee43717c1bed8
-SHA1 (patch-am) = c4d1d5562dace10971ef7fba37ddfcf07ad2fdb5
-SHA1 (patch-ao) = 88f0e4bf223db31375c7b3b2f0ef152d5cadf374
-SHA1 (patch-ap) = 1e15592658714da73ebceb695000cd636ea9b871
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/files/atomicity.h
--- a/audio/jack-devel/files/atomicity.h Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/* $NetBSD: atomicity.h,v 1.2 2008/03/17 02:33:17 bjs Exp $ */
-
-#ifndef _NETBSD_ATOMICITY_H
-#define _NETBSD_ATOMICITY_H 1
-
-#include <sys/atomic.h>
-
-typedef unsigned int _Atomic_word;
-
-static inline _Atomic_word
-__attribute__ ((__unused__))
-__exchange_and_add(volatile _Atomic_word* __mem, int __val)
-{
- return atomic_add_int_nv(__mem, __val);
-}
-
-static inline void
-__attribute__ ((__unused__))
-__atomic_add(volatile _Atomic_word* __mem, int __val)
-{
- atomic_add_int(__mem, __val);
-}
-
-#endif /* atomicity.h */
diff -r 98a5eaa752eb -r 512e0f69ddc2 audio/jack-devel/patches/patch-aa
--- a/audio/jack-devel/patches/patch-aa Thu Jul 31 02:48:11 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/04/08 01:44:47 bjs Exp $
-
---- config/sysdeps/atomicity.h.orig 2006-05-15 13:12:44.000000000 -0400
-+++ 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>
-
Home |
Main Index |
Thread Index |
Old Index