]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
contrib/src/Makefile: Checkout CMake project into 'cmake' subdirectory, set up code...
[vlc] / extras / contrib / src / Makefile
index c986979d7a9478872e52a34591f19cfc032d0efc..6c1776b477726ec85802a509e91c23488106c1ee 100644 (file)
@@ -38,10 +38,6 @@ include ./packages.mak
 export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH)
 export PKG_CONFIG_PATH
 export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig
-export DYLD_LIBRARY_PATH = $(PREFIX)/lib
-# following is required for configure scripts that check dyld libraries
-# by building and running a test app 
-export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(PREFIX)/vlc-lib
 export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET)
 export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH)
 export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
@@ -133,7 +129,7 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --enable-pthreads --disable-debug --disable-encoders --disable-muxers --disable-demuxers --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=image2 --enable-demuxer=image2pipe --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=ac3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-decoder=nellymoser --disable-protocols 
+FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler
@@ -147,6 +143,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
@@ -155,7 +155,7 @@ endif
 endif
 
 ifdef HAVE_AMR
-FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb
+FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
 endif
 
 DATE=`date +%Y-%m-%d`
@@ -206,38 +206,6 @@ endef
 #      $(INSTALL_NAME)
 #      touch $@
 
-ifdef HAVE_DARWIN_OS
-# the original libtoto.dylib is copied from contrib/lib to vlc-lib as
-# vlc_libtoto.dylib. a soft link to this library is created in contrib/lib
-# using the orginal dylib name. if libtoto.la also exists, the library named
-# in dlname is also changed to a soft-link to vlc-lib in order to support
-# libtool. to satisfy VLC.app dyld search, vlc_libtoto.dylib dyld id is changed
-# to @executable_path/lib/vlc_libtoto.dylib 
-
-define INSTALL_NAME
-       if which install_name_tool >/dev/null; then \
-               mkdir -p $(PREFIX)/vlc-lib ; \
-               libname='lib$(patsubst .%,%,$@)' ; \
-               dlname="$$libname.dylib" ; \
-               cp $(PREFIX)/lib/$$dlname \
-                       $(PREFIX)/vlc-lib/vlc_$$dlname ; \
-               rm $(PREFIX)/lib/$$dlname ; \
-               ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-                       $(PREFIX)/lib/$$dlname ; \
-               if [ -f $(PREFIX)/lib/$$libname.la ]; then \
-                       eval ltname=`sed -n 's/dlname=//p' $(PREFIX)/lib/$$libname.la`; \
-                       rm $(PREFIX)/lib/$$ltname ; \
-                       ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-                               $(PREFIX)/lib/$$ltname ; \
-               fi ; \
-               install_name_tool \
-                       -id @executable_path/lib/vlc_$$dlname \
-                       $(PREFIX)/vlc-lib/vlc_$$dlname ; \
-       fi
-endef
-
-endif
-
 ifeq ($(HOST),i586-pc-beos)
 # We test if the file actually exists, as sometimes (but not always)
 # libtool won't accept to build the shared library
@@ -289,6 +257,25 @@ CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
 DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
+# ***************************************************************************
+# CMake
+# ***************************************************************************
+# 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: cmake
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .cmake
+CLEAN_PKG += cmake
+
 # ***************************************************************************
 # libtool
 # ***************************************************************************
@@ -376,9 +363,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/gettext-macosx.patch 
-endif
 ifdef HAVE_WIN32
        patch -p0 < Patches/gettext-win32.patch
 endif
