]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
contribs: fixed fontconfig cross-compilation on Darwin
[vlc] / extras / contrib / src / Makefile
index 5c318e524e14dc812267e6e458c1a5dd6509f164..bfe6c0a8add826c2e8517010c9d9b58d6c030102 100644 (file)
@@ -115,17 +115,17 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
+FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack
 ifdef HAVE_WIN64
 FFMPEGCONF+= --cpu=athlon64 --arch=x86_64
 else
-FFMPEGCONF+= --cpu=i686 --arch=x86_32
+FFMPEGCONF+= --cpu=i686
 endif
 endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --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+= --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
@@ -137,8 +137,10 @@ endif
 FFMPEGCONF+= --enable-small --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
+ifndef HAVE_WINCE
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
+endif
 
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack
@@ -147,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
@@ -171,6 +177,7 @@ endif
 # Installing statically-linked VLC plugins is so much simpler.
 HOSTCONF += --with-pic --disable-shared
 endif
+FFMPEGCONF += --enable-pic
 X264CONF += --enable-pic
 endif
 
@@ -178,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`
 
 # ***************************************************************************
@@ -226,6 +235,22 @@ endef
 #      $(INSTALL_NAME)
 #      touch $@
 
+# ***************************************************************************
+# errno
+# ***************************************************************************
+
+errno:
+       mkdir -p $@
+       $(WGET) $(ERRNO_URL)/errno.h -O $@/errno.h
+
+.errno: errno
+       mkdir -p $(PREFIX)/include
+       cp $</errno.h $(PREFIX)/include
+       touch $@
+
+CLEAN_FILE += .errno
+CLEAN_PKG += errno
+
 # ***************************************************************************
 # autoconf
 # ***************************************************************************
@@ -275,9 +300,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
 cmake: cmake-$(CMAKE_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-#cmake:
-#      cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
-
 .cmake: cmake
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
        touch $@
@@ -335,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
@@ -383,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 $@
@@ -404,6 +424,10 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 ifdef HAVE_WIN64
        patch -p0 < Patches/libiconv-win64.patch
 endif
+ifdef HAVE_WINCE
+       patch -p0 < Patches/libiconv-wince.patch
+       patch -p0 < Patches/libiconv-wince-hack.patch
+endif
 
 libiconv-snowleopard.tar.bz2:
        $(WGET) $(LIBICONVMAC_URL)
@@ -412,9 +436,9 @@ libiconv-snowleopard: libiconv-snowleopard.tar.bz2
        $(EXTRACT_BZ2)
 
 ifdef HAVE_DARWIN_OS
-ifdef HAVE_DARWIN_64
+ifdef HAVE_DARWIN_10
 .iconv: libiconv-snowleopard
-       (cd libiconv-snowleopard && cp libiconv.* ../../lib/)
+       (cd libiconv-snowleopard && cp libiconv.* $(PREFIX)/lib/)
        touch $@
 else
 .iconv:
@@ -440,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
@@ -479,11 +504,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .freetype: freetype2
-ifdef HAVE_CYGWIN
-       (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
-else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
-endif
        $(INSTALL_NAME)
        touch $@
 
@@ -521,6 +542,9 @@ a52dec-$(A52DEC_VERSION).tar.gz:
 
 a52dec: a52dec-$(A52DEC_VERSION).tar.gz
        $(EXTRACT_GZ)
+ifeq ($(ARCH),armel)
+       (cd $@ ; patch -p0 < ../Patches/liba52-fixed.diff)
+endif
 
 .a52: a52dec
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd liba52 && make && make install && cd ../include && make && make install)
@@ -539,6 +563,9 @@ libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
 
 libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/libmpeg2-arm-pld.patch
+       cd libmpeg2 && patch -p0 < ../Patches/libmpeg2-mc-neon.patch
+       cd libmpeg2 && ./bootstrap
 
 .mpeg2: libmpeg2
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
@@ -691,6 +718,7 @@ libvorbis-$(VORBIS_VERSION).tar.gz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/vorbis-noapps.patch
 
 .vorbis: libvorbis .ogg
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -731,7 +759,7 @@ endif
 
 ifdef SVN
 tremor-source: tremor
-       tar cfvz tremor-$(DATE).tar.gz tremor
+       tar cv --exclude=.svn tremor | bzip2 > tremor-$(DATE).tar.bz2
 
 SOURCE += tremor-source
 endif
@@ -749,24 +777,9 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifndef HAVE_DARWIN_OS
-       patch -p0 < Patches/theora.patch
-else
-ifdef HAVE_DARWIN_OS_ON_INTEL
-       patch -p0 < Patches/theora_mac_intel32.patch
-else
-       patch -p0 < Patches/theora_mac_ppc.patch
-endif
-endif
        patch -p0 < Patches/libtheora-includes.patch
-ifdef HAVE_WIN32
-       patch -p0 < Patches/theora-doc.patch
-endif
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
-ifdef HAVE_WIN32
-THEORACONF += --disable-docs
-endif
 
 ifdef HAVE_DARWIN_64
 THEORACONF += --disable-asm
@@ -776,7 +789,19 @@ THEORACONF += --disable-asm
 endif
 
 .theora: libtheora .ogg
-       (cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
+ifdef HAVE_DARWIN_OS
+       cd $<; ($(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
+else
+ifdef HAVE_WIN32
+       cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)
+endif
+       if test ! -f $</config.status; then \
+               cd $< ; \
+               $(HOSTCC) ./configure $(HOSTCONF) \
+                       --prefix=$(PREFIX) $(THEORACONF) ; \
+       fi
+       cd $< && make && make install
+endif
        $(INSTALL_NAME)
        touch $@
 
@@ -874,10 +899,11 @@ faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz
        $(EXTRACT_GZ)
-       (cd $@; echo|$(HOSTCC) -iquote . -E - || sed -i 's/-iquote /-I/' libfaad/Makefile.am; sh ./bootstrap)
+       (cd $@; echo|$(CC) -iquote . -E - || sed -i 's/-iquote /-I/' libfaad/Makefile.am; sh ./bootstrap)
+       patch -p0 < Patches/faad-arm-fixed.patch
 
 .faad: faad2
-       (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
+       (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3 $(NOTHUMB)" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
        touch $@
 
 CLEAN_FILE += .faad
@@ -1002,32 +1028,19 @@ 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
 endif
-ifdef HAVE_WINCE
-       patch -p1 < Patches/ffmpeg-svn-wince.patch
-endif
-ifdef HAVE_DARWIN_OS
-ifdef HAVE_DARWIN_OS_ON_INTEL
-       (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-else
-       (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
-endif
-endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        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)
-endif
-ifdef NO_TEXT_RELOCATION
-       echo "Broken LD. Fix your tools."
-       exit -1
 endif
        (cd $@; patch -p1 < ../Patches/eac3_spectral.patch)
 else
@@ -1049,9 +1062,12 @@ FFMPEGCONF += \
        --disable-ffplay \
        --disable-devices \
        --disable-protocols \
+       --disable-filters \
        --disable-network
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
+else
+FFMPEGCONFG += --enable-pthreads
 endif
 
 ifdef HAVE_WINCE
@@ -1063,12 +1079,12 @@ else
 .ffmpeg: ffmpeg .lame .gsm
 endif
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
 ffmpeg-source: ffmpeg
-       tar cfvz ffmpeg-$(DATE).tar.gz ffmpeg
+       tar cv --exclude=.svn ffmpeg | bzip2 > ffmpeg-$(DATE).tar.bz2
 
 SOURCE += ffmpeg-source
 endif
@@ -1100,7 +1116,7 @@ endif
 
 ifdef SVN
 libdvdcss-source: libdvdcss
-       tar cfvz libdvdcss-$(DATE).tar.gz libdvdcss
+       tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
 
 SOURCE += libdvdcss-source
 endif
@@ -1121,11 +1137,9 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 # libdvdread: We use dvdnav's dvdread
 # ***************************************************************************
-
-
 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
@@ -1203,7 +1217,6 @@ 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
 ifdef HAVE_WIN64
        patch -p0 < Patches/live-win64.patch
@@ -1213,8 +1226,12 @@ endif
 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)
@@ -1227,6 +1244,7 @@ else
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
+endif
 endif
        mkdir -p $(PREFIX)/lib $(PREFIX)/include
        cp $</groupsock/libgroupsock.a $(PREFIX)/lib
@@ -1280,10 +1298,8 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/libcaca-static.patch
 ifdef HAVE_DARWIN_OS
-       #remove me at next libcaca upgrade
-       patch -p0 < Patches/libcaca_driver_cocoa.diff
-       patch -p0 < Patches/libcaca_macosx.diff
        patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
        (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
@@ -1336,9 +1352,6 @@ x264:
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
-ifdef HAVE_DARWIN_OS
-       (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
-endif
 
 else
 
@@ -1372,9 +1385,10 @@ endif
 endif
        touch $@
 
-ifdef SVN
+ifdef GIT
 x264-source: x264
-       tar cfvz x264-$(DATE).tar.gz x264
+       cd x264 && \
+       git archive --format=tar HEAD | bzip2 > ../x264-$(DATE).tar.bz2
 
 SOURCE += x264-source
 endif
@@ -1414,9 +1428,19 @@ libcddb-$(CDDB_VERSION).tar.bz2:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.bz2
        $(EXTRACT_BZ2)
+       (cd $@; patch -p0 < ../Patches/libcddb-cross.patch )
+ifdef HAVE_WIN32
+       (cd $@; patch -p0 < ../Patches/libcddb-win32.patch )
+endif
+       (cd $@; autoreconf -fisv)
 
+ifdef HAVE_WIN32
+.cddb: libcddb .regex
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
+else
 .cddb: libcddb
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
+endif
        touch $@
 
 CLEAN_FILE += .cddb
@@ -1915,8 +1939,8 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
        $(EXTRACT_GZ)
 
 .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 $@
@@ -1940,11 +1964,11 @@ glib-19990228.zip:
 
 .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/*
+       rm -rf $(PREFIX)/gecko-sdk
+       mv gecko-sdk $(PREFIX)
+       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
@@ -2103,13 +2127,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
 
@@ -2140,7 +2161,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
@@ -2150,11 +2171,17 @@ DISTCLEAN_PKG += win32-dx7headers.tgz
 # *************************************************************************
 dshow-headers.tgz:
        $(WGET) $(DSHOW_HEADERS_URL)
-.dshow_headers: dshow-headers.tgz
-       (cd ../include ; tar xzf ../src/$<)
+
+dxva2api.h:
+       $(WGET) $(DXVA2_URL)
+
+.dshow_headers: dshow-headers.tgz dxva2api.h
+       tar xzf $< -C $(PREFIX)/include
+       cp dxva2api.h $(PREFIX)/include
        touch $@
+
 CLEAN_FILE += .dshow_headers
-DISTCLEAN_PKG += dshow-headers.tgz
+DISTCLEAN_PKG += dshow-headers.tgz dxva2api.h
 
 # ***************************************************************************
 # libexpat
@@ -2265,7 +2292,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
@@ -2326,7 +2353,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .ncurses: ncurses
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-debug --enable-widec --without-develop --without-shared && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=/usr --without-debug --enable-widec --without-develop --without-shared && make -C ncurses && make -C include && make -C ncurses DESTDIR=$(PREFIX) install && make -C include DESTDIR=$(PREFIX) install)
+       (cp -R $(PREFIX)/usr/* $(PREFIX) && rm -rf $(PREFIX)/usr)
        touch $@
 
 CLEAN_FILE += .ncurses
@@ -2369,8 +2397,6 @@ liboil: liboil-$(OIL_VERSION).tar.gz
        patch -d liboil -p1 < Patches/liboil-Xcompile.patch
        (cd $@; autoreconf)
 
-
-
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
@@ -2393,9 +2419,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
@@ -2403,7 +2431,7 @@ CLEAN_PKG += schroedinger
 DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 
 # ***************************************************************************
-# ASS library
+# libass
 # ***************************************************************************
 
 libass-$(ASS_VERSION).tar.bz2:
@@ -2413,7 +2441,7 @@ libass:
        $(GIT) clone $(ASS_GIT)
        (cd $@; autoreconf -ivf)
 
-.libass: libass
+.libass: libass .freetype
        (cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
@@ -2425,19 +2453,14 @@ DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 # Sparkle
 # ***************************************************************************
 
-"Sparkle-$(SPARKLE_VERSION).zip":
+Sparkle-$(SPARKLE_VERSION).zip:
        $(WGET) $(SPARKLE_URL)
 
-Sparkle: "Sparkle-$(SPARKLE_VERSION).zip"
+.Sparkle: Sparkle-$(SPARKLE_VERSION).zip
        rm -rf $@ || true
        unzip $<
-       touch $@
-
-.Sparkle: Sparkle
        rm -rf ../Sparkle
        mv Sparkle ..
-       mkdir Sparkle
-       (cd $<)
        touch $@
 
 CLEAN_FILE += .Sparkle
@@ -2462,9 +2485,9 @@ CLEAN_FILE += .libupnp
 CLEAN_PKG += libupnp
 DISTCLEAN_PKG += libupnp-$(UPNP_VERSION).tar.bz2
 
-# *********
+# ***************************************************************************
 # GSM
-# *********
+# ***************************************************************************
 gsm-$(GSM_VERSION).tar.gz:
        $(WGET) $(GSM_URL)
 
@@ -2487,6 +2510,161 @@ 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
+# ***************************************************************************
+libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
+       $(WGET) $(LIBPROJECTM_URL)
+
+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 .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)-Source.tar.gz
+
+# ***************************************************************************
+# X11 C Bindings
+# ***************************************************************************
+
+libxcb-$(XCB_VERSION).tar.bz2:
+       $(WGET) $(XCB_URL)/$@
+
+libxcb: libxcb-$(XCB_VERSION).tar.bz2
+       -rm -rf $@
+       bzcat $< | tar xf -
+       mv libxcb-$(XCB_VERSION) $@
+       touch $@
+
+.xcb: libxcb
+       cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-composite \
+               --disable-damage \
+               --disable-dpms \
+               --disable-glx \
+               --enable-randr \
+               --disable-record \
+               --enable-render \
+               --disable-resource \
+               --disable-screensaver \
+               --disable-shape \
+               --enable-shm \
+               --disable-sync \
+               --disable-xevie \
+               --disable-xfixes \
+               --disable-xfree86-dri \
+               --disable-xinerama \
+               --disable-xinput \
+               --disable-xprint \
+               --disable-selinux \
+               --disable-xtest \
+               --enable-xv \
+               --disable-xvmc \
+               --disable-build-docs
+       cd $< && make install
+       touch $@
+
+xcb-util-$(XCB_UTIL_VERSION).tar.bz2:
+       $(WGET) $(XCB_UTIL_URL)/$@
+
+xcb-util: xcb-util-$(XCB_UTIL_VERSION).tar.bz2
+       -rm -rf $@
+       bzcat $< | tar xf -
+       mv xcb-util-$(XCB_UTIL_VERSION) $@
+       touch $@
+
+.xcb-util: xcb-util .xcb
+       cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)
+       cd $< && make install
+       touch $@
+
+CLEAN_FILE += .xcb-util .xcb
+CLEAN_PKG += xcb-util xcb
+DISTCLEAN_PKG += xcb-util-$(XCB_UTIL_VERSION).tar.bz2 libxcb-$(XCB_VERSION).tar.bz2
+
+# ***************************************************************************
+# Peflags utility (Windows only)
+# ***************************************************************************
+
+peflags/peflags.c:
+       mkdir -p peflags
+       cd peflags && $(WGET) $(PEFLAGS_URL)/peflags.c
+
+.peflags: peflags/peflags.c
+       cd peflags && gcc peflags.c -o peflags
+       install -d $(PREFIX)/bin
+       cd peflags && install ./peflags $(PREFIX)/bin
+       touch $@
+
+CLEAN_PKG += peflags
+CLEAN_FILE += .peflags
+
+# ***************************************************************************
+# Regex
+# ***************************************************************************
+regex-$(REGEX_VERSION).tar.gz:
+       $(WGET) $(REGEX_URL)
+
+regex: regex-$(REGEX_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.regex: regex
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make subirs= && $(AR) ru libregex.a regex.o && $(RANLIB) libregex.a && cp -v regex.h $(PREFIX)/include && cp -v libregex.a $(PREFIX)/lib )
+       touch $@
+
+CLEAN_FILE += .regex
+CLEAN_PKG += regex
+DISTCLEAN_PKG += regex-$(REGEX_VERSION).tar.gz
+
+# ***************************************************************************
+# SQLite
+# ***************************************************************************
+sqlite-amalgamation-$(SQLITE_VERSION).tar.gz:
+       $(WGET) $(SQLITE_URL)
+
+sqlite-$(SQLITE_VERSION): sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.sqlite3: sqlite-$(SQLITE_VERSION)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install )
+       touch $@
+
+CLEAN_FILE += .sqlite3
+CLEAN_PKG += sqlite-$(SQLITE_VERSION)
+DISTCLEAN_PKG += sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 
 
 # ***************************************************************************