libsndfile-1.0.? compatible ebuild. masked until said libsndfile is

unmasked.

4 files changed, 112 insertions, 1 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 4d132ebaedf1..64ef24d2be5e 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.2 2002/10/26 07:26:17 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.3 2002/10/30 19:20:26 raker Exp $
+
+*jack-audio-connection-kit-0.34.0-r2 (30 Oct 2002)
+
+  30 Oct 2002; Nick Hadaway <raker@gentoo.org>
+  jack-audio-connection-kit-0.34.0-r2.ebuild,
+  files/digest-jack-audio-connection-kit-0.34.0-r2,
+  files/libsndfile-1.0.diff :
+  libsndfile-1.0.? compatible ebuild.  Masked until libsndfile-1.0.? is
+  unmasked.
 
 *jack-audio-connection-kit-0.34.0-r1 (26 Oct 2002)
 
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2
new file mode 100644
index 000000000000..9de31feb1926
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.34.0-r2
@@ -0,0 +1 @@
+MD5 eddc87ae83e364edfd0e5289362757ba jack-audio-connection-kit-0.34.0.tar.gz 295629
diff --git a/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff b/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff
new file mode 100644
index 000000000000..2f3b5ce8c85a
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/libsndfile-1.0.diff
@@ -0,0 +1,58 @@
+--- example-clients/capture_client.c.orig	2002-10-28 17:50:37.000000000 +0200
++++ example-clients/capture_client.c	2002-10-28 17:46:24.000000000 +0200
+@@ -15,10 +15,14 @@
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-    $Id: libsndfile-1.0.diff,v 1.1 2002/10/30 19:20:26 raker Exp $
++    * 2002/08/23 - modify for libsndfile 1.0.0 <andy@alsaplayer.org>
++    
++    $Id: libsndfile-1.0.diff,v 1.1 2002/10/30 19:20:26 raker Exp $
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <sndfile.h>
+@@ -155,7 +159,7 @@
+ 					}
+ 				}
+ 				
+-				if (sf_writef_double (info->sf, fbuf, buf->nframes, 1) != buf->nframes) {
++				if (sf_writef_double (info->sf, fbuf, buf->nframes) != buf->nframes) {
+ 					char errstr[256];
+ 					sf_error_str (0, errstr, sizeof (errstr) - 1);
+ 					fprintf (stderr, "cannot write data to sndfile (%s)\n", errstr);
+@@ -230,13 +234,26 @@
+ setup_disk_thread (thread_info_t *info)
+ {
+ 	SF_INFO sf_info;
+-
++	int short_mask;
++	
+ 	sf_info.samplerate = jack_get_sample_rate (info->client);
+ 	sf_info.channels = info->channels;
+-	sf_info.format = SF_FORMAT_WAV|SF_FORMAT_PCM;
+-	sf_info.pcmbitwidth = info->bitdepth;
++	
++	switch (info->bitdepth) {
++		case 8: short_mask = SF_FORMAT_PCM_U8;
++		  	break;
++		case 16: short_mask = SF_FORMAT_PCM_16;
++			 break;
++		case 24: short_mask = SF_FORMAT_PCM_24;
++			 break;
++		case 32: short_mask = SF_FORMAT_PCM_32;
++			 break;
++		default: short_mask = SF_FORMAT_PCM_16;
++			 break;
++	}		 
++	sf_info.format = SF_FORMAT_WAV|short_mask;
+ 
+-	if ((info->sf = sf_open_write (info->path, &sf_info)) == NULL) {
++	if ((info->sf = sf_open (info->path, SFM_WRITE, &sf_info)) == NULL) {
+ 		char errstr[256];
+ 		sf_error_str (0, errstr, sizeof (errstr) - 1);
+ 		fprintf (stderr, "cannot open sndfile \"%s\" for output (%s)\n", info->path, errstr);
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0-r2.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0-r2.ebuild
new file mode 100644
index 000000000000..9f63f7173547
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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.34.0-r2.ebuild,v 1.1 2002/10/30 19:20:26 raker Exp $
+
+IUSE=""
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://jackit.sourceforge.net/"
+SRC_URI="mirrors://sourceforge/jackit/${P}.tar.gz"
+
+# libjack is LGPL, the rest is GPL
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="x86"
+
+DEPEND="dev-libs/glib
+	>=media-libs/alsa-lib-0.9.0_rc2
+	>=media-libs/libsndfile-1.0.0
+	>=x11-libs/fltk-1.1.1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p0 < ${FILESDIR}/libsndfile-1.0.diff || die "patch failed"
+
+}
+
+src_compile() {
+
+	export LDFLAGS="-L/usr/lib/fltk-1.1"                                    
+        export CPPFLAGS="-I/usr/include/fltk-1.1"
+
+	econf || die "./configure failed"
+	emake || die "compilation failed"
+}
+
+src_install () {
+
+	make DESTDIR=${D} DOC_DIR=${D}/usr/share/doc/${P} install || die
+	dodoc README
+}