[vlc-commits] commit: contribs: enable fluidsynth on Mac OS X and fetch it from SourceForge instead of Savannah (=?UTF-8?Q?Felix=20Paul=20K=C3=BChne=20?=)

[git at videolan.org]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Nov 30 18:28:37 2010 +0100| [4ac63ab48958a9396ea617adc6e49e2408246d62] | committer: Felix Paul Kühne 

contribs: enable fluidsynth on Mac OS X and fetch it from SourceForge instead of Savannah

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ac63ab48958a9396ea617adc6e49e2408246d62
---

 extras/contrib/src/Distributions/macosx32.mak |    2 +-
 extras/contrib/src/Distributions/macosx64.mak |    2 +-
 extras/contrib/src/packages.mak               |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Distributions/macosx32.mak b/extras/contrib/src/Distributions/macosx32.mak
index e43ab55..b4840d9 100644
--- a/extras/contrib/src/Distributions/macosx32.mak
+++ b/extras/contrib/src/Distributions/macosx32.mak
@@ -7,7 +7,7 @@ all: .freetype \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \
-    .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses \
+    .dca .tag .x264 .goom2k4 .lua .zvbi .fluid .fontconfig .ncurses \
     .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
 
 # .expat don't work with SDK yet
diff --git a/extras/contrib/src/Distributions/macosx64.mak b/extras/contrib/src/Distributions/macosx64.mak
index 7db1a67..434b3e2 100644
--- a/extras/contrib/src/Distributions/macosx64.mak
+++ b/extras/contrib/src/Distributions/macosx64.mak
@@ -2,7 +2,7 @@
 TOOLS = .libtool .intl .pkgcfg .yasm .automake
 
 all: .freetype \
-    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
+    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .fluid .theora \
     .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index c7a0fe9..00f6714 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -206,7 +206,8 @@ ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
 PCRE_VERSION=8.00
 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
 FLUID_VERSION=1.0.9# DO NOT update, this will require glib
-FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
+#FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
+FLUID_URL=http://downloads.sourceforge.net/project/fluidsynth/older%20releases/fluidsynth-$(FLUID_VERSION).tar.gz
 YASM_VERSION=1.1.0
 #YASM_URL=$(CONTRIB_VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz
 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz