rpms/audacious-plugins/devel audacious-plugins-2.2-jack.patch, NONE, 1.1 audacious-plugins.spec, 1.64, 1.65

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25096

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-jack.patch 
Log Message:
add build-fix for jack_free

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

--- NEW FILE audacious-plugins-2.2-jack.patch ---
diff -Nur /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c audacious-plugins/src/jack/jack.c
--- /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c	2009-09-11 17:27:13.000000000 +0200
+++ audacious-plugins/src/jack/jack.c	2009-11-24 19:20:15.674971400 +0100
@@ -236,7 +236,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-static gint jack_free(void)
+static gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -448,7 +448,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/devel/audacious-plugins.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- audacious-plugins.spec	25 Nov 2009 14:51:25 -0000	1.64
+++ audacious-plugins.spec	25 Nov 2009 15:27:43 -0000	1.65
@@ -21,7 +21,8 @@ License: GPLv2 and GPLv2+ and LGPLv2+ an
 Source0: audacious-plugins-fedora-%{version}.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
 
-Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
+Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
+Patch1: audacious-plugins-2.2-jack.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -141,8 +142,9 @@ vortex compressed files.
 
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
-
-%patch2 -p1 -b .xmms-skindir
+%patch0 -p1 -b .xmms-skindir
+# obsolete with version upgrade: declaration conflict for jack_free
+%patch1 -p1 -b .jack
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in