Imported Upstream version 3.6.2

16 files changed, 323 insertions, 181 deletions

diff --git a/contrib/audacious.appdata.xml b/contrib/audacious.appdata.xml
new file mode 100644
index 0000000..d6e4595
--- /dev/null
+++ b/contrib/audacious.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Audacious developers -->
+<component type="desktop">
+  <id>audacious.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-2-Clause</project_license>
+  <name>Audacious</name>
+  <summary>Lightweight audio player</summary>
+  <description>
+    <p>
+      Audacious is an open source audio player. Originally a descendant of XMMS,
+      Audacious plays your music how you want it, without stealing away your
+      computer’s resources from other tasks.
+    </p>
+    <p>
+      Drag and drop folders and individual song files, search for artists and
+      albums in your entire music library, or create and edit your own custom
+      playlists. Listen to CD’s or stream music from the Internet. Tweak the
+      sound with the graphical equalizer or experiment with LADSPA
+      effects. Enjoy the modern GTK-themed interface or change things up with
+      Winamp Classic skins. Use the plugins included with Audacious to fetch
+      lyrics for your music, to set an alarm in the morning, and more.
+    </p>
+  </description>
+  <url type="homepage">http://audacious-media-player.org</url>
+  <screenshots>
+    <screenshot type="default">http://audacious-media-player.org/images/gtk-interface.png</screenshot>
+    <screenshot>http://audacious-media-player.org/images/winamp-interface.png</screenshot>
+    <screenshot>http://audacious-media-player.org/images/settings-window.png</screenshot>
+  </screenshots>
+</component>
diff --git a/contrib/macpack/.DS_Store b/contrib/macpack/.DS_Store
deleted file mode 100644
index 796f3b5..0000000
--- a/contrib/macpack/.DS_Store
+++ /dev/null
diff --git a/contrib/macpack/Audacious.app/Contents/Info.plist b/contrib/macpack/Audacious.app/Contents/Info.plist
index ffa9eb5..7898402 100644
--- a/contrib/macpack/Audacious.app/Contents/Info.plist
+++ b/contrib/macpack/Audacious.app/Contents/Info.plist
@@ -11,15 +11,14 @@
 	<key>CFBundleIconFile</key>
 	<string>Audacious.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.atheme.audacious</string>
+	<string>org.audacious-media-player</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>1.4.5</string>
+	<string>3.6-devel</string>
 	<key>CFBundleName</key>
 	<string>Audacious</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4</string>
+	<string>3.6</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2008 Atheme.org
-All Rights Reserved.</string>
+	<string>Copyright © 2001-2014 Audacious developers and others</string>
 </dict>
 </plist>
diff --git a/contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns b/contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns
index 05b6e99..090afb8 100644
--- a/contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns
+++ b/contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns
diff --git a/contrib/win32/audacious.ico b/contrib/win32/audacious.ico
deleted file mode 100644
index f094610..0000000
--- a/contrib/win32/audacious.ico
+++ /dev/null
diff --git a/contrib/win32/gtkrc b/contrib/win32/gtkrc
new file mode 100644
index 0000000..14456b5
--- /dev/null
+++ b/contrib/win32/gtkrc
@@ -0,0 +1 @@
+gtk-icon-theme-name = "gnome"
diff --git a/contrib/win32/notes.html b/contrib/win32/notes.html
index 69a7b27..425adf6 100644
--- a/contrib/win32/notes.html
+++ b/contrib/win32/notes.html
@@ -10,7 +10,7 @@
 <h2>Notes for Building Audacious on Windows</h2>
 
 <p><em>John Lindgren<br>
-January 24, 2014</em></p>
+May 16, 2015</em></p>
 
 <p>Several patch files should accompany this document.</p>
 
@@ -58,8 +58,8 @@ mingw-get upgrade mingw32-w32api=3.17-2</tt></p></blockquote>
 <h3>Install libpng</h3>
 
 <p>Download and unzip to <tt>C:\libpng</tt>:<br>
-<a href="http://sourceforge.net/projects/libpng/files/libpng16/1.6.8/libpng-1.6.8.tar.xz/download">
-<tt>http://sourceforge.net/projects/libpng/files/libpng16/1.6.8/libpng-1.6.8.tar.xz/download</tt></a></p>
+<a href="http://sourceforge.net/projects/libpng/files/libpng16/1.6.17/libpng-1.6.17.tar.xz/download">
+<tt>http://sourceforge.net/projects/libpng/files/libpng16/1.6.17/libpng-1.6.17.tar.xz/download</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libpng<br>
@@ -67,23 +67,23 @@ mingw-get upgrade mingw32-w32api=3.17-2</tt></p></blockquote>
 make<br>
 make install</tt></p></blockquote>
 
