]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
Make sure that FFmpeg also uses the CC we want to use
[vlc] / extras / contrib / src / Makefile
index f894366673075ee745fa54fde2e3e421b159f366..bf1fe9574da4ae50b80164254556c350d443d063 100644 (file)
@@ -54,6 +54,7 @@ export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
 
 ifneq ($(CC),)
 HOSTCC+= CC="$(CC)"
+FFMPEGCONF += --cc=$(CC)
 endif
 ifneq ($(CXX),)
 HOSTCC+= CXX="$(CXX)"
@@ -84,14 +85,9 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
-# For ffmpeg if not cross compiling
-ifneq ($(CC),)
-  FFMPEGCONF=--cc="$(CC)"
-endif
+FFMPEGCONF=
 
-#
 # cross compiling
-#
 #This should be inside the if block but some config scripts are buggy
 HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix=""
 ifneq ($(BUILD),$(HOST))
@@ -101,7 +97,7 @@ ifneq ($(BUILD),$(HOST))
     #
     ifndef HAVE_CYGWIN
         # We are REALLY cross compiling
-        FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile
+        FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile
         X264CONF=--host=$(HOST)
         PTHREADSCONF="CROSS=$(HOST)-"
     else
@@ -114,7 +110,7 @@ endif
 # Special target-dependant options
 #
 ifdef HAVE_WIN32
-HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-dependency-tracking
+HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
 FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 --disable-debug
 endif
 
@@ -132,7 +128,7 @@ endif
 FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscale
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale
 endif
 
 ifdef HAVE_BEOS
@@ -143,16 +139,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
 endif
 
-ifdef NO_TEXT_RELOCATION
-FFMPEGCONF += --disable-mmx
-endif
-
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
-else
-FFMPEGCONF += --disable-altivec
 endif
 endif
 
@@ -259,17 +249,39 @@ CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
 DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
