]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
contrib: skip live555 patch on WinCE too
[vlc] / extras / contrib / src / Makefile
index 903e907361bc64fce8ebdfe472834d66145da065..0f6ea111c5b3e9e79004bde4d5b24ba58a7d437d 100644 (file)
@@ -115,7 +115,7 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack
+FFMPEGCONF+= --target-os=mingw32 --arch=x86 --enable-memalign-hack
 ifdef HAVE_WIN64
 FFMPEGCONF+= --cpu=athlon64 --arch=x86_64
 else
@@ -125,7 +125,7 @@ endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --arch=armv4l --cpu=armv4t --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+FFMPEGCONF+= --target-os=mingw32ce --arch=armv4l --cpu=armv4t --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 endif
 
 ifdef HAVE_UCLIBC
@@ -149,7 +149,11 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
+ifdef HAVE_DARWIN_32
+FFMPEGCONF += --cc=gcc-4.0
+else
 FFMPEGCONF += --cc=$(CC)
+endif
 FFMPEGCONF += --arch=$(ARCH)
 ifdef HAVE_DARWIN_64
 FFMPEGCONF += --cpu=core2
@@ -181,6 +185,8 @@ ifdef HAVE_ISA_THUMB
 NOTHUMB ?= -mno-thumb
 endif
 
+X264CONF+= --disable-avs-input --disable-lavf-input --disable-ffms-input --disable-mp4-output
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -351,8 +357,6 @@ pkg-config-$(PKGCFG_VERSION).tar.gz:
 
 pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
-       patch -d pkgconfig -p0 < Patches/pkgcfg.patch
        (cd $@; autoconf)
 
 .pkgcfg: pkgconfig
@@ -399,7 +403,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd ../include; sed -i.orig '311 c #if 0' libintl.h)
+       (cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -434,7 +438,7 @@ libiconv-snowleopard: libiconv-snowleopard.tar.bz2
 ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_10
 .iconv: libiconv-snowleopard
-       (cd libiconv-snowleopard && cp libiconv.* ../../lib/)
+       (cd libiconv-snowleopard && cp libiconv.* $(PREFIX)/lib/)
        touch $@
 else
 .iconv:
@@ -460,17 +464,18 @@ fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 
 fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        $(EXTRACT_GZ)
+       patch -p0 < Patches/fontconfig-march.patch
        patch -p0 < Patches/fontconfig-nodocs.patch
 ifdef HAVE_WIN32
        patch -p0 < Patches/fontconfig.patch
        patch -p0 < Patches/fontconfig-noxml2.patch
-endif
        (cd $@; autoreconf -ivf)
+endif
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<;  ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
        (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install)
   endif
@@ -845,19 +850,18 @@ endif
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 
 .flac: flac .ogg
-ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
-else
-ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+       cd $< && \
+       $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations $(FLAC_DISABLE_FLAGS)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
-endif
-else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
-endif
-endif
+       cd $< && \
+       $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS)
+endif
+       cd $</src && \
+       make -C libFLAC && \
+       echo 'Requires.private: ogg' >> libFLAC/flac.pc && \
+       make -C libFLAC install
+       cd $< && make -C include install
        $(INSTALL_NAME)
        touch $@
 
@@ -1023,7 +1027,11 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # ***************************************************************************
 
 ifdef SVN