-<h3>Install libjpeg</h3>
+<h3>Install libjpeg-turbo</h3>
 
 <p>Download and unzip to <tt>C:\libjpeg</tt>:<br>
-<a href="http://www.ijg.org/files/jpegsrc.v9a.tar.gz">
-<tt>http://www.ijg.org/files/jpegsrc.v9a.tar.gz</tt></a></p>
+<a href="http://sourceforge.net/projects/libjpeg-turbo/files/1.4.0/libjpeg-turbo-1.4.0.tar.gz/download">
+<tt>http://sourceforge.net/projects/libjpeg-turbo/files/1.4.0/libjpeg-turbo-1.4.0.tar.gz/download</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libjpeg<br>
-./configure --prefix=/C/GTK<br>
+./configure --prefix=/C/GTK --without-simd --without-turbojpeg<br>
 make<br>
 make install</tt></p></blockquote>
 
 <h3>Install libffi</h3>
 
 <p>Download and unzip to <tt>C:\libffi</tt>:<br>
-<a href="ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz">
-<tt>ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz</tt></a></p>
+<a href="ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz">
+<tt>ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libffi<br>
@@ -94,15 +94,16 @@ make install</tt></p></blockquote>
 <h3>Install GLib</h3>
 
 <p>Download and unzip to <tt>C:\glib</tt>:<br>
-<a href="http://ftp.gnome.org/pub/GNOME/sources/glib/2.38/glib-2.38.2.tar.xz">
-<tt>http://ftp.gnome.org/pub/GNOME/sources/glib/2.38/glib-2.38.2.tar.xz</tt></a></p>
+<a href="http://ftp.gnome.org/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz">
+<tt>http://ftp.gnome.org/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz</tt></a></p>
 
-<p>Apply the patch <tt>gdbus-codegen.in.diff</tt> to <tt>C:\glib\gio\gdbus-2.0\codegen\gdbus-codegen.in</tt>.<br>
-Apply the patch <tt>ggettext.diff</tt> to <tt>C:\glib\glib\ggettext.c</tt>.</p>
+<p>Apply the patch <tt>ggettext.c.diff</tt> to <tt>C:\glib\glib\ggettext.c</tt>.<br>
+Apply the patch <tt>glocalfileinfo.c.diff</tt> to <tt>C:\glib\gio\glocalfileinfo.c.diff</tt>.<br>
+Apply the patch <tt>gwin32networking.h.diff</tt> to <tt>C:\glib\gio\gwin32networking.h</tt>.</p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/glib<br>
-CFLAGS="-march=i686" LIBFFI_CFLAGS="-I/C/GTK/lib/libffi-3.0.13/include" LIBFFI_LIBS="-lffi" ZLIB_CFLAGS="" ZLIB_LIBS="-lz" ./configure --prefix=/C/GTK<br>
+CFLAGS="-O2 -march=i686" LIBFFI_CFLAGS="-I/C/GTK/lib/libffi-3.2.1/include" LIBFFI_LIBS="-lffi" ZLIB_CFLAGS="" ZLIB_LIBS="-lz" ./configure --prefix=/C/GTK<br>
 make<br>
 make install</tt></p></blockquote>
 
@@ -123,8 +124,8 @@ make install</tt></p></blockquote>
 <h3>Install pixman</h3>
 
 <p>Download and unzip to <tt>C:\pixman</tt>:<br>
-<a href="http://cairographics.org/releases/pixman-0.32.4.tar.gz">
-<tt>http://cairographics.org/releases/pixman-0.32.4.tar.gz</tt></a></p>
+<a href="http://cairographics.org/releases/pixman-0.32.6.tar.gz">
+<tt>http://cairographics.org/releases/pixman-0.32.6.tar.gz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/pixman<br>
@@ -135,20 +136,20 @@ make install</tt></p></blockquote>
 <h3>Install Cairo</h3>
 
 <p>Download and unzip to <tt>C:\cairo</tt>:<br>
-<a href="http://cairographics.org/releases/cairo-1.12.16.tar.xz">
-<tt>http://cairographics.org/releases/cairo-1.12.16.tar.xz</tt></a></p>
+<a href="http://cairographics.org/releases/cairo-1.14.2.tar.xz">
+<tt>http://cairographics.org/releases/cairo-1.14.2.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/cairo<br>
-CFLAGS=-D_SSIZE_T_DEFINED ./configure --prefix=/C/GTK --disable-interpreter<br>
+./configure --prefix=/C/GTK --disable-interpreter<br>
 make<br>
 make install</tt></p></blockquote>
 
 <h3>Install Pango</h3>
 
 <p>Download and unzip to <tt>C:\pango</tt>:<br>
