Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sound
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13858/10.7/main/finkinfo/sound
Modified Files:
audacious2-plugins.info
Added Files:
audacious2-plugins.patch
Log Message:
fix build
Index: audacious2-plugins.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sound/audacious2-plugins.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- audacious2-plugins.info 14 Aug 2011 00:27:11 -0000 1.1
+++ audacious2-plugins.info 27 Jan 2013 21:35:17 -0000 1.2
@@ -1,6 +1,6 @@
Package: audacious2-plugins
Version: 2.2
-Revision: 3
+Revision: 5
Description: Plugins used by audacious2
DescUsage: <<
These plugins must be installed for audacious2 to run properly.
@@ -10,6 +10,9 @@
but the audacious2 binary requires audacious2-plugins to run.
The CoreAudio driver is really buggy, so use jack instead for output.
+
+ 'previous declaration' fix from upstream:
+
https://github.com/audacious-media-player/audacious-plugins/commit/7ddffb7c4d08374690c482b5332097618bc7794b
<<
Homepage: http://www.audacious-media-player.org/
License: GPL3
@@ -18,14 +21,16 @@
Source: http://distfiles.atheme.org/audacious-plugins-%v.tgz
Source-MD5: ed6790bf5667c824eda72301f0a886a8
+PatchFile: %n.patch
+PatchFile-MD5: 50a191e2b2530a95e651cb481fabe43c
PatchScript: <<
+ %{default_script}
echo 'LIBS += -L%p/lib/ncurses'
>>src/amidi-plug/backend-fluidsynth/Makefile
- perl -pi -e 's/jack_free/my_jack_free/' src/jack/jack.c
<<
Depends: <<
atk1-shlibs,
- audacious2-shlibs (>= %v-3),
+ audacious2-shlibs (>= %v-1),
cairo-shlibs,
dbus1.3-shlibs,
dbus-glib1.2-shlibs,
--- NEW FILE: audacious2-plugins.patch ---
diff --git a/src/jack/jack.c b/src/jack/jack.c
index d5bfa8f..0a1fcd0 100644
--- a/src/jack/jack.c
+++ b/src/jack/jack.c
@@ -236,7 +236,7 @@ static OutputPluginInitStatus jack_init(void)
/* 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 @@ static void jack_tell_audio(AFormat * fmt, gint * srate,
gint * nch)
.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,
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
