Added support for netjack

Package-Manager: portage-2.1_pre7-r1

4 files changed, 182 insertions, 4 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 1d1bd91dac18..29256f7c64e6 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.66 2006/03/05 22:56:18 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.67 2006/04/01 17:26:15 fvdpol Exp $
+
+*jack-audio-connection-kit-0.100.7-r1 (01 Apr 2006)
+
+  01 Apr 2006; Frank van de Pol <fvdpol@gentoo.org>
+  +jack-audio-connection-kit-0.100.7-r1.ebuild:
+  Added support for netjack
 
   05 Mar 2006; <keetz@gentoo.org> jack-audio-connection-kit-0.100.7.ebuild:
   add SSE/E3DNow mixing support when using sse. Hack to fix bug 125031.
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 4ec7bc2e4eb4..3b7d60bf25d0 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,6 +1,9 @@
-MD5 fdc51ebfe78fb7b127cb09e81c4c35e0 ChangeLog 13700
-RMD160 ada5980a56d1a30dd5bb9050894ae5ee5370e7fb ChangeLog 13700
-SHA256 aa959c4f6e62728ba9f94d5d430d39572768ed5dcfa2bff7f957b81ccff399f1 ChangeLog 13700
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea045f7eae2af16bf2598552eb275735 ChangeLog 13884
+RMD160 52a1b7282340fcb9ed587b012aecd6dc890afb74 ChangeLog 13884
+SHA256 4697706e0448ff3ed8a223c8e6cbc9f188866da96839b74e249070ab4e38775a ChangeLog 13884
 MD5 176e3d4dbee7533b6a08863ed1f74079 files/digest-jack-audio-connection-kit-0.100.0 85
 RMD160 b71b3d660bf9f8a766b4f311fd05623340de9705 files/digest-jack-audio-connection-kit-0.100.0 85
 SHA256 5b2978de95f4772a40bdaf65fe9e19cbaed6802d06ee276f4e2ebe6a0b2c8b8f files/digest-jack-audio-connection-kit-0.100.0 85
@@ -10,6 +13,9 @@ SHA256 5b2978de95f4772a40bdaf65fe9e19cbaed6802d06ee276f4e2ebe6a0b2c8b8f files/di
 MD5 d10eea0e183b4f2f0d56632fa6f3044f files/digest-jack-audio-connection-kit-0.100.7 86
 RMD160 a08d75b1edaa4bd5002cc870586c8aa7f1bd35ef files/digest-jack-audio-connection-kit-0.100.7 86
 SHA256 70886a9e38b37aae4c360a3c14bd21aeb01f42e737060fb3c0ffa62b6dd4ef63 files/digest-jack-audio-connection-kit-0.100.7 86
+MD5 a3e0ddf1a423fd78af24f6b5082a8426 files/digest-jack-audio-connection-kit-0.100.7-r1 551
+RMD160 0337371531ce8038ae95830733d8f7b4bd4a7c69 files/digest-jack-audio-connection-kit-0.100.7-r1 551
+SHA256 a2defc837001c29e7190f5fc94e5e5649279a4f552d85e09cff6de486e6052c8 files/digest-jack-audio-connection-kit-0.100.7-r1 551
 MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
 RMD160 de138a388081713dffaf90a5a406e6d1fbdd27a3 files/digest-jack-audio-connection-kit-0.80.0 84
 SHA256 553dccd66f86f0d80afc3800d5c30807b734d77e7d4dfe6f4ce5aac191caffdf files/digest-jack-audio-connection-kit-0.80.0 84
@@ -52,6 +58,9 @@ SHA256 86bc260fa09f9c7517c11d5a2747ee2759f1645496dbbd461ae93559fa9eef4c jack-aud
 MD5 18042171cc5c2205302821ac7e8f8327 jack-audio-connection-kit-0.100.0.ebuild 2894
 RMD160 050a74a3ae9e8786ed9c4c7b6a1ef4ceb8d7e104 jack-audio-connection-kit-0.100.0.ebuild 2894
 SHA256 017592f13537a154ef5ea856ebad4d5dae9117ce23b3be7aee4ce0565c40ae4f jack-audio-connection-kit-0.100.0.ebuild 2894
+MD5 80fb71f97ccaa45bf4b4db000fc2350e jack-audio-connection-kit-0.100.7-r1.ebuild 3747
+RMD160 880a80d03746bab2a128d52624bed9005ec22379 jack-audio-connection-kit-0.100.7-r1.ebuild 3747
+SHA256 09854db71cbaf0efc4b11acc22f26bde6c72614d3f9df8cf26881106a20e0e6f jack-audio-connection-kit-0.100.7-r1.ebuild 3747
 MD5 0895add313f6fad832e7ac7ab9ada0f2 jack-audio-connection-kit-0.100.7.ebuild 3380
 RMD160 e80a8de5960bcf6cd57bdacfda60de11528d4094 jack-audio-connection-kit-0.100.7.ebuild 3380
 SHA256 b8fb64d6453448c1eef3e6fa515e7f6b1144d045b45cd9416073bb1098c26de7 jack-audio-connection-kit-0.100.7.ebuild 3380