-<a href="http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.1.tar.xz">
-<tt>http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.1.tar.xz</tt></a></p>
+<a href="http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz">
+<tt>http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/pango<br>
@@ -159,10 +160,8 @@ make install</tt></p></blockquote>
 <h3>Install gdk-pixbuf</h3>
 
 <p>Download and unzip to <tt>C:\gdk-pixbuf</tt>:<br>
-<a href="http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.3.tar.xz">
-<tt>http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.3.tar.xz</tt></a></p>
-
-<p>Apply the patch <tt>gdk-pixbuf-io.c.diff</tt> to <tt>C:\gdk-pixbuf\gdk-pixbuf\gdk-pixbuf-io.c</tt>.</p>
+<a href="http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.4.tar.xz">
+<tt>http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.4.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/gdk-pixbuf<br>
@@ -173,8 +172,8 @@ make install</tt></p></blockquote>
 <h3>Install ATK</h3>
 
 <p>Download and unzip to <tt>C:\atk</tt>:<br>
-<a href="http://ftp.gnome.org/pub/gnome/sources/atk/2.10/atk-2.10.0.tar.xz">
-<tt>http://ftp.gnome.org/pub/gnome/sources/atk/2.10/atk-2.10.0.tar.xz</tt></a></p>
+<a href="http://ftp.gnome.org/pub/gnome/sources/atk/2.16/atk-2.16.0.tar.xz">
+<tt>http://ftp.gnome.org/pub/gnome/sources/atk/2.16/atk-2.16.0.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/atk<br>
@@ -185,22 +184,19 @@ make install</tt></p></blockquote>
 <h3>Install GTK+</h3>
 
 <p>Download and unzip to <tt>C:\gtksrc</tt>:<br>
-<a href="http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.8/gtk+-3.8.8.tar.xz">
-<tt>http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.8/gtk+-3.8.8.tar.xz</tt></a></p>
-
-<p>Apply the patch <tt>gtksettings.c.diff</tt> to <tt>C:\gtksrc\gtk\gtksettings.c</tt>.</p>
+<a href="http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-2.24.28.tar.xz">
+<tt>http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-2.24.28.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/gtksrc<br>
-CFLAGS="-DHAVE_ISNAN -DHAVE_ISINF" ./configure --prefix=/C/GTK<br>
+CFLAGS="-O2 -D_WIN32_WINNT=0x0501" ./configure --prefix=/C/GTK<br>
 make<br>
 make install</tt></p></blockquote>
 
 <p><i>It may be necessary to run the MinGW shell with administrative privileges
 for GTK+ to build successfully.</i></p>
 
-<p>Copy <tt>settings.ini</tt> (accompanying this document) to
-<tt>C:\GTK\etc\gtk-3.0\settings.ini</tt>.
+<p>Copy <tt>gtkrc</tt> (accompanying this document) to <tt>C:\GTK\etc\gtk-2.0\gtkrc</tt>.
 
 <h3>Install intltool</h3>
 
@@ -217,8 +213,8 @@ make install</tt></p></blockquote>
 <h3>Install GNOME Icon Theme</h3>
 
 <p>Download and unzip to <tt>C:\gnome-icon-theme</tt>:<br>
-<a href="http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.8/gnome-icon-theme-3.8.3.tar.xz">
-<tt>http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.8/gnome-icon-theme-3.8.3.tar.xz</tt></a></p>
+<a href="http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.12/gnome-icon-theme-3.12.0.tar.xz">
+<tt>http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/3.12/gnome-icon-theme-3.12.0.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/gnome-icon-theme<br>
@@ -226,6 +222,9 @@ make install</tt></p></blockquote>
 make<br>
 make install</tt></p></blockquote>
 
+<p><i>It may be necessary to run the MinGW shell with administrative privileges
+for GNOME Icon Theme to install successfully.</i></p>
+
 <h3>Install SDL</h3>
 
 <p>Download and unzip to <tt>C:\libsdl</tt>:<br>
@@ -249,8 +248,8 @@ make install</tt></p></blockquote>
 <h3>Install libxml</h3>
 
 <p>Download and unzip to <tt>C:\libxml</tt>:<br>
-<a href="ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz">
-<tt>ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz</tt></a></p>
+<a href="ftp://xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz">
+<tt>ftp://xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libxml<br>
@@ -261,8 +260,8 @@ make install</tt></p></blockquote>
 <h3>Install mpg123</h3>
 
 <p>Download and unzip to <tt>C:\mpg123</tt>:<br>
