]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
Contribs: remove unneeded change of CFLAGS for win32
[vlc] / extras / contrib / src / Makefile
index 9d55274ff5f04d525645dcfc1db836c57aa4661d..ce4574d2090fa392aa61ef33bf69264168ef5efd 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
@@ -372,9 +376,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/gettext-win32.patch
-endif
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/gettext-macosx.patch
 endif
@@ -388,18 +389,18 @@ endif
 ifneq ($(HOST),$(BUILD))
   ifndef HAVE_CYGWIN
     # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
-       ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+       ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
   else
     # We are compiling for MinGW on Cygwin -- build the full current gettext
-       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
   endif
 else
 # Build and install the whole gettext
-       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
 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 '314 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -434,7 +435,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 +461,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
@@ -688,7 +690,7 @@ libogg-$(OGG_VERSION).tar.gz:
 
 libogg: libogg-$(OGG_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/ogg.patch
+       patch -p0 < Patches/libogg-inttypes.patch
        patch -p0 < Patches/libogg-1.1.patch
 ifdef HAVE_WINCE
        patch -p0 < Patches/libogg-wince.patch
@@ -845,19 +847,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 $@
 
@@ -905,6 +906,50 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+
+# ***************************************************************************
+# libvp8
+# ***************************************************************************
+
+#ibvpx-$(VPX_VERSION).tar.bz2:
+#$(WGET) $(VPX_URL)
+
+libvpx: 
+       $(GIT) clone git://review.webmproject.org/libvpx.git
+ifdef HAVE_DARWIN_OS
+       patch -p0 < Patches/libvpx-darwin.patch
+endif
+
+ifdef HAVE_WIN32
+VPX_TARGET=x86-win32-gcc
+CROSS=
+else
+ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_64
+VPX_TARGET=x86_64-darwin9-gcc
+else
+ifdef HAVE_DARWIN_OS_ON_INTEL
+VPX_TARGET=x86-darwin9-gcc
+else
+VPX_TARGET=ppc32-darwin9-gcc
+endif
+endif
+else
+VPX_TARGET=FIXME
+endif
+endif
+
+.libvpx: libvpx
+       (cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install)
+       (rm -rf $(PREFIX)/include/vpx/ && mkdir $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install?
+       rm $(PREFIX)/include/vpx/config.h
+       (cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
+       touch $@
+
+CLEAN_FILE += .libvpx
+CLEAN_PKG += libvpx
+#DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
+
 # ***************************************************************************
 # lame
 # ***************************************************************************
@@ -932,16 +977,10 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
-endif
-ifdef HAVE_WIN64
-       patch -p0 < Patches/libebml-win64.patch
-endif
 
 .ebml: libebml
 ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
 else
        (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libebml.a
@@ -961,16 +1000,12 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p0 < ./Patches/libmatroska-kaxblock.patch
-ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
-endif
 
 .matroska: libmatroska .ebml
 ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
 else
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libmatroska.a
 endif
        touch $@
@@ -1023,24 +1058,23 @@ 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_WIN64
+       (cd ffmpeg/libswscale; patch -p0 < ../../Patches/ffmpeg-win64.patch;)
+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
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1060,11 +1094,16 @@ 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 --enable-libvpx
 else
-FFMPEGCONFG += --enable-pthreads
+FFMPEGCONF += --enable-pthreads
+endif
 endif
 
 ifdef HAVE_WINCE
@@ -1073,10 +1112,10 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
-.ffmpeg: ffmpeg .lame .gsm
+.ffmpeg: ffmpeg .lame .gsm .libvpx
 endif
 endif
-       (cd $<; $(HOSTCC) ./configure --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) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1094,33 +1133,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
@@ -1136,7 +1175,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
@@ -1177,7 +1216,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 $@
@@ -1214,21 +1253,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)
@@ -1236,12 +1281,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
@@ -1269,7 +1318,7 @@ goom$(GOOM2k4_VERSION).tar.gz:
 goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
-       (cd $@; dos2unix configure.in)
+       (cd $@; fromdos configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 else
        patch -p0 < Patches/goom2k4-0-mmx.patch
@@ -1345,23 +1394,14 @@ 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
-
 else
+x264:
+       echo "x264 snapshot is too old, you MUST use Git !"
+       exit -1
 
-x264: x264-$(X264_VERSION).tar.gz
-       $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-  ifndef HAVE_CYGWIN
-       (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch)
-  endif
-else
-       patch -p0 < Patches/x264.patch
-       rm x264/x264.c
-endif
 endif
 
 ifdef HAVE_WIN32
@@ -1651,7 +1691,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 $@
 
@@ -1885,119 +1925,23 @@ CLEAN_FILE += .opendaap
 CLEAN_PKG += libopendaap
 DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
 
-# ***************************************************************************
-# glib
-# ***************************************************************************
-
-glib-$(GLIB_VERSION).tar.bz2:
-       $(WGET) $(GLIB_URL)
-
-glib: glib-$(GLIB_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-       (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
-ifdef HAVE_DARWIN_64
-       (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
-endif
-
-.glib: glib
-       (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)
-       touch $@
-
-CLEAN_FILE += .glib
-CLEAN_PKG += glib
-DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
-
-# ***************************************************************************
-# libIDL
-# ***************************************************************************
-
-libIDL-$(LIBIDL_VERSION).tar.bz2:
-       $(WGET) $(LIBIDL_URL)
-
-libIDL: libIDL-$(LIBIDL_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-
-.IDL: libIDL
-       (cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install )
-       touch $@
-
-CLEAN_FILE += .IDL
-CLEAN_PKG += libIDL
-DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
-
 # ***************************************************************************
 # Gecko SDK
 # ***************************************************************************
 
-gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz:
-       $(WGET) $(GECKO_SDK_MAC_URL)
-
-gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
-       $(EXTRACT_GZ)
+gecko-sdk:
+       $(SVN) co $(NPAPI_HEADERS_SVN_URL) -r $(NPAPI_HEADERS_SVN_REVISION) gecko-sdk/include
 
 .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
-
-# ***************************************************************************
-# Gecko SDK win32
-# ***************************************************************************
-
-gecko-sdk-i586-pc-msvc-1.8b1.zip:
-       $(WGET) $(GECKO_SDK_WIN32_URL)
-
-libIDL-0.6.3-win32-bin.zip:
-       $(WGET) $(LIBIDL_WIN32_BIN_URL)
-
-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/*
-       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
-
-# ***************************************************************************
-# mozilla-macosx
-#
-# Note that this dependency needs to be compiled against the 10.4u SDK using
-# using GCC-4.0. Using newer releases of one of these won't lead to a 
-# successful compilation! Adapt the respective variables in ../config.mak!
-# ***************************************************************************
-
-firefox-$(MOZILLA_VERSION)-source.tar.bz2:
-       $(WGET) $(MOZILLA_URL)
-
-mozilla: firefox-$(MOZILLA_VERSION)-source.tar.bz2
-       $(EXTRACT_BZ2)
-       (cd $@; patch -p0 < ../Patches/firefox-darwin.patch)
-
-.mozilla-macosx: mozilla .glib .IDL
-       ifneq($(SDK_TARGET),"10.4")
-       echo "Compiling the mozilla target requires the 10.4 SDK!"
-       exit -1
-       endif
-       (cd $<; ./configure --prefix=$(PREFIX)/gecko-sdk-new --enable-default-toolkit=cairo-cocoa --enable-standalone-modules=xpcom,plugin  --enable-application=xulrunner && make && make install)
-       touch $@
-
-CLEAN_FILE += .mozilla-macosx
-CLEAN_PKG += mozilla
-DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
+DISTCLEAN_PKG += gecko-sdk
 
 # ***************************************************************************
 # libjpeg
@@ -2006,10 +1950,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 $@
@@ -2124,13 +2068,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
 
@@ -2161,7 +2102,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
@@ -2176,8 +2117,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
@@ -2292,7 +2233,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
@@ -2314,7 +2255,7 @@ ifdef HAVE_CYGWIN
 endif
 
 .tag: taglib
-       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --enable-mp4 --enable-asf --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -2332,6 +2273,9 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
 pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
        (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
+ifdef HAVE_WIN64
+       (patch -p0 < Patches/pthreads-win64.patch)
+endif
 
 .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/)
@@ -2353,7 +2297,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
@@ -2375,7 +2320,20 @@ 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-pulse-support \
+               --disable-midishare \
+               --disable-jack-support \
+               --disable-coreaudio \
+               --disable-lash \
+               --disable-ladcca \
+               --disable-portaudio-support \
+               --without-readline
+       cd $< && make
+       cd $< && make install
        touch $@
 
 CLEAN_FILE += .fluid
@@ -2386,28 +2344,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
 # liboil
 # ***************************************************************************
 
-liboil-$(OIL_VERSION).tar.gz:
-       $(WGET) $(OIL_URL)
+orc-$(ORC_VERSION).tar.gz:
+       $(WGET) $(ORC_URL)
 
-liboil: liboil-$(OIL_VERSION).tar.gz
+orc: orc-$(ORC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -d liboil -p1 < Patches/liboil-noshared.patch
-       patch -d liboil -p1 < Patches/liboil-win64.patch
-       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
-       (cd $@; autoreconf)
 
-.liboil: liboil
+.orc: orc
 ifdef HAVE_DARWIN_OS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX))
 endif
        (cd $<; make && make install)
        touch $@
 
-CLEAN_FILE += .liboil
-CLEAN_PKG += liboil
-DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz
+CLEAN_FILE += .orc
+CLEAN_PKG += orc
+DISTCLEAN_PKG += orc-$(ORC_VERSION).tar.gz
 
 # ***************************************************************************
 # Schroedinger library
@@ -2418,9 +2372,17 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/schroedinger-notests.patch
+       (cd $@; autoreconf -iv)
+
+ifdef HAVE_WIN32
+ORCC="wine $(PREFIX)/bin/orcc.exe"
+else
+ORCC="orcc"
+endif
 
-.schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gstreamer --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make -C schroedinger && make -C schroedinger install)
+.schroedinger: schroedinger .orc
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make ORCC=$(ORCC) && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger
@@ -2434,12 +2396,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
@@ -2456,8 +2418,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
@@ -2500,35 +2462,58 @@ 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
 # ***************************************************************************
-ifdef SVN
-libprojectM:
-       $(SVN) co $(LIBPROJECTM_SVN) libprojectM
-       patch -d libprojectM -p0 < Patches/libprojectM-fpic.patch
-else
-libprojectM-$(LIBPROJECTM_VERSION).tar.bz2:
+libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
        $(WGET) $(LIBPROJECTM_URL)
 
-libprojectM: libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-endif
+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 $</src; $(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 -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
@@ -2545,6 +2530,7 @@ libxcb: libxcb-$(XCB_VERSION).tar.bz2
 
 .xcb: libxcb
        cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-shared \
                --disable-composite \
                --disable-damage \
                --disable-dpms \
@@ -2568,6 +2554,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 $@
 
@@ -2617,6 +2605,7 @@ regex: regex-$(REGEX_VERSION).tar.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
@@ -2633,6 +2622,7 @@ sqlite-$(SQLITE_VERSION): sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 
 .sqlite3: sqlite-$(SQLITE_VERSION)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install )
+       touch $@
 
 CLEAN_FILE += .sqlite3
 CLEAN_PKG += sqlite-$(SQLITE_VERSION)