Add libshout on win32

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8153e3b3a6ceb02f51c86d646ec7629f88374c4f..199a2fceb1f212a135ce6646d56fdcfdceb660c0 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -155,7 +155,7 @@ else
   ifdef HAVE_WIN32
 
    all: .iconv .intl .freetype .fribidi .zlib \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
@@ -682,9 +682,12 @@ libshout-$(SHOUT_VERSION).tar.gz:
 
 libshout: libshout-$(SHOUT_VERSION).tar.gz
        $(EXTRACT_GZ)
-
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libshout-win32.patch
+endif
+  
 .shout: libshout .theora .ogg
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd include make && make install && cd ../src && make && make install )
        $(INSTALL_NAME)
        touch $@
 

diff --git a/extras/contrib/src/Patches/libshout-win32.patch b/extras/contrib/src/Patches/libshout-win32.patch
new file mode 100644 (file)
index 0000000..ad8c3ac
--- /dev/null
+++ b/extras/contrib/src/Patches/libshout-win32.patch
@@ -0,0 +1,13 @@
+diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in
+--- libshout/include/shout/shout.h.in  2004-10-30 02:23:15.000000000 +0100
++++ libshout-new/include/shout/shout.h.in      2006-03-12 21:06:13.000000000 +0000
+@@ -22,9 +22,6 @@
+ #define __LIBSHOUT_SHOUT_H__
+ 
+ #include <sys/types.h>
+-#ifdef WIN32
+-#include <os.h>
+-#endif
+ 
+ #define SHOUTERR_SUCCESS      (0)
+ #define SHOUTERR_INSANE               (-1)