[proaudio] [1044] Fixed compilation error with jack-keyboard and JACK svn

[subversion@xxxxxxxxxxxxx]

Revision: 1044
Author:   marcochapeau
Date:     2007-12-15 23:03:01 +0000 (Sat, 15 Dec 2007)

Log Message:
-----------
Fixed compilation error with jack-keyboard and JACK svn

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack-keyboard/ChangeLog
    trunk/overlays/proaudio/media-sound/jack-keyboard/Manifest
    trunk/overlays/proaudio/media-sound/jack-keyboard/jack-keyboard-1.5.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/jack-keyboard/files/jack-keyboard-jackmidi-no-nframes.patch


Modified: trunk/overlays/proaudio/media-sound/jack-keyboard/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-keyboard/ChangeLog	2007-12-15 22:59:25 UTC (rev 1043)
+++ trunk/overlays/proaudio/media-sound/jack-keyboard/ChangeLog	2007-12-15 23:03:01 UTC (rev 1044)
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Dec 2007; Marc-Olivier Barre <mobarre@xxxxxxxxx> jack-keyboard-1.5.ebuild:
+  Added a patch to fix the nframes issue with jackmidi on SVN
+
   15 Dec 2007; Marc-Olivier Barre <mobarre@xxxxxxxxx> ChangeLog:
   Initial ChangeLog creation
 

Modified: trunk/overlays/proaudio/media-sound/jack-keyboard/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-keyboard/Manifest	2007-12-15 22:59:25 UTC (rev 1043)
+++ trunk/overlays/proaudio/media-sound/jack-keyboard/Manifest	2007-12-15 23:03:01 UTC (rev 1044)
@@ -2,11 +2,19 @@
 MD5 52b526537f33763dc43375a67741426e files/jack-keyboard-1.5-channel.patch 4203
 RMD160 4d6a4193a382c057675ff36e57e0b58d14633deb files/jack-keyboard-1.5-channel.patch 4203
 SHA256 a65e37aba3eed2dfa8a672ff1c32696f10fb91788fd8bb32f3644c3efd54a8fa files/jack-keyboard-1.5-channel.patch 4203
+AUX jack-keyboard-jackmidi-no-nframes.patch 1131 RMD160 cd71270ae243c5c0d3d9aaded9886bb651b33257 SHA1 c776279c65acd73d77dd953076529d4af58eadcd SHA256 e268a8c086ea5fc003d89193b8275bc1a8efa3bbfd7f9e3bdb253e1427e96d5e
+MD5 0ffde87aab7c1c9a78c9f295b1ac12aa files/jack-keyboard-jackmidi-no-nframes.patch 1131
+RMD160 cd71270ae243c5c0d3d9aaded9886bb651b33257 files/jack-keyboard-jackmidi-no-nframes.patch 1131
+SHA256 e268a8c086ea5fc003d89193b8275bc1a8efa3bbfd7f9e3bdb253e1427e96d5e files/jack-keyboard-jackmidi-no-nframes.patch 1131
 DIST jack-keyboard-1.5.tar.gz 35198 RMD160 20bb2ba01f2c5ca066154acea9e45c4789909955 SHA1 492fee8767c99f046645e284a0688da3b8bcc018 SHA256 6dfae6522a933fb887be64d7c5a1fc48882232bcd5499640af998ed015095906
