rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-jack.patch, NONE, 1.1 audacious-plugins.spec, 1.46, 1.47

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8223/F-10

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-jack.patch 
Log Message:
merge the build-fix for the JACK upgrade

audacious-plugins-1.5.1-jack.patch:
 jack.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-jack.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c
--- audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c	2009-12-03 00:45:31.956608364 +0100
@@ -219,7 +219,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-gint jack_free(void)
+gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -479,7 +479,7 @@
 	.close_audio = jack_close,
 	.flush = jack_flush,
 	.pause = jack_pause,
-	.buffer_free = jack_free,
+	.buffer_free = audacious_jack_free,
 	.buffer_playing = jack_playing,
 	.output_time = jack_get_output_time,
 	.written_time = jack_get_written_time,


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- audacious-plugins.spec	2 Dec 2009 23:35:49 -0000	1.46
+++ audacious-plugins.spec	2 Dec 2009 23:49:52 -0000	1.47
@@ -32,6 +32,7 @@ Patch11:        audacious-plugins-1.5.1-
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
 Patch14:        audacious-plugins-1.5.1-neon.patch
+Patch15:        audacious-plugins-1.5.1-jack.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -190,6 +191,7 @@ vortex compressed files.
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
 %patch14 -p1 -b .neon
+%patch15 -p1 -b .jack_free
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -291,6 +293,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
 - Fix truncated track name for streaming mp3 in neon.c (#543050).
+- Merge jack_free redeclaration fix.
 
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.