packages: audacious-plugins/audacious-plugins.spec, audacious-plugins/audac...

[arekm]

Author: arekm                        Date: Thu Dec 31 19:24:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix build

---- Files affected:
packages/audacious-plugins:
   audacious-plugins.spec (1.51 -> 1.52) , audacious-plugins-jack.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/audacious-plugins/audacious-plugins.spec
diff -u packages/audacious-plugins/audacious-plugins.spec:1.51 packages/audacious-plugins/audacious-plugins.spec:1.52
--- packages/audacious-plugins/audacious-plugins.spec:1.51	Thu Dec 31 20:17:11 2009
+++ packages/audacious-plugins/audacious-plugins.spec	Thu Dec 31 20:24:38 2009
@@ -9,12 +9,13 @@
 Summary(pl.UTF-8):	Wtyczki dla odtwarzacza multimedialnego Audacious (metapakiet)
 Name:		audacious-plugins
 Version:	2.1
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Applications/Sound
 Source0:	http://distfiles.atheme.org/%{name}-%{version}.tgz
 # Source0-md5:	087fcb1f6fb8429b267f18ed3e3acb7a
 Patch0:		%{name}-libmtp.patch
+Patch1:		%{name}-jack.patch
 URL:		http://audacious-media-player.org/
 # BR by visualization-projectM
 BuildRequires:	OpenGL-GLU-devel
@@ -973,6 +974,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I m4
@@ -1279,6 +1281,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2009/12/31 19:24:38  arekm
+- rel 3; fix build
+
 Revision 1.51  2009/12/31 19:17:11  arekm
 - release 2
 

================================================================
Index: packages/audacious-plugins/audacious-plugins-jack.patch
diff -u /dev/null packages/audacious-plugins/audacious-plugins-jack.patch:1.1
--- /dev/null	Thu Dec 31 20:24:44 2009
+++ packages/audacious-plugins/audacious-plugins-jack.patch	Thu Dec 31 20:24:38 2009
@@ -0,0 +1,22 @@
+Index: audacious-plugins-2.2/src/jack/jack.c
+===================================================================
+--- audacious-plugins-2.2.orig/src/jack/jack.c
++++ audacious-plugins-2.2/src/jack/jack.c
+@@ -236,7 +236,7 @@ static OutputPluginInitStatus jack_init(
+ 
+ 
+ /* 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 @@ OutputPlugin jack_op =
+     .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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacious-plugins/audacious-plugins.spec?r1=1.51&r2=1.52&f=u