-EBUILD jack-keyboard-1.5.ebuild 932 RMD160 0cfbde8b601d6f224591215c6fa30434e06c840b SHA1 880cd768783a96c88458999f263d50619204a610 SHA256 016eed741105cd7e09a158ea7df09c8f47af6e5cd5e5dd995584153c39170dda
-MD5 c5d0e121653856a0e4656005aa8c49f4 jack-keyboard-1.5.ebuild 932
-RMD160 0cfbde8b601d6f224591215c6fa30434e06c840b jack-keyboard-1.5.ebuild 932
-SHA256 016eed741105cd7e09a158ea7df09c8f47af6e5cd5e5dd995584153c39170dda jack-keyboard-1.5.ebuild 932
+EBUILD jack-keyboard-1.5.ebuild 1066 RMD160 150c0167fc04a64b9c58214efe668257935fac08 SHA1 4879485d3ff6255990489a7c9ba90afb48682069 SHA256 456794ae05275ffc1b336e04cbe1c4ca8190213300f26170bc2d1adfdceae164
+MD5 25ce4a1a011f6681604e4178b5b95e14 jack-keyboard-1.5.ebuild 1066
+RMD160 150c0167fc04a64b9c58214efe668257935fac08 jack-keyboard-1.5.ebuild 1066
+SHA256 456794ae05275ffc1b336e04cbe1c4ca8190213300f26170bc2d1adfdceae164 jack-keyboard-1.5.ebuild 1066
+MISC ChangeLog 221 RMD160 87b4964db444abdf9b475fd0ef414d8c5a9baa57 SHA1 0ad177805e4093dff553d136b2dc3a69684991dd SHA256 f79fdc5fb5f92f6540434b0feec87f67f61ea73f4cb73209eeeac8c32f910bc7
+MD5 618010f29f8305495d20e8de03489ac7 ChangeLog 221
+RMD160 87b4964db444abdf9b475fd0ef414d8c5a9baa57 ChangeLog 221
+SHA256 f79fdc5fb5f92f6540434b0feec87f67f61ea73f4cb73209eeeac8c32f910bc7 ChangeLog 221
 MD5 67a6836aeca901c92087c85d81b34225 files/digest-jack-keyboard-1.5 250
 RMD160 3d4be0b77d98d83a951062912725631497a0d7c5 files/digest-jack-keyboard-1.5 250
 SHA256 e9ebbe46c0c9e9cfae5efab2884032c8ec347fcf1e7a246a26c9ef42ff12c8f8 files/digest-jack-keyboard-1.5 250

Added: trunk/overlays/proaudio/media-sound/jack-keyboard/files/jack-keyboard-jackmidi-no-nframes.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-keyboard/files/jack-keyboard-jackmidi-no-nframes.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-keyboard/files/jack-keyboard-jackmidi-no-nframes.patch	2007-12-15 23:03:01 UTC (rev 1044)
@@ -0,0 +1,33 @@
+--- jack-keyboard.c.orig	2007-12-15 23:28:50.000000000 +0100
++++ jack-keyboard.c	2007-12-15 23:30:59.000000000 +0100
+@@ -202,10 +202,10 @@
+ 
+ 	port_buffer = jack_port_get_buffer(input_port, nframes);
+ 
+-	events = jack_midi_get_event_count(port_buffer, nframes);
++	events = jack_midi_get_event_count(port_buffer);
+ 
+ 	for (i = 0; i < events; i++) {
+-		read = jack_midi_event_get(&event, port_buffer, i, nframes);
++		read = jack_midi_event_get(&event, port_buffer, i);
+ 		if (read) {
+ 			fprintf(stderr, "jack_midi_event_get failed, RECEIVED NOTE LOST.\n");
+ 			continue;
+@@ -222,7 +222,7 @@
+ 
+ 	port_buffer = jack_port_get_buffer(output_port, nframes);
+ 
+-	jack_midi_clear_buffer(port_buffer, nframes);
++	jack_midi_clear_buffer(port_buffer);
+ 
+ 	while (jack_ringbuffer_read_space(ringbuffer)) {
+ 		read = jack_ringbuffer_read(ringbuffer, (char *)&ev, sizeof(ev));
+@@ -232,7 +232,7 @@
+ 			continue;
+ 		}
+ 
+-		buffer = jack_midi_event_reserve(port_buffer, 0, ev.len, nframes);
++		buffer = jack_midi_event_reserve(port_buffer, 0, ev.len);
+ 
+ 		if (buffer == NULL) {
+ 			fprintf(stderr, "jack_midi_event_reserve failed, NOTE LOST.\n");

Modified: trunk/overlays/proaudio/media-sound/jack-keyboard/jack-keyboard-1.5.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-keyboard/jack-keyboard-1.5.ebuild	2007-12-15 22:59:25 UTC (rev 1043)
+++ trunk/overlays/proaudio/media-sound/jack-keyboard/jack-keyboard-1.5.ebuild	2007-12-15 23:03:01 UTC (rev 1044)
@@ -21,6 +21,9 @@
 	unpack "${A}"
 	cd "${S}"
 	epatch "${FILESDIR}/jack-keyboard-1.5-channel.patch"
+	if has_version >=media-sound/jack-audio-connection-kit-0.103; then
+		epatch "${FILEDIR}/jack-keyboard-jackmidi-no-nframes.patch"
+	fi
 	esed_check -i -e 's@\($(bindir)/jack\)@$(DESTDIR)\1@g' \
 		-e 's@\($(man1dir)/jack\)@$(DESTDIR)\1@g' Makefile
 }