-ffmpeg:
+ifdef HAVE_WIN32
+ffmpeg: .dshow_headers
+else
+ffmpeg: 
+endif
        $(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
@@ -1033,15 +1041,6 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
-       (cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
-endif
-ifdef NO_TEXT_RELOCATION
-       echo "Broken LD. Fix your tools."
-       exit -1
-endif
-       (cd $@; patch -p1 < ../Patches/eac3_spectral.patch)
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1061,12 +1060,17 @@ FFMPEGCONF += \
        --disable-ffplay \
        --disable-devices \
        --disable-protocols \
+       --disable-filters \
        --disable-network
+ifdef HAVE_WIN64
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs
+else
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=ac3 --enable-libmp3lame --enable-w32threads
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
 else
 FFMPEGCONFG += --enable-pthreads
 endif
+endif
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
@@ -1095,33 +1099,33 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz
 # libdvdcss
 # ***************************************************************************
 
-libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
+libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2:
        $(WGET) $(LIBDVDCSS_URL)
 
-ifdef SVN
-libdvdcss:
-       $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
-       cd $@ && sh bootstrap
-else
-libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
-       $(EXTRACT_GZ)
-endif
+ifdef SVN
+libdvdcss:
+#      $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+#      cd $@ && sh bootstrap
+else
+libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+endif
 
 .dvdcss: libdvdcss
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
-ifdef SVN
-libdvdcss-source: libdvdcss
-       tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
-
-SOURCE += libdvdcss-source
-endif
+ifdef SVN
+libdvdcss-source: libdvdcss
+#      tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
+#
+SOURCE += libdvdcss-source
+endif
 
 CLEAN_FILE += .dvdcss
 CLEAN_PKG += libdvdcss
-DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
+DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
@@ -1137,7 +1141,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 libdvdread:
        $(SVN) co $(LIBDVDREAD_SVN)  libdvdread
-       (cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
+       (cd $@; patch  -p 0 < ../Patches/libdvdread-dvdcss-static.patch)
 ifdef HAVE_WIN32
        (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
 endif
@@ -1178,7 +1182,7 @@ endif
 ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -1215,21 +1219,27 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/live-noapps.patch
        patch -p0 < Patches/live-uselocale.patch
+       patch -p0 < Patches/live-inet_ntop.patch
 ifdef HAVE_WIN64
        patch -p0 < Patches/live-win64.patch
 endif
+ifndef HAVE_WIN32
+ifndef HAVE_WINCE
+       patch -p0 < Patches/live-getaddrinfo.patch
+endif
+endif
 
 .live: live
 ifdef HAVE_WIN32
        (cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
 ifdef HAVE_WINCE
+       (cd $<; sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw)
        (cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
 ifdef HAVE_DARWIN_OS
-       (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%'  -e 's%c++%$(CXX)%' -i.orig  config.macosx)
+       (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%'  -e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
        (cd $<; ./genMakefiles macosx && make)
 else
        (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head)
@@ -1237,12 +1247,16 @@ ifdef HAVE_UCLIBC
 ifdef HAVE_BIGENDIAN
        (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
 endif
+else
+ifeq ($(ARCH)$(HAVE_MAEMO),armel)
+       (cd $<; ./genMakefiles armlinux && make $(HOSTCC))
 else
        (cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
 endif
+endif
 endif
        mkdir -p $(PREFIX)/lib $(PREFIX)/include
        cp $</groupsock/libgroupsock.a $(PREFIX)/lib
@@ -1346,7 +1360,6 @@ x264-$(X264_VERSION).tar.gz:
 ifdef GIT
 x264:
        $(GIT) clone git://git.videolan.org/x264.git
-       patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
@@ -1652,7 +1665,7 @@ ifdef HAVE_WIN32
 endif
 
 .twolame: twolame
-       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install)
+       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  cd libtwolame && make && make install && cd .. && make install-data)
        $(INSTALL_NAME)
        touch $@
 
@@ -1930,28 +1943,28 @@ DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 # Gecko SDK
 # ***************************************************************************
 
-gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz:
+xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2:
        $(WGET) $(GECKO_SDK_MAC_URL)
 
-gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
-       $(EXTRACT_GZ)
+gecko-sdk: xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2
+       $(EXTRACT_BZ2)
 
 .gecko: gecko-sdk
-       rm -rf ../gecko-sdk
-       mv gecko-sdk ..
+       rm -rf $(PREFIX)/gecko-sdk
+       mv gecko-sdk $(PREFIX)
        mkdir gecko-sdk #creating an empty dir is faster than copying the whole dir
        (cd $<)
        touch $@
 
 CLEAN_FILE += .gecko
 CLEAN_PKG += gecko-sdk
-DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+DISTCLEAN_PKG += xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2
 
 # ***************************************************************************
 # Gecko SDK win32
 # ***************************************************************************
 
-gecko-sdk-i586-pc-msvc-1.8b1.zip:
+xulrunner-1.9.2.en-US.win32.sdk.zip:
        $(WGET) $(GECKO_SDK_WIN32_URL)
 
 libIDL-0.6.3-win32-bin.zip:
@@ -1960,18 +1973,18 @@ libIDL-0.6.3-win32-bin.zip:
 glib-19990228.zip:
        $(WGET) $(GLIB_WIN32_BIN_URL)
 
-.gecko-win32: gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
-       unzip gecko-sdk-i586-pc-msvc-1.8b1.zip
-       rm -rf ../gecko-sdk
-       mv gecko-sdk ..
-       unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d ../gecko-sdk/bin
-       unzip glib-19990228.zip glib-1.2.dll -d ../gecko-sdk/bin
-       chmod a+x ../gecko-sdk/bin/*
+.gecko-win32: xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
+       unzip xulrunner-1.9.2.en-US.win32.sdk.zip
+       rm -rf $(PREFIX)/gecko-sdk
+       mv xulrunner-sdk $(PREFIX)/gecko-sdk
+       unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d $(PREFIX)/gecko-sdk/bin
+       unzip glib-19990228.zip glib-1.2.dll -d $(PREFIX)/gecko-sdk/bin
+       chmod a+x $(PREFIX)/gecko-sdk/bin/*
        touch $@
 
 CLEAN_FILE += .gecko-win32
 CLEAN_PKG += gecko-sdk-win32
-DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
+DISTCLEAN_PKG += xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
 
 # ***************************************************************************
 # mozilla-macosx
@@ -2007,10 +2020,10 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 jpegsrc.v$(JPEG_VERSION).tar.gz:
        $(WGET) $(JPEG_URL)
 
-jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
+jpeg-$(JPEG_VERSION): jpegsrc.v$(JPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.jpeg: jpeg-7
+.jpeg: jpeg-$(JPEG_VERSION)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
        $(RANLIB) $(PREFIX)/lib/libjpeg.a
        touch $@
@@ -2125,13 +2138,10 @@ dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
-       patch -p0 <Patches/dirac-cygwin.patch
+       patch -p0 < Patches/dirac-cygwin.patch
 endif
-ifndef HAVE_DARWIN_OS
-       (cd $@; aclocal -I m4 && autoconf && automake)
-else
+       patch -p0 < Patches/dirac-noutils.patch
        (cd $@; ./bootstrap)
-endif
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2162,7 +2172,7 @@ DISTCLEAN_PKG += dirac-$(DIRAC_VERSION).tar.gz
 win32-dx7headers.tgz:
        $(WGET) $(DX_HEADERS_URL)
 .dx_headers: win32-dx7headers.tgz
-       (cd ../include ; tar xzf ../src/$<)
+       tar xzf $< -C $(PREFIX)/include
        touch $@
 CLEAN_FILE += .dx_headers
 DISTCLEAN_PKG += win32-dx7headers.tgz
@@ -2177,8 +2187,8 @@ dxva2api.h:
        $(WGET) $(DXVA2_URL)
 
 .dshow_headers: dshow-headers.tgz dxva2api.h
-       (cd ../include ; tar xzf ../src/$<)
-       (cp dxva2api.h ../include)
+       tar xzf $< -C $(PREFIX)/include
+       cp dxva2api.h $(PREFIX)/include
        touch $@
 
 CLEAN_FILE += .dshow_headers
@@ -2293,7 +2303,7 @@ DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz
 # **************************************************************************
 
 .aclocal:
-       cp -R $(PREFIX)/share/aclocal/* $(PREFIX)/../../m4/
+       cp -R $(PREFIX)/share/aclocal/* ../../../m4/
        touch $@
 
 CLEAN_FILE += .aclocal
@@ -2333,6 +2343,7 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
 pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
        (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
+       (patch -p0 < Patches/pthreads-win64.patch)
 
 .pthreads: pthreads
        (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a *.dll $(PREFIX)/lib/)
@@ -2377,7 +2388,18 @@ ifdef HAVE_WIN32
 endif
 
 .fluid: fluidsynth
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-ladspa \
+               --disable-oss-support \
+               --disable-alsa-support \
+               --disable-midishare \
+               --disable-jack-support \
+               --disable-coreaudio \
+               --disable-lash \
+               --disable-ladcca \
+               --without-readline
+       cd $< && make
+       cd $< && make install
        touch $@
 
 CLEAN_FILE += .fluid
@@ -2420,9 +2442,11 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/schroedinger-notests.patch
+       (cd $@; autoreconf -iv)
 
 .schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gstreamer --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make -C schroedinger && make -C schroedinger install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger
@@ -2436,12 +2460,12 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
 
-libass:
-       $(GIT) clone $(ASS_GIT)
+libass: libass-$(ASS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        (cd $@; autoreconf -ivf)
 
 .libass: libass .freetype
-       (cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure --disable-png --disable-shared $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .libass
@@ -2458,8 +2482,8 @@ Sparkle-$(SPARKLE_VERSION).zip:
 .Sparkle: Sparkle-$(SPARKLE_VERSION).zip
        rm -rf $@ || true
        unzip $<
-       rm -rf ../Sparkle
-       mv Sparkle ..
+       rm -rf $(PREFIX)/Sparkle
+       mv Sparkle $(PREFIX)
        touch $@
 
 CLEAN_FILE += .Sparkle
@@ -2502,13 +2526,35 @@ ifdef HAVE_DARWIN_OS
 endif
 
 .gsm: gsm
-       (cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)
+       (cd $<; $(HOSTCC) make && mkdir -p $(PREFIX)/include/gsm && cp inc/gsm.h $(PREFIX)/include/gsm && cp lib/libgsm.a  $(PREFIX)/lib)
        touch $@
 
 CLEAN_FILE += .gsm
 CLEAN_PKG += gsm
 DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
 
+# ***************************************************************************
+### GLEW 
+# ***************************************************************************
+glew-$(GLEW_VERSION)-src.tgz:
+       $(WGET) $(GLEW_URL)
+
+glew: glew-$(GLEW_VERSION)-src.tgz
+       $(EXTRACT_GZ)
+       (patch -p0 < Patches/glew-win32.patch)
+
+.glew: glew
+       (cd $<; $(HOSTCC) CFLAGS="$(CFLAGS) -DGLEW_STATIC" make && $(HOSTCC) GLEW_DEST=$(PREFIX) make install)
+ifdef HAVE_WIN32
+       rm -rf $(PREFIX)/lib/libglew32.dll*
+endif
+       touch $@
+
+CLEAN_FILE += .glew
+CLEAN_PKG += glew
+DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz
+
+
 # ***************************************************************************
 # projectM
 # ***************************************************************************
@@ -2519,15 +2565,19 @@ libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
        rm -rf $@ || true
        gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
        mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true
+       patch -p0 < Patches/libprojectM-win32.patch
        cd $@; rm CMakeCache.txt
 
-.libprojectM: libprojectM
-       (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DUSE_FBO:STRING=FALSE -DUSE_FBO:BOOL=OFF -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
+.libprojectM: libprojectM .glew
+       (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
+ifdef HAVE_WIN32
+       (cd $<;cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib)
+endif
        touch $@
 
 CLEAN_FILE += .libprojectM
 CLEAN_PKG += libprojectM
-DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
 
 # ***************************************************************************
 # X11 C Bindings
@@ -2544,6 +2594,7 @@ libxcb: libxcb-$(XCB_VERSION).tar.bz2
 
 .xcb: libxcb
        cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-shared \
                --disable-composite \
                --disable-damage \
                --disable-dpms \
@@ -2567,6 +2618,8 @@ libxcb: libxcb-$(XCB_VERSION).tar.bz2
                --enable-xv \
                --disable-xvmc \
                --disable-build-docs
+       cd $< && make
+       cd $< && sed -i -e s,^Requires.private:,Requires:,g xcb.pc
        cd $< && make install
        touch $@