-<a href="http://mpg123.de/download/mpg123-1.17.0.tar.bz2">
-<tt>http://mpg123.de/download/mpg123-1.17.0.tar.bz2</tt></a></p>
+<a href="http://mpg123.de/download/mpg123-1.22.1.tar.bz2">
+<tt>http://mpg123.de/download/mpg123-1.22.1.tar.bz2</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/mpg123<br>
@@ -373,8 +372,8 @@ make install</tt></p></blockquote>
 <h3>Install libflac</h3>
 
 <p>Download and unzip to <tt>C:\libflac</tt>:<br>
-<a href="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz">
-<tt>http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz</tt></a></p>
+<a href="http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz">
+<tt>http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libflac<br>
@@ -385,8 +384,8 @@ make install</tt></p></blockquote>
 <h3>Install libogg</h3>
 
 <p>Download and unzip to <tt>C:\libogg</tt>:<br>
-<a href="http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.xz">
-<tt>http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.xz</tt></a></p>
+<a href="http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz">
+<tt>http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libogg<br>
@@ -397,8 +396,8 @@ make install</tt></p></blockquote>
 <h3>Install libvorbis</h3>
 
 <p>Download and unzip to <tt>C:\libvorbis</tt>:<br>
-<a href="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz">
-<tt>http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz</tt></a></p>
+<a href="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz">
+<tt>http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libvorbis<br>
@@ -406,27 +405,29 @@ make install</tt></p></blockquote>
 make<br>
 make install</tt></p></blockquote>
 
+<!-- TODO: set up SSL certificates for Scrobbler
 <h3>Install OpenSSL</h3>
 
 <p>Download and unzip to <tt>C:\openssl</tt>:<br>
-<a href="http://www.openssl.org/source/openssl-1.0.1f.tar.gz">
-<tt>http://www.openssl.org/source/openssl-1.0.1f.tar.gz</tt></a></p>
+<a href="http://www.openssl.org/source/openssl-1.0.1j.tar.gz">
+<tt>http://www.openssl.org/source/openssl-1.0.1j.tar.gz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/openssl<br>
 ./configure shared mingw --prefix=/C/libs<br>
 make<br>
 make install</tt></p></blockquote>
+-->
 
 <h3>Install libneon</h3>
 
 <p>Download and unzip to <tt>C:\libneon</tt>:<br>
-<a href="http://www.webdav.org/neon/neon-0.30.0.tar.gz">
-<tt>http://www.webdav.org/neon/neon-0.30.0.tar.gz</tt></a></p>
+<a href="http://www.webdav.org/neon/neon-0.30.1.tar.gz">
+<tt>http://www.webdav.org/neon/neon-0.30.1.tar.gz</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libneon<br>
-./configure --prefix=/C/libs --enable-shared --with-ssl<br>
+./configure --prefix=/C/libs --enable-shared<br> <!-- --with-ssl -->
 make<br>
 make install</tt></p></blockquote>
 
@@ -460,8 +461,8 @@ make install</tt></p></blockquote>
 <h3>Install FFmpeg</h3>
 
 <p>Download and unzip to <tt>C:\ffmpeg</tt>:<br>
-<a href="http://ffmpeg.org/releases/ffmpeg-2.1.3.tar.bz2">
-<tt>http://ffmpeg.org/releases/ffmpeg-2.1.3.tar.bz2</tt></a></p>
+<a href="http://ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2">
+<tt>http://ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/ffmpeg<br>
@@ -486,39 +487,41 @@ autoreconf<br>
 make<br>
 make install</tt></p></blockquote>
 
+<!-- TODO: set up SSL certificates for Scrobbler
 <h3>Install libcurl</h3>
 
 <p>Download and unzip to <tt>C:\libcurl</tt>:<br>
-<a href="http://curl.haxx.se/download/curl-7.34.0.tar.bz2">
-<tt>http://curl.haxx.se/download/curl-7.34.0.tar.bz2</tt></a></p>
+<a href="http://curl.haxx.se/download/curl-7.39.0.tar.bz2">
+<tt>http://curl.haxx.se/download/curl-7.39.0.tar.bz2</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libcurl<br>
 ./configure --prefix=/C/libs<br>
 make<br>
 make install</tt></p></blockquote>
+-->
 
 <h3>Install libmms</h3>
 
 <p>Download and unzip to <tt>C:\libmms</tt>:<br>
-<a href="http://sourceforge.net/projects/libmms/files/libmms/0.6.2/libmms-0.6.2.tar.gz/download">
-<tt>http://sourceforge.net/projects/libmms/files/libmms/0.6.2/libmms-0.6.2.tar.gz/download</tt></a></p>
+<a href="http://sourceforge.net/projects/libmms/files/libmms/0.6.4/libmms-0.6.4.tar.gz/download">
+<tt>http://sourceforge.net/projects/libmms/files/libmms/0.6.4/libmms-0.6.4.tar.gz/download</tt></a></p>
 