@@ -73,3 +82,10 @@ SHA256 5ce1a5fad4a8c2a47a2bb9358be569ef5ba2c41b01835d4777af51ecab36e28b jack-aud
 MD5 e9914343b13388692a7ed11361d53724 metadata.xml 218
 RMD160 b0b0a0aaad9e84c4f9c4f1a02ac2b3b92b1faf26 metadata.xml 218
 SHA256 a6dd27c3e0546e9f77fd6e44a2d8349646bc8f82a29e7f19bd2b5b0fc3ca848a metadata.xml 218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFELrgIvpz1081QvMkRAvgjAJ9atPzi/k/DGSqVKUQCr61t0zXZoACeIVe+
+vXMv+MIiwEu57za/l9pQFcg=
+=STEc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.100.7-r1 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.100.7-r1
new file mode 100644
index 000000000000..6ed8b0502fb7
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.100.7-r1
@@ -0,0 +1,6 @@
+MD5 7a53b0af6a4005810e331bb3b0d84880 jack-audio-connection-kit-0.100.7.tar.gz 2119224
+RMD160 f445d8c40fa88e21500082ad2b5c60aafb925bd6 jack-audio-connection-kit-0.100.7.tar.gz 2119224
+SHA256 fd8e5ce630002a08200fdb0e7ca098c4a25b9052b4ed8219845b22091db50fa8 jack-audio-connection-kit-0.100.7.tar.gz 2119224
+MD5 ef2e98dd99f2e9639d1ee53ca83c69bd netjack-0.11rc1.tar.bz2 22938
+RMD160 14eea79d6ccd5e7c53cee15015dfc98d270e4a71 netjack-0.11rc1.tar.bz2 22938
+SHA256 d76034edd22c60c8bba838ce8a83a26ae38831b92a0f1832ab280e6d8c7f14e8 netjack-0.11rc1.tar.bz2 22938
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r1.ebuild
new file mode 100644
index 000000000000..71fdcb74bcf2
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r1.ebuild,v 1.1 2006/04/01 17:26:15 fvdpol Exp $
+
+inherit flag-o-matic eutils multilib
+
+NETJACK=netjack-0.11rc1
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc ~x86"
+IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack"
+
+RDEPEND="dev-util/pkgconfig
+	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
+	portaudio? ( =media-libs/portaudio-18* )
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+	!media-sound/jack-cvs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	if ! use sndfile ; then
+		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
+	fi
+
+	if use caps; then
+		if [[ "${KV:0:3}" == "2.4" ]]; then
+			einfo "will build jackstart for 2.4 kernel"
+		else
+			einfo "using compatibility symlink for jackstart"
+		fi
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	use netjack && unpack ${NETJACK}.tar.bz2
+	cd ${S}
+
+	# the docs option is in upstream, I'll leave the pentium2 foobage
+	# for the x86 folks...... kito@gentoo.org
+
+	# Add doc option and fix --march=pentium2 in caps test
+	#epatch ${FILESDIR}/${PN}-doc-option.patch
+
+	# compile and install jackstart, see #92895, #94887
+	#if use caps ; then
+	#	epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
+	#fi
+
+	epatch ${FILESDIR}/${PN}-transport.patch
+}
+
+src_compile() {
+	local myconf
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
+
+	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
+	if use userland_Darwin ; then
+		append-flags -fno-common
+		use altivec && append-flags -force_cpusubtype_ALL \
+			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
+	fi
+
+	use sndfile && \
+		export SNDFILE_CFLAGS="-I/usr/include" \
+		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable doc html-docs) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable sse) $(use_enable sse dynsimd) \
+		--with-pic \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
+
+	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
+		einfo "Building jackstart for 2.4 kernel"
+		cd ${S}/jackd
+		emake jackstart || die "jackstart build failed."
+	fi
+
+	if use netjack; then
+		cd ${WORKDIR}/${NETJACK}
+		scons jack_source_dir=${S}
+	fi
+
+}
+
+src_install() {
+	make DESTDIR=${D} datadir=/usr/share/doc install || die
+
+	if use caps; then
+		if [[ "${KV:0:3}" == "2.4" ]]; then
+			cd ${S}/jackd
+			dobin jackstart
+		else
+			dosym /usr/bin/jackd /usr/bin/jackstart
+		fi
+	fi
+
+	if ! use jack-tmpfs; then
+		keepdir /var/run/jack
+		chmod 4777 ${D}/var/run/jack
+	fi
+
+	if use doc; then
+		mv ${D}/usr/share/doc/${PF}/reference/html \
+		   ${D}/usr/share/doc/${PF}/
+
+		insinto /usr/share/doc/${PF}
+		doins -r ${S}/example-clients
+	else
+		rm -rf ${D}/usr/share/doc
+	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+
+	if use netjack; then
+		cd ${WORKDIR}/${NETJACK}
+		dobin alsa_in
+		dobin alsa_out
+		dobin jacknet_client
+		insinto /usr/lib/jack
+		doins jack_net.so
+	fi
+}