@@ -511,13 +495,7 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/fribidi.patch.real
-ifdef HAVE_WIN32
-       patch -p0 <Patches/fribidi-win32.patch
-endif
-ifdef HAVE_UCLIBC
-       patch -p0 < Patches/fribidi-uclibc.patch
-endif
+       patch -p0 < Patches/fribidi.patch
 
 .fribidi: fribidi .iconv
        (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
@@ -660,12 +638,6 @@ DISTCLEAN_PKG += libmad-$(LIBMAD_VERSION).tar.gz
 # ogg
 # ***************************************************************************
 
-#ogg:
-#      @echo "*** Please type \"anoncvs\" here : ***"
-#      cvs -d $(OGG_CVSROOT) login
-#      cvs -d $(OGG_CVSROOT) co ogg
-#      (cd $@; ./autogen.sh)
-
 libogg-$(OGG_VERSION).tar.gz:
        $(WGET) $(OGG_URL)
 
@@ -696,7 +668,6 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 #      cvs -d $(OGG_CVSROOT) login
 #      cvs -d $(OGG_CVSROOT) co vorbis
 #      (cd $@; ./autogen.sh)
-#      patch -p0 < Patches/vorbis.patch
 
 libvorbis-$(VORBIS_VERSION).tar.gz:
        $(WGET) $(VORBIS_URL)
@@ -727,7 +698,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
 
 ifdef SVN
 tremor: 
-       $(SVN) export http://svn.xiph.org/trunk/Tremor tremor
+       $(SVN) co http://svn.xiph.org/trunk/Tremor tremor
        (cd $@ && patch -p0 < ../Patches/tremor.patch)
        (cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
 else
@@ -772,7 +743,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifdef HAVE_BEOS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
 else
-  ifdef HAVE_DARWIN_9
+  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)
@@ -871,13 +842,6 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 # faad2
 # ***************************************************************************
 
-#faad2:
-#      @echo "*** Please type return here : ***"
-#      cvs -d $(FAAD2_CVSROOT) login
-#      cvs -d $(FAAD2_CVSROOT) co faad2
-#      (cd $@; patch -p1 < ../Patches/faad2.patch)
-#      (cd $@; sh ./bootstrap)
-
 faad2-$(FAAD2_VERSION).tar.gz:
        $(WGET) $(FAAD2_URL)
 
@@ -939,7 +903,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #ifdef SVN
 #libebml:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
 #else
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -978,7 +942,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #if SVN
 #libmatroska:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
 #else
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -1053,9 +1017,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-       $(SVN) export $(FFMPEG_SVN)  ffmpeg
-       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \
-        patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
+       $(SVN) co $(FFMPEG_SVN) ffmpeg
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1068,6 +1030,9 @@ endif
 ifdef HAVE_DARWIN_OS
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
+ifdef NO_TEXT_RELOCATION
+       (cd $@; patch -p0 < ../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
@@ -1093,7 +1058,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-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1116,7 +1081,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
 
 ifdef SVN
 libdvdcss: 
-       $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+       $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
        cd $@ && sh bootstrap
 else
 libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
@@ -1144,9 +1109,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 .dvdread: .dvdnav
        $(INSTALL_NAME)
-ifdef HAVE_DARWIN_OS
-       install_name_tool -change $(PREFIX)/lib/libdvdread.4.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib
-endif
        touch $@
 
 CLEAN_FILE += .dvdread
@@ -1157,16 +1119,22 @@ CLEAN_FILE += .dvdread
 
 ifdef SVN
 libdvdnav:
-       $(SVN) export $(LIBDVDNAV_SVN)  libdvdnav
+       $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 else
-libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
        $(WGET) $(LIBDVDNAV_URL)
 
-libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+       $(EXTRACT_GZ)
        patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
 endif
 
@@ -1211,26 +1179,12 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/live.patch
-ifdef HAVE_WIN32 
-       patch -p0 < Patches/livedotcom-win32.patch
-endif
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/live-osx.patch
-endif
-       patch -p0 < Patches/live-starttime.patch
-       (cd live/liveMedia/include; \
-               mv liveMedia_version.hh liveMedia_version.hh.bak; \
-       sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT         9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh )
-       patch -Np0 < Patches/live-config.patch
-ifdef HAVE_UCLIBC
        patch -p0 < Patches/live-noapps.patch
-endif
 
 .live: live
-ifdef HAVE_WIN32 
-       (cd $<;./genMakefiles mingw && make $(HOSTCC))
-else
+ifdef HAVE_WIN32  
+       (cd $<;./genMakefiles mingw && make $(HOSTCC)) 
+else 
 ifdef HAVE_DARWIN_OS
        (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
        (cd $<; ./genMakefiles macosx && make)
@@ -1245,6 +1199,14 @@ else
 endif
 endif
 endif
+       cp $</groupsock/libgroupsock.a $(PREFIX)/lib
+       cp $</liveMedia/libliveMedia.a $(PREFIX)/lib
+       cp $</UsageEnvironment/libUsageEnvironment.a $(PREFIX)/lib
+       cp $</BasicUsageEnvironment/libBasicUsageEnvironment.a $(PREFIX)/lib
+       cp $</groupsock/include/*.hh $</groupsock/include/*.h $(PREFIX)/include
+       cp $</liveMedia/include/*.hh $(PREFIX)/include
+       cp $</UsageEnvironment/include/*.hh $(PREFIX)/include
+       cp $</BasicUsageEnvironment/include/*.hh $(PREFIX)/include
        touch $@
 
 CLEAN_FILE += .live
@@ -1281,12 +1243,12 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/goom.patch
+       patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 endif
-       patch -p0 < Patches/goom2k4-0-mmx.patch
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -1309,12 +1271,20 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
        $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+       #remove me at next libcaca upgrade
+       patch -p0 < Patches/caca_driver_cocoa.diff
+       patch -p0 < Patches/caca_macosx.diff
+ifndef HAVE_DARWIN_OS_ON_INTEL
+       patch -p0 < Patches/caca-osx-ppc.patch
+endif
+endif
 
 .caca: libcaca
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
 endif
        touch $@
 
@@ -1350,10 +1320,14 @@ x264-$(X264_VERSION).tar.gz:
 
 ifdef SVN
 x264: 
-       $(SVN) export svn://svn.videolan.org/x264/trunk/ x264
+       $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
+       patch -p0 < Patches/x264-svn-info-threads.patch
 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
 
 x264: x264-$(X264_VERSION).tar.gz
@@ -1480,7 +1454,6 @@ wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
 wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
        $(EXTRACT_GZ)
        (cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch)
-#      (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
        (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
@@ -1495,13 +1468,13 @@ DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 # qt4 (win32 binary)
 # ***************************************************************************
 
-qt4-$(QT4_VERSION)-win32-bin.tar.gz:
+qt4-$(QT4_VERSION)-win32-bin.tar.bz2:
        $(WGET) $(QT4_URL)
 
-qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
-       $(EXTRACT_GZ)
+qt4_win32: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
+       $(EXTRACT_BZ2)
 
-.qt4: qt4
+.qt4_win32: qt4_win32
        (cd qt4;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)
 ifeq ($(BUILD),i686-pc-cygwin)
        (cd qt4;cp bin/*.exe $(PREFIX)/bin)
@@ -1510,8 +1483,8 @@ else
 endif
        touch $@
 
-CLEAN_FILE += .qt4
-CLEAN_PKG += qt4
+CLEAN_FILE += .qt4_win32
+CLEAN_PKG += qt4_win32
 DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 
 # ***************************************************************************
@@ -1521,7 +1494,7 @@ DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 qt-win-opensource-$(QT4T_VERSION)-mingw.exe:
        wget $(QT4T_URL)
 
-Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
+Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        mkdir Qt
        7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations
        mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\  Qt/\$$OUTDIR
@@ -1533,7 +1506,7 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtCore.pc.in > Qt/lib/pkgconfig/QtCore.pc
        sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc
 
-.Qt: Qt
+.Qt_win32: Qt_win32
        mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations
        cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin
        cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4
@@ -1543,10 +1516,28 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        cp Qt/translations/* $(PREFIX)/share/qt4/translations 
        touch $@
 
-CLEAN_FILE += .Qt
-CLEAN_PKG += Qt
+CLEAN_FILE += .Qt_win32
+CLEAN_PKG += Qt_win32
 DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 
+# ***************************************************************************
+# qt4 (source-code compilation for Mac)
+# ***************************************************************************
+
+qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz:
+       $(WGET) $(QT4_MAC_URL)
+
+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)
+       touch $@
+
+CLEAN_FILE += .qt4_mac
+CLEAN_PKG += qt4_mac
+DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
+
 # ***************************************************************************
 # zlib
 # ***************************************************************************
@@ -1668,7 +1659,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
        (patch -p0 < Patches/libpng-darwin-mactel.patch)
 endif
 
-.png: libpng 
+.png: libpng .zlib
 ifdef HAVE_DARWIN_OS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 else
@@ -1722,7 +1713,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 
 #ifdef SVN
 #libraw1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \
@@ -1753,7 +1744,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 
 #ifdef SVN
 #libdc1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \
@@ -1923,6 +1914,9 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
        $(EXTRACT_GZ)
 
 .gecko: gecko-sdk
+       rm -rf ../gecko-sdk
+       mv gecko-sdk ..
+       mkdir gecko-sdk #creating an empty dir is faster than copying the whole dir
        (cd $<)
        touch $@
 
@@ -1966,7 +1960,7 @@ mozilla-source-$(MOZILLA_VERSION).tar.bz2:
 mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 
-.mozilla-macosx: mozilla-macosx
+.mozilla-macosx: mozilla
        (cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install)
        touch $@
 
@@ -2045,6 +2039,7 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
 SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz 
        $(EXTRACT_GZ)
        patch -p0 < Patches/SDL_image.patch
+       patch -p0 < Patches/SDL_image-CVE-2006-4484.patch
 
 .SDL_image: SDL_image .SDL .png .jpeg .tiff
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install)
@@ -2275,13 +2270,14 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
 
 .pthreads: pthreads
-       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && cp -v *.a $(PREFIX)/lib/)
+       (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/)
        $(INSTALL_NAME)
        touch $@
 
 CLEAN_FILE += .pthreads
 CLEAN_PKG += pthreads
 DISTCLEAN_PKG += pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+
 # ***************************************************************************
 # ncurses library (with wide chars support)
 # ***************************************************************************
@@ -2300,6 +2296,25 @@ CLEAN_FILE += .ncurses
 CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
+# ***************************************************************************
+# asa library (ASS/SSA support)
+# ***************************************************************************
+
+asa.git.tar.gz:
+       $(WGET) $(ASA_URL) -O $@
+
+asa: asa.git.tar.gz
+       $(EXTRACT_GZ)
+
+.asa: asa
+       (cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .asa
+CLEAN_PKG += asa
+DISTCLEAN_PKG += asa.git.tar.gz
+
+#
 # ***************************************************************************
 # Some cleaning
 # ***************************************************************************