-<p>Apply the patch <tt>libmms-makefile.am.diff</tt> to <tt>C:\libmms\src\Makefile.am</tt>.<br>
-Apply the patch <tt>libmms-seek-fix.diff</tt> (it changes multiple files).</p>
+<p>Apply the patch <tt>libmms-strndup.diff</tt> (it changes multiple files).</p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libmms<br>
-./autogen.sh<br>
-LIBS=-liconv ./configure --prefix=/C/libs<br>
+cp /C/MinGW/share/libtool/config/ltmain.sh .<br>
+autoreconf<br>
+./configure --prefix=/C/libs<br>
 make<br>
 make install</tt></p></blockquote>
 
 <h3>Install libmodplug</h3>
 
 <p>Download and unzip to <tt>C:\libmodplug</tt>:<br>
-<a href="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz/download">
-<tt>http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz/download</tt></a></p>
+<a href="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.5/libmodplug-0.8.8.5.tar.gz/download">
+<tt>http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.5/libmodplug-0.8.8.5.tar.gz/download</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libmodplug<br>
@@ -529,8 +532,8 @@ make install</tt></p></blockquote>
 <h3>Install libsidplayfp</h3>
 
 <p>Download and unzip to <tt>C:\libsidplayfp</tt>:<br>
-<a href="http://sourceforge.net/projects/sidplay-residfp/files/libsidplayfp/1.2/libsidplayfp-1.2.2.tar.gz/download">
-<tt>http://sourceforge.net/projects/sidplay-residfp/files/libsidplayfp/1.2/libsidplayfp-1.2.2.tar.gz/download</tt></a></p>
+<a href="http://sourceforge.net/projects/sidplay-residfp/files/libsidplayfp/1.7/libsidplayfp-1.7.2.tar.gz/download">
+<tt>http://sourceforge.net/projects/sidplay-residfp/files/libsidplayfp/1.7/libsidplayfp-1.7.2.tar.gz/download</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/libsidplayfp<br>
@@ -556,8 +559,8 @@ make install</tt></p></blockquote>
 <h3>Install Audacious</h3>
 
 <p>Download and unzip to <tt>C:\audacious</tt>:<br>
-<a href="http://distfiles.audacious-media-player.org/audacious-3.4.1.tar.bz2">
-<tt>http://distfiles.audacious-media-player.org/audacious-3.4.1.tar.bz2</tt></a></p>
+<a href="http://distfiles.audacious-media-player.org/audacious-3.6.tar.bz2">
+<tt>http://distfiles.audacious-media-player.org/audacious-3.6.tar.bz2</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/audacious<br>
@@ -568,8 +571,8 @@ make install</tt></p></blockquote>
 <h3>Install Audacious Plugins</h3>
 
 <p>Download and unzip to <tt>C:\audacious-plugins</tt>:<br>
