Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13858/stable/main/finkinfo/sound
Modified Files:
audacious2-plugins.info audacious2-plugins.patch
Log Message:
fix build
Index: audacious2-plugins.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/audacious2-plugins.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- audacious2-plugins.info 20 Jun 2012 14:32:20 -0000 1.2
+++ audacious2-plugins.info 27 Jan 2013 21:35:17 -0000 1.3
@@ -1,6 +1,6 @@
Package: audacious2-plugins
Version: 2.2
-Revision: 4
+Revision: 5
Description: Plugins used by audacious2
DescUsage: <<
These plugins must be installed for audacious2 to run properly.
@@ -10,6 +10,11 @@
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
+
+ remove linebreak from variable-definitions -- dmacks
<<
Homepage: http://www.audacious-media-player.org/
License: GPL3
@@ -19,7 +24,7 @@
Source-MD5: ed6790bf5667c824eda72301f0a886a8
PatchFile: %n.patch
-PatchFile-MD5: 50a191e2b2530a95e651cb481fabe43c
+PatchFile-MD5: 2777a5af9b6559c429f53ee45d896325
PatchScript: <<
%{default_script}
echo 'LIBS += -L%p/lib/ncurses'
>>src/amidi-plug/backend-fluidsynth/Makefile
@@ -85,7 +90,7 @@
libmowgli,
libmpcdec5,
libogg,
- libpng3,
+ libpng15,
libsamplerate0-dev,
libshout4,
libsidplay,
Index: audacious2-plugins.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/audacious2-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- audacious2-plugins.patch 24 Mar 2012 19:25:57 -0000 1.1
+++ audacious2-plugins.patch 27 Jan 2013 21:35:17 -0000 1.2
@@ -1,8 +1,24 @@
-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)
+diff -Nurd -x'*~' audacious-plugins-2.2.orig/configure
audacious-plugins-2.2/configure
+--- audacious-plugins-2.2.orig/configure 2009-11-22 17:49:57.000000000
-0500
++++ audacious-plugins-2.2/configure 2013-01-27 16:29:26.000000000 -0500
+@@ -7866,11 +7866,9 @@
+ $as_echo "yes" >&6; }
+
+ if test "x$PC_REQUIRES" = "x"; then
+- PC_REQUIRES="gio-2.0 >=
+- 2.0"
++ PC_REQUIRES="gio-2.0 >= 2.0"
+ else
+- PC_REQUIRES="$PC_REQUIRES, gio-2.0 >=
+- 2.0"
++ PC_REQUIRES="$PC_REQUIRES, gio-2.0 >= 2.0"
+ fi
+
+
+diff -Nurd -x'*~' audacious-plugins-2.2.orig/src/jack/jack.c
audacious-plugins-2.2/src/jack/jack.c
+--- audacious-plugins-2.2.orig/src/jack/jack.c 2009-11-22 17:49:53.000000000
-0500
++++ audacious-plugins-2.2/src/jack/jack.c 2013-01-27 16:27:00.000000000
-0500
+@@ -236,7 +236,7 @@
/* Return the amount of data that can be written to the device */
@@ -11,7 +27,7 @@
{
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)
+@@ -448,7 +448,7 @@
.close_audio = jack_close,
.flush = jack_flush,
.pause = jack_pause,
------------------------------------------------------------------------------
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