+# ***************************************************************************
+# gnumake
+# ***************************************************************************
+
+make-$(GNUMAKE_VERSION).tar.bz2:
+       $(WGET) $(GNUMAKE_URL)
+
+gnumake: make-$(GNUMAKE_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.gnumake: gnumake
+ifdef HAVE_DARWIN_OS
+ifndef HAVE_DARWIN_9
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+endif
+endif
+       touch $@
+
+CLEAN_FILE += .gnumake
+CLEAN_PKG += gnumake
+DISTCLEAN_PKG += make-$(GNUMAKE_VERSION).tar.bz2
+
 # ***************************************************************************
 # CMake
 # ***************************************************************************
-cmake-$(CMAKE_VERSION).tar.gz:
-#      $(WGET) $(CMAKE_URL)
-#      
-cmake: cmake-$(CMAKE_VERSION).tar.gz
-#      $(EXTRACT_GZ)
+cmake-$(CMAKE_VERSION).tar.gz:
+       $(WGET) $(CMAKE_URL)
+
+cmake: cmake-$(CMAKE_VERSION).tar.gz
+       $(EXTRACT_GZ)
        
-cmake: 
-       cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
+#cmake:
+#      cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
 .cmake: cmake
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
@@ -347,9 +359,10 @@ 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
-       (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
        touch $@
 
 CLEAN_FILE += .pkgcfg
@@ -445,19 +458,20 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        $(EXTRACT_GZ)
        patch -p0 < Patches/fontconfig.patch
        patch -p0 < Patches/fontconfig-nodocs.patch
+       (cd $@; autoreconf)
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
+       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 else
   ifdef HAVE_DARWIN_OS
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
+       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/usr/X11/var/cache/fontconfig --with-confdir=/usr/X11/lib/X11/fonts --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
   else
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
+       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 endif
        $(INSTALL_NAME)
@@ -476,7 +490,6 @@ freetype-$(FREETYPE2_VERSION).tar.gz:
 
 freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/freetype-cross.patch
 
 .freetype: freetype2
 ifdef HAVE_CYGWIN
@@ -501,9 +514,10 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/fribidi.patch
+       ( cd $@; rm -f configure; ./bootstrap)
 
 .fribidi: fribidi .iconv
-       (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -539,25 +553,25 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #      cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #      (cd $@; ./bootstrap)
 
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-       $(WGET) $(MPEG2DEC_URL)
+libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
+       $(WGET) $(LIBMPEG2_URL)
 
 # It is easier to use bootstrapped versions...
 #mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
 #      $(WGET) $(MPEG2DEC_SNAPSHOT)
 #      mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
-mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.mpeg2: mpeg2dec
+.mpeg2: libmpeg2
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
        touch $@
 
 CLEAN_FILE += .mpeg2
-CLEAN_PKG += mpeg2dec
+CLEAN_PKG += libmpeg2
 #DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
-DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
 # libid3tag
@@ -568,6 +582,7 @@ libid3tag-$(LIBID3TAG_VERSION).tar.gz:
 
 libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -d libid3tag -p0 < Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch
 
 .id3tag: libid3tag
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -698,12 +713,13 @@ libvorbis-$(VORBIS_VERSION).tar.gz:
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/libvorbis.patch
+       patch -d libvorbis -p0 < Patches/libvorbis-r14598-CVE-2008-1420.patch
+       patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1419.patch
+       patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1423.patch
        (cd $@; autoconf)
 
 .vorbis: libvorbis .ogg
-# FIXME: shared libs disabled for now because of linking errors
-#   -- titer 2005/09/16
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 #      $(INSTALL_NAME)
        touch $@
 
@@ -760,17 +776,22 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
        patch -p0 < Patches/theora.patch
+       patch -p0 < Patches/libtheora-includes.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/theora-doc.patch
+endif
        (cd $@; autoconf)
 
+THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
+ifdef HAVE_WIN32
+THEORACONF += --disable-docs
+endif
+
 .theora: libtheora .ogg
 ifdef HAVE_BEOS
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
 else
-  ifdef NO_TEXT_RELOCATION
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
-  else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
-  endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -931,7 +952,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 #endif
-
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
@@ -970,7 +990,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 #endif 
-
+       patch -p0 < ./Patches/libmatroska-kaxblock.patch
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
 endif
@@ -1050,19 +1070,21 @@ endif
 ifdef HAVE_BEOS
        (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
-ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_OS_ON_INTEL
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-       (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
-endif
-ifdef NO_TEXT_RELOCATION
-       (cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.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
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1073,6 +1095,11 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 endif
 
+FFMPEGCONF += --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale
+ifdef HAVE_WIN32
+FFMPEGCONF += --disable-bzlib
+endif
+
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
 else
@@ -1082,8 +1109,7 @@ else
 .ffmpeg: ffmpeg .faac .lame
 endif
 endif
-
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1132,11 +1158,33 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
 # ***************************************************************************
-.dvdread: .dvdnav
+# .dvdread: .dvdnav
+#      $(INSTALL_NAME)
+#      touch $@
+# 
+# CLEAN_FILE += .dvdread
+
+# ***************************************************************************
+# libdvdread: We use dvdnav's dvdread
+# ***************************************************************************
+
+
+libdvdread: 
+       $(SVN) co $(LIBDVDREAD_SVN)  libdvdread
+       (cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
+ifdef HAVE_WIN32
+       (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
+endif
+       (cd $@; sh autogen.sh noconfig)
+
+.libdvdread: libdvdread .dvdcss
+       (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
-CLEAN_FILE += .dvdread
+CLEAN_FILE += .libdvdread
+CLEAN_PKG += libdvdread
+#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 
 # ***************************************************************************
 # libdvdnav
@@ -1145,10 +1193,7 @@ CLEAN_FILE += .dvdread
 ifdef SVN
 libdvdnav:
        $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
-       patch -p0 < Patches/libdvdnav.patch
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libdvdnav-win32.patch
-endif
+       patch -d libdvdnav -p0 < Patches/libdvdnav.patch
        (cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
@@ -1163,11 +1208,11 @@ endif
        (cd $@; ./autogen.sh noconfig)
 endif
 
-.dvdnav: libdvdnav .dvdcss
+.dvdnav: libdvdnav .libdvdread
 ifdef HAVE_WIN32       
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -1205,6 +1250,7 @@ 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
 
 .live: live
 ifdef HAVE_WIN32  
@@ -1238,24 +1284,6 @@ CLEAN_FILE += .live
 CLEAN_PKG += live
 DISTCLEAN_PKG += live555-$(LIVEDOTCOM_VERSION).tar.gz
 
-# ***************************************************************************
-# goom
-# ***************************************************************************
-
-#goom-macosx-altivec-bin.tar.gz:
-#      $(WGET) $(GOOM_URL)
-
-#goom: goom-macosx-altivec-bin.tar.gz
-#      $(EXTRACT_GZ)
-
-#.goom: goom
-#      (cd $<;)
-#      touch $@
-
-#CLEAN_FILE += .goom
-#CLEAN_PKG += goom
-#DISTCLEAN_PKG += goom-macosx-altivec-bin.tar.gz
-
 # ***************************************************************************
 # goom2k4
 # ***************************************************************************
@@ -1374,7 +1402,7 @@ ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
        (cd $<; $(HOSTCC) RANLIB="ranlib" AR="ar" STRIP="strip" ./configure $(X264CONF) --prefix="$(PREFIX)" --extra-cflags="-I$(PREFIX)/include" --extra-ldflags="-L$(PREFIX)/lib" && make && make install)
   else
-       (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --disable-pthread && make && make install)
   endif
 else
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -1407,9 +1435,10 @@ libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
        $(EXTRACT_GZ)
-#ifdef HAVE_WIN32
+ifdef HAVE_WIN32
        patch -p0 < Patches/libmodplug-win32.patch
-#end
+       (cd $@; autoreconf)
+endif
 
 .mod: libmodplug
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
@@ -1509,6 +1538,7 @@ qt4-$(QT4_VERSION)-win32-bin.tar.bz2:
 
 qt4_win32: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
        $(EXTRACT_BZ2)
+       chmod -R 755 qt4_win32
 
 .qt4_win32: qt4_win32
        (cd qt4_win32;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib)
@@ -1567,7 +1597,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
-       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -sdk $(MACOSX_SDK) -no-framework && make && make install)
+       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework && make && make install)
        touch $@
 
 CLEAN_FILE += .qt4_mac
@@ -1625,22 +1655,17 @@ libxml2-$(XML_VERSION).tar.gz:
 
 xml: libxml2-$(XML_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/xml2-win32.patch
-       rm -f xml/aclocal.m4
-endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/xml2-uclibc.patch
 endif
 
+XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps --without-python
+
 .xml: xml
-ifdef HAVE_WIN32
-       (cd xml; aclocal && automake && autoreconf)
-endif
   ifdef HAVE_CYGWIN
-       (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps && make && make install)
+       (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install)
   else
-       (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps && make && make install)
+       (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install)
   endif
 ifndef HAVE_DARWIN_OS
        $(INSTALL_NAME)
@@ -1663,11 +1688,11 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz
 ifdef HAVE_BEOS
        patch -p0 < Patches/twolame-BeOS.patch
 endif
-
-.twolame: twolame
 ifdef HAVE_WIN32
        (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
 endif  
+
+.twolame: twolame
        (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
        $(INSTALL_NAME)
        touch $@
@@ -1725,6 +1750,9 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
 
 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
        $(EXTRACT_BZ2)
+ifdef HAVE_WIN32
+       (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf)
+endif
 
 ifdef HAVE_WIN32
 .zvbi: zvbi .pthreads
@@ -1732,9 +1760,13 @@ else
 .zvbi: zvbi
 endif
 ifdef HAVE_DARWIN_OS
-       (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
+else
+ifdef HAVE_WIN32
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
 else
-       (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
+endif
 endif
        $(INSTALL_NAME)
        touch $@
@@ -1766,7 +1798,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
 #endif
 
 .raw1394: libraw1394
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install)
 #      sed 's/^typedef u_int8_t  byte_t;/\/* typedef u_int8_t  byte_t;\*\//'
        touch $@
        
@@ -1799,7 +1831,7 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
 .dc1394: libdc1394
        (cd $<; ./configure --prefix=$(PREFIX) && \
         patch -p1 < ../Patches/libdc1394-noexamples.patch && \
-        make && make DESTDIR=$(PRFIX) install)
+        make && make DESTDIR=$(PREFIX) install)
        touch $@
        
 CLEAN_FILE += .dc1394
@@ -1843,7 +1875,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
+       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
 endif
@@ -1883,14 +1915,15 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
        patch -p0 < Patches/gnutls-win32.patch
-       (cd $@; cd lgl; ln -sf alloca_.h alloca.h; rm vasprintf.c; touch vasprintf.c; rm vasnprintf.c; touch vasnprintf.c) 
+       (cd $@; cd lgl; ln -sf alloca_.h alloca.h;)
+       (cd $@; autoconf)
 endif
 
-.gnutls: gnutls .opencdk .gcrypt .gpg-error 
+.gnutls: gnutls .gcrypt .gpg-error 
 ifdef HAVE_WIN32
-       (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls  && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -2139,12 +2172,12 @@ dirac-$(DIRAC_VERSION).tar.gz:
 
 dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 <Patches/dirac-cross.patch
+       patch -p1 -d dirac <Patches/dirac-cross.patch
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
        patch -p0 <Patches/dirac-cygwin.patch
 endif
-       (cd $@; aclocal && autoconf && automake)
+       (cd $@; aclocal -I m4 && autoconf && automake)
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2227,9 +2260,10 @@ clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/clinkcc_osx.patch
 endif
+       (cd $@; ./bootstrap)
 
 .clinkcc: clinkcc
-       (cd $<; ./bootstrap && ./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install )
+       (cd $<;./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install )
        touch $@
 
 CLEAN_FILE += .clinkcc
@@ -2254,6 +2288,26 @@ CLEAN_FILE += .yasm
 CLEAN_PKG += yasm
 DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
 
+# ***************************************************************************
+# kate
+# ***************************************************************************
+
+libkate-$(KATE_VERSION).tar.gz:
+       $(WGET) $(KATE_URL)
+
+libkate: libkate-$(KATE_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       (cd $@; autoconf)
+
+.kate: libkate .ogg
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .kate
+CLEAN_PKG += libkate
+DISTCLEAN_PKG += libkate-$(KATE_VERSION).tar.gz
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a
@@ -2266,25 +2320,6 @@ DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
 
 CLEAN_FILE += .aclocal
 
-# ***************************************************************************
-# UNICOWS (Unicode support for WINME/98/95)
-# ***************************************************************************
-
-libunicows-$(UNICOWS_VERSION).tar.gz:
-       $(WGET) $(UNICOWS_URL)
-       mv libunicows-$(UNICOWS_VERSION)-src.tar.gz $@ || true
-
-libunicows: libunicows-$(UNICOWS_VERSION).tar.gz
-       $(EXTRACT_GZ)
-
-.unicows: libunicows
-       (cd $</src; make -f makefile.mingw32 PATHSEP='/' $(HOSTCC) && cp -f ../lib/mingw32/libunicows.a $(PREFIX)/lib)
-       touch $@
-
-CLEAN_FILE += .unicows
-CLEAN_PKG += libunicows
-DISTCLEAN_PKG += libunicows-$(UNICOWS_VERSION).tar.gz
-
 # ***************************************************************************
 # TagLib read and editing of tags of popular audio formats
 # ***************************************************************************
@@ -2321,7 +2356,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
 
 .pthreads: pthreads
-       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a $(PREFIX)/lib/)
+       (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/)
        $(INSTALL_NAME)
        touch $@
 
@@ -2360,7 +2395,7 @@ asa: asa.git.tar.gz
 
 .asa: asa .fontconfig .pcre .iconv
        (cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-       (cd $</lib/import; make || (echo "Please copy a ./prepare file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
+       (cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
        (cd $<; make && make install)
        $(INSTALL_NAME)
        touch $@
@@ -2385,8 +2420,68 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
 
 CLEAN_FILE += .fluid
 CLEAN_PKG += fluidsynth
-DISTCLEAN_PKG += fluidsynth-$(NCURSES_VERSION).tar.gz
+DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
+
+# ***************************************************************************
+# liboil
+# ***************************************************************************
+
+liboil-$(OIL_VERSION).tar.gz:
+       $(WGET) $(OIL_URL)
+
+liboil: liboil-$(OIL_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       patch -d liboil -p1 < Patches/liboil-noshared.patch
+
+.liboil: liboil
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
+       touch $@
+
+CLEAN_FILE += .liboil
+CLEAN_PKG += liboil
+DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz
+
+# ***************************************************************************
+# Schroedinger library
+# ***************************************************************************
+
+schroedinger-$(SCHROED_VERSION).tar.gz:
+       $(WGET) $(SCHROED_URL)
+
+schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.schroedinger: schroedinger .liboil
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       touch $@
+
+CLEAN_FILE += .schroedinger
+CLEAN_PKG += schroedinger
+DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
+
+# ***************************************************************************
+# ASS library
+# ***************************************************************************
+
+libass-$(ASS_VERSION).tar.bz2:
+       $(WGET) $(ASS_URL)
+
+# mplayer patches up to August 8, 2008 are included
+libass: libass-$(ASS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+       patch -p0 < Patches/libass_mplayer_updates.patch
+ifneq ($(HOST),$(BUILD))
+       patch -p0 < Patches/libass-cross.patch
+       (cd $@; autoreconf; automake)
+endif
+
+.libass: libass .png
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       touch $@
 
+CLEAN_FILE += .libass
+CLEAN_PKG += libass
+DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 
 # ***************************************************************************
 # Some cleaning