-<a href="http://distfiles.audacious-media-player.org/audacious-plugins-3.4.1.tar.bz2">
-<tt>http://distfiles.audacious-media-player.org/audacious-plugins-3.4.1.tar.bz2</tt></a></p>
+<a href="http://distfiles.audacious-media-player.org/audacious-plugins-3.6.tar.bz2">
+<tt>http://distfiles.audacious-media-player.org/audacious-plugins-3.6.tar.bz2</tt></a></p>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/audacious-plugins<br>
diff --git a/contrib/win32/patches/gdbus-codegen.in.diff b/contrib/win32/patches/gdbus-codegen.in.diff
deleted file mode 100644
index 20a239b..0000000
--- a/contrib/win32/patches/gdbus-codegen.in.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..c92b63b 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -31,7 +31,7 @@ if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
- elif os.name == 'nt':
-     # Makes gdbus-codegen 'relocatable' at runtime on Windows.
--    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
-+    path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
- else:
-     path = os.path.join('@datadir@', 'glib-2.0')
- 
diff --git a/contrib/win32/patches/gdk-pixbuf-io.c.diff b/contrib/win32/patches/gdk-pixbuf-io.c.diff
deleted file mode 100644
index 7b110ef..0000000
--- a/contrib/win32/patches/gdk-pixbuf-io.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk-pixbuf/gdk-pixbuf-io.c.0	2014-07-19 14:54:26 -0400
-+++ gdk-pixbuf/gdk-pixbuf-io.c	2014-07-19 14:54:38 -0400
-@@ -340,7 +340,7 @@
-       strncmp (*path, GDK_PIXBUF_PREFIX "\\", strlen (GDK_PIXBUF_PREFIX "\\")) == 0)
-     {
-           gchar *tem = NULL;
--      if (strlen(*path) > 5 && strncmp (*path - 5, ".libs", 5) == 0)
-+      if (strlen(*path) > 5 && strncmp (*path, ".libs", 5) == 0)
-         {
-           /* We are being run from inside the build tree, and shouldn't mess about. */
-           return;
diff --git a/contrib/win32/patches/glocalfileinfo.c.diff b/contrib/win32/patches/glocalfileinfo.c.diff
new file mode 100644
index 0000000..3e3a6dd
--- /dev/null
+++ b/contrib/win32/patches/glocalfileinfo.c.diff
@@ -0,0 +1,148 @@
+--- glocalfileinfo.c.0	2015-05-17 01:31:00 -0400
++++ glocalfileinfo.c	2015-05-17 01:54:24 -0400
+@@ -1579,13 +1579,12 @@
+     }
+ }
+ 
+-static const char *
+-get_icon_name (const char *path,
+-               const char *content_type,
+-               gboolean    use_symbolic,
+-               gboolean   *with_fallbacks_out)
++static GIcon *
++get_icon_for_folder (const char *path,
++                     gboolean    use_symbolic)
+ {
+-  const char *name = NULL;
++  GIcon *icon;
++  const char *name;
+   gboolean with_fallbacks = TRUE;
+ 
+   if (strcmp (path, g_get_home_dir ()) == 0)
+@@ -1626,45 +1625,15 @@
+     {
+       name = use_symbolic ? "folder-videos-symbolic" : "folder-videos";
+     }
+-  else if (g_strcmp0 (content_type, "inode/directory") == 0)
+-    {
+-      name = use_symbolic ? "folder-symbolic" : "folder";
+-    }
+   else
+     {
+-      name = NULL;
++      name = use_symbolic ? "folder-symbolic" : "folder";
+     }
+ 
+-  if (with_fallbacks_out != NULL)
+-    *with_fallbacks_out = with_fallbacks;
+-
+-  return name;
+-}
+-
+-static GIcon *
+-get_icon (const char *path,
+-          const char *content_type,
+-          gboolean    use_symbolic)
+-{
+-  GIcon *icon = NULL;
+-  const char *icon_name;
+-  gboolean with_fallbacks;
+-
+-  icon_name = get_icon_name (path, content_type, use_symbolic, &with_fallbacks);
+-  if (icon_name != NULL)
+-    {
+-      if (with_fallbacks)
+-        icon = g_themed_icon_new_with_default_fallbacks (icon_name);
+-      else
+-        icon = g_themed_icon_new (icon_name);
+-    }
++  if (with_fallbacks)
++    icon = g_themed_icon_new_with_default_fallbacks (name);
+   else
+-    {
+-      if (use_symbolic)
+-        icon = g_content_type_get_symbolic_icon (content_type);
+-      else
+-        icon = g_content_type_get_icon (content_type);
+-    }
++    icon = g_themed_icon_new (name);
+ 
+   return icon;
+ }
+@@ -1839,37 +1808,47 @@
+     {
+       char *content_type = get_content_type (basename, path, stat_ok ? &statbuf : NULL, is_symlink, symlink_broken, flags, FALSE);
+ 
+-      if (content_type)
+-	{
+-	  g_file_info_set_content_type (info, content_type);
+-
+-	  if (_g_file_attribute_matcher_matches_id (attribute_matcher,
+-                                                     G_FILE_ATTRIBUTE_ID_STANDARD_ICON)
+-               || _g_file_attribute_matcher_matches_id (attribute_matcher,
+-                                                        G_FILE_ATTRIBUTE_ID_STANDARD_SYMBOLIC_ICON))
+-	    {
+-	      GIcon *icon;
++      if (_g_file_attribute_matcher_matches_id (attribute_matcher,
++                                                G_FILE_ATTRIBUTE_ID_STANDARD_ICON) ||
++          _g_file_attribute_matcher_matches_id (attribute_matcher,
++                                                G_FILE_ATTRIBUTE_ID_STANDARD_SYMBOLIC_ICON))
++        {
++          GIcon *icon;
+ 
+-              /* non symbolic icon */
+-              icon = get_icon (path, content_type, FALSE);
+-              if (icon != NULL)
+-                {
+-                  g_file_info_set_icon (info, icon);
+-                  g_object_unref (icon);
+-                }
+-
+-              /* symbolic icon */
+-              icon = get_icon (path, content_type, TRUE);
+-              if (icon != NULL)
+-                {
+-                  g_file_info_set_symbolic_icon (info, icon);
+-                  g_object_unref (icon);
+-                }
++          /* non symbolic icon */
++          if (stat_ok && S_ISDIR (statbuf.st_mode))
++            icon = get_icon_for_folder (path, FALSE);
++          else if (content_type != NULL)
++            icon = g_content_type_get_icon (content_type);
++          else
++            icon = NULL;
++
++          if (icon != NULL)
++            {
++              g_file_info_set_icon (info, icon);
++              g_object_unref (icon);
++            }
++
++          /* symbolic icon */
++          if (stat_ok && S_ISDIR (statbuf.st_mode))
++            icon = get_icon_for_folder (path, TRUE);
++          else if (content_type != NULL)
++            icon = g_content_type_get_symbolic_icon (content_type);
++          else
++            icon = NULL;
++
++          if (icon != NULL)
++            {
++              g_file_info_set_symbolic_icon (info, icon);
++              g_object_unref (icon);
++            }
++        }
+ 
+-	    }
+-	  
+-	  g_free (content_type);
+-	}
++      if (content_type != NULL)
++        {
++          g_file_info_set_content_type (info, content_type);
++          g_free (content_type);
++        }
+     }
+ 
+   if (_g_file_attribute_matcher_matches_id (attribute_matcher,
diff --git a/contrib/win32/patches/gtksettings.c.diff b/contrib/win32/patches/gtksettings.c.diff
deleted file mode 100644
index 4eb47d0..0000000
--- a/contrib/win32/patches/gtksettings.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- gtksettings.c.0	2013-08-30 07:08:29 -0400
-+++ gtksettings.c	2013-09-15 12:55:35 -0400
-@@ -2577,9 +2577,9 @@
-   GtkSettingsPrivate *priv = settings->priv;
-   gint hinting;
-   gchar *hint_style_str;
--  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_NONE;
-+  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_DEFAULT;
-   gint antialias;
--  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_GRAY;
-+  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_DEFAULT;
-   gchar *rgba_str;
-   cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-   cairo_font_options_t *options;
diff --git a/contrib/win32/patches/gwin32networking.h.diff b/contrib/win32/patches/gwin32networking.h.diff
new file mode 100644
index 0000000..10eb20f
--- /dev/null
+++ b/contrib/win32/patches/gwin32networking.h.diff
@@ -0,0 +1,23 @@
+--- gwin32networking.h.0	2015-05-16 15:55:46 -0400
++++ gwin32networking.h	2015-05-16 16:16:48 -0400
+@@ -19,14 +19,17 @@
+ #ifndef __G_WIN32_NETWORKING_H__
+ #define __G_WIN32_NETWORKING_H__
+ 
++#include <windef.h>
++#include <winsock2.h>
++
+ G_BEGIN_DECLS
+ 
+ /* Check if more ANSI-compliant Winsock2 functions are provided */
+ /* For run-time compatibility with Windows XP, remove when XP support dropped */
+ 
+-typedef INT (WSAAPI *PFN_InetPton) (INT, PCTSTR, PVOID);
+-typedef PCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
+-typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
++typedef INT (WSAAPI *PFN_InetPton) (INT, PCSTR, PVOID);
++typedef PCSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PSTR, size_t);
++typedef ULONG (WINAPI *PFN_IfNameToIndex) (PCSTR);
+ 
+ typedef struct _GWin32WinsockFuncs
+ {
diff --git a/contrib/win32/patches/libmms-makefile.am.diff b/contrib/win32/patches/libmms-makefile.am.diff
deleted file mode 100644
index 50c5c97..0000000
--- a/contrib/win32/patches/libmms-makefile.am.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.0	2012-07-01 21:24:36 -0400
-+++ Makefile.am	2012-07-01 21:24:56 -0400
-@@ -22,7 +22,7 @@
- # noinst_HEADERS = 
- 
- libmms_la_LDFLAGS = -version-info 0:2:0 -no-undefined -export-dynamic
--libmms_la_LIBADD = $(GLIB_LIBS)
-+libmms_la_LIBADD = $(MMS_LIBS) $(GLIB_LIBS)
- 
- libmmsincdir = $(includedir)/libmms
- 
diff --git a/contrib/win32/patches/libmms-seek-fix.diff b/contrib/win32/patches/libmms-seek-fix.diff
deleted file mode 100644
index 06b7a6f..0000000
--- a/contrib/win32/patches/libmms-seek-fix.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur libmms-0.6.2-base/src/mms-common-funcs.h libmms-0.6.2/src/mms-common-funcs.h
---- libmms-0.6.2-base/src/mms-common-funcs.h	2011-01-17 05:39:09.000000000 -0500
-+++ libmms-0.6.2/src/mms-common-funcs.h	2013-06-04 01:26:19.639856484 -0400
-@@ -159,6 +159,7 @@
-         }
-         this->file_len       = LE_64(this->asf_header + i + 40);
-         this->file_time      = LE_64(this->asf_header + i + 48);
-+        this->asf_num_packets = LE_64(this->asf_header + i + 56);
-         this->time_len       = LE_64(this->asf_header + i + 64);
-         //this->time_len       = LE_64(this->asf_header + i + 72);
-         this->preroll        = LE_64(this->asf_header + i + 80);
-diff -ur libmms-0.6.2-base/src/mmsh.c libmms-0.6.2/src/mmsh.c
---- libmms-0.6.2-base/src/mmsh.c	2011-01-17 05:51:12.000000000 -0500
-+++ libmms-0.6.2/src/mmsh.c	2013-06-04 01:27:51.632691449 -0400
-@@ -334,6 +334,7 @@
-   }
-   this->chunk_type       = LE_16 (&chunk_header[0]);
-   this->chunk_length     = LE_16 (&chunk_header[2]);
-+  this->chunk_seq_number = -1;
- 
-   switch (this->chunk_type) {
-     case CHUNK_TYPE_DATA:
-@@ -603,6 +604,7 @@
-   this->s               = -1;
-   this->bandwidth       = bandwidth;
-   this->http_request_number = 1;
-+  this->chunk_seq_number = -1;
- 
-   if (this->proxy_url) {
-     proxy_uri = gnet_uri_new(this->proxy_url);
-@@ -691,10 +693,13 @@
-          *     0: stop
-          *     1: a new stream follows
-          */
--        if (this->chunk_seq_number == 0)
-+        if (this->chunk_seq_number == 0) {
-+          this->chunk_seq_number = -1;
-           return EOS;
-+        }
- 
-         this->http_request_number = 1;
-+        this->chunk_seq_number = -1;
-         if (!mmsh_connect_int (io, this, 0, 0))
-           return MMSH_ERROR;
- 
-@@ -916,7 +921,7 @@
-     }
-     
-     lprintf("seek to %d, packet: %d\n", (int)dest, (int)dest_packet_seq);
--    if (!mmsh_connect_int(io, this, (dest_packet_seq+1) * this->asf_packet_len, 0)) {
-+    if (!mmsh_connect_int(io, this, this->asf_header_len + dest_packet_seq * this->asf_packet_len, 0)) {
-       /* Oops no more connection let our caller know things are fscked up */
-       return this->current_pos = -1;
-     }
diff --git a/contrib/win32/patches/libmms-strndup.diff b/contrib/win32/patches/libmms-strndup.diff
new file mode 100644
index 0000000..3c875ee
--- /dev/null
+++ b/contrib/win32/patches/libmms-strndup.diff
@@ -0,0 +1,44 @@
+diff -ur libmms-0.6.4-orig/configure.in libmms-0.6.4/configure.in
+--- libmms-0.6.4-orig/configure.in	2014-04-08 23:15:23 -0400
++++ libmms-0.6.4/configure.in	2015-01-02 13:03:49 -0500
+@@ -14,6 +14,7 @@
+ 
+ dnl Checks for header files.
+ AC_CHECK_HEADERS([sys/socket.h netinet/in.h netdb.h windows.h winsock2.h])
++AC_CHECK_FUNCS([strndup])
+ 
+ case $host in
+     *beos*)
+diff -ur libmms-0.6.4-orig/src/uri.c libmms-0.6.4/src/uri.c
+--- libmms-0.6.4-orig/src/uri.c	2014-04-02 10:22:58 -0400
++++ libmms-0.6.4/src/uri.c	2015-01-02 13:07:13 -0500
+@@ -125,6 +125,29 @@
+ #define ISSPACE(C) (((C) >= 9 && (C) <= 13) || (C) == ' ')
+ 
+ 
++/* Implement the strndup function.
++   Copyright (C) 2005 Free Software Foundation, Inc.
++   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>. */
++#ifndef HAVE_STRNDUP
++char *
++strndup (const char *s, size_t n)
++{
++  char *result;
++  size_t len = strlen (s);
++
++  if (n < len)
++    len = n;
++
++  result = (char *) malloc (len + 1);
++  if (!result)
++    return 0;
++
++  result[len] = '\0';
++  return (char *) memcpy (result, s, len);
++}
++#endif
++
++
+ static int split_user_passwd(const char* in, char** user, char** passwd)
+ {
+   char *pass, *tmp = g_strdup(in);
diff --git a/contrib/win32/settings.ini b/contrib/win32/settings.ini
deleted file mode 100644
index 17e1139..0000000
--- a/contrib/win32/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-font-name = Segoe UI 9
-gtk-icon-theme-name=gnome