]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
contribs/ffmpeg: fixed compilation on PPC-based Macs, removed old patch
[vlc] / extras / contrib / src / Makefile
index 4cc74b7ddd85b5486c6314ab9b17a445bb4defe4..b0eacf0e70169f204a24db95950224c7400619de 100644 (file)
@@ -59,7 +59,6 @@ endif
 
 ifneq ($(CC),)
 HOSTCC+= CC="$(CC)"
-FFMPEGCONF += --cc=$(CC)
 endif
 ifneq ($(CXX),)
 HOSTCC+= CXX="$(CXX)"
@@ -116,7 +115,12 @@ 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
+endif
 endif
 
 ifdef HAVE_WINCE
@@ -136,10 +140,6 @@ else
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
 
-ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86 --disable-audio-beos
-endif
-
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack
 endif
@@ -149,7 +149,7 @@ X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
 FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
-ifdef HAVE_DARWIN_10
+ifdef HAVE_DARWIN_64
 FFMPEGCONF += --cpu=core2
 X264CONF+=--host=x86_64-apple-darwin10
 endif
@@ -163,9 +163,22 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
 endif
 
 ifdef HAVE_LINUX
+ifdef HAVE_MAEMO
+ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
+FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
+endif
+# Really, this could be done on all Linux platforms, not just Maemo.
+# Installing statically-linked VLC plugins is so much simpler.
+HOSTCONF += --with-pic --disable-shared
+endif
+FFMPEGCONF += --enable-pic
 X264CONF += --enable-pic
 endif
 
+ifdef HAVE_ISA_THUMB
+NOTHUMB ?= -mno-thumb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -214,39 +227,6 @@ endef
 #      $(INSTALL_NAME)
 #      touch $@
 
-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
-define INSTALL_NAME
-       if test -f $(PREFIX)/lib/lib$(patsubst .%,%,$@).so ; then \
-               mkdir -p $(PREFIX)/vlc-lib ; \
-               cp $(PREFIX)/lib/lib$(patsubst .%,%,$@).so \
-                 $(PREFIX)/vlc-lib/ ; \
-       fi
-endef
-endif
-
-# ***************************************************************************
-# perl
-# ***************************************************************************
-
-ifeq ($(BUILD),i586-pc-beos)
-perl-$(PERL_VERSION).tar.gz:
-       $(WGET) $(PERL_URL)
-
-perl: perl-$(PERL_VERSION).tar.gz
-       $(EXTRACT_GZ)
-       sed -i.orig 's%prefix="/boot/home/config"%prefix="$(PREFIX)"%'  perl/hints/beos.sh
-
-.perl: perl
-       (cd $<; ./Configure -d -e && make && make install && ln -sf perl5/$(PERL_VERSION)/BePC-beos/CORE/libperl.so $(PREFIX)/lib/libperl.so)
-       touch $@
-
-CLEAN_FILE += .perl
-CLEAN_PKG += perl
-DISTCLEAN_PKG += perl-$(PERL_VERSION).tar.gz
-endif
-
 # ***************************************************************************
 # autoconf
 # ***************************************************************************
@@ -329,23 +309,6 @@ CLEAN_FILE += .libtool
 
 endif
 
-ifeq ($(BUILD),i586-pc-beos)
-libtool-$(LIBTOOL_VERSION).tar.gz:
-       $(WGET) $(LIBTOOL_URL)
-
-libtool: libtool-$(LIBTOOL_VERSION).tar.gz
-       $(EXTRACT_GZ)
-
-.libtool: libtool
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-       touch $@
-
-CLEAN_PKG += libtool
-DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz
-CLEAN_FILE += .libtool
-
-endif
-
 # ***************************************************************************
 # automake
 # ***************************************************************************
@@ -407,11 +370,6 @@ ifdef HAVE_WIN32
 else
        ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs)
 endif
-ifeq ($(BUILD),i586-pc-beos)
-# The ugliest kludge ever - so libtool correctly links shared libraries
-# on BeOS. Sorry, I just can't figure out how libtool works
-       ( cd $< && for f in `find . -name libtool`; do  sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' -i  $$f; chmod +x $$f; done )
-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
@@ -444,14 +402,25 @@ libiconv-$(LIBICONV_VERSION).tar.gz:
 
 libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/libiconv.patch
+ifdef HAVE_WIN64
+       patch -p0 < Patches/libiconv-win64.patch
 endif
-       patch -p0 < Patches/libiconv-autoconf-uclibc.patch
+
+libiconv-snowleopard.tar.bz2:
+       $(WGET) $(LIBICONVMAC_URL)
+
+libiconv-snowleopard: libiconv-snowleopard.tar.bz2
+       $(EXTRACT_BZ2)
 
 ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_10
+.iconv: libiconv-snowleopard
+       (cd libiconv-snowleopard && cp libiconv.* ../../lib/)
+       touch $@
+else
 .iconv:
        touch $@
+endif
 else
 .iconv: libiconv
        (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
@@ -553,6 +522,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)
@@ -566,22 +538,13 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 # mpeg2dec
 # ***************************************************************************
 
-#mpeg2dec:
-#      @echo "*** Please press return here : ***"
-#      cvs -d $(MPEG2DEC_CVSROOT) login
-#      cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
-#      (cd $@; ./bootstrap)
-
 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 $@
-
 libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
        $(EXTRACT_GZ)
+       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)
@@ -589,7 +552,6 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 CLEAN_FILE += .mpeg2
 CLEAN_PKG += libmpeg2
-#DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
 DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
@@ -602,6 +564,9 @@ 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
+ifdef HAVE_DARWIN_OS
+       ( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
+endif
 
 .id3tag: libid3tag
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -663,7 +628,7 @@ endif
 
 .lua: lua
 ifdef HAVE_WIN32
-       ( cd $< && sed -i.orig 's/lua luac/lua.exe/' Makefile && cd src && sed -i.orig 's/CC=/#CC=/' Makefile && sed -i 's/strip/\$(STRIP)/' Makefile && cd ../..)
+       ( cd $< && sed -i.orig 's/lua luac/lua.exe/' Makefile && cd src && sed -i.orig 's/CC=/#CC=/' Makefile && sed -i 's/strip/$(STRIP)/' Makefile && cd ../..)
        (cd $<&& $(HOSTCC) make $(LUA_MAKEPLATEFORM)&& cd src&& $(HOSTCC) make liblua.a&& cd ..&&$(HOSTCC) make install INSTALL_TOP=$(PREFIX)&& $(RANLIB) $(PREFIX)/lib/liblua.a)
        (cd $<&& sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc&& mkdir -p $(PREFIX)/lib/pkgconfig&& cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
 else
@@ -686,11 +651,11 @@ libmad-$(LIBMAD_VERSION).tar.gz:
 libmad: libmad-$(LIBMAD_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-       ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  configure )
+       ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
 endif
 
 .mad: libmad
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3 $(NOTHUMB)" && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -727,12 +692,6 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 # vorbis
 # ***************************************************************************
 
-#vorbis:
-#      @echo "*** Please type \"anoncvs\" here : ***"
-#      cvs -d $(OGG_CVSROOT) login
-#      cvs -d $(OGG_CVSROOT) co vorbis
-#      (cd $@; ./autogen.sh)
-
 libvorbis-$(VORBIS_VERSION).tar.gz:
        $(WGET) $(VORBIS_URL)
 
@@ -760,7 +719,7 @@ ifdef SVN
 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)
+       (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)
 else
 tremor-$(TREMOR_VERSION).tar.bz2:
        echo "tremor snapshot does not exist, you MUST use subversion !"
@@ -772,13 +731,13 @@ tremor: tremor-$(TREMOR_VERSION).tar.bz2
 endif
 
 .tremor: tremor .ogg
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
+       (cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) --disable-shared CFLAGS="$(NOTHUMB)" && make && make install)
        $(INSTALL_NAME)
        touch $@
 
 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
@@ -796,23 +755,11 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifndef HAVE_DARWIN_OS
-       patch -p0 < Patches/theora.patch
-else
-       patch -p0 < Patches/theora_mac.patch
-endif
        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
 
-ifdef HAVE_DARWIN_10
+ifdef HAVE_DARWIN_64
 THEORACONF += --disable-asm
 endif
 ifdef HAVE_WIN64
@@ -820,10 +767,18 @@ THEORACONF += --disable-asm
 endif
 
 .theora: libtheora .ogg
-ifdef HAVE_BEOS
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
+ifdef HAVE_DARWIN_OS
+       cd $<; ($(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
+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 $@
@@ -866,6 +821,9 @@ flac: flac-$(FLAC_VERSION).tar.gz
 ifdef HAVE_WIN32
        patch -p0 < Patches/flac-win32.patch
 endif
+ifdef HAVE_DARWIN_OS
+       ( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
+endif
 
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 
@@ -900,9 +858,6 @@ speex-$(SPEEX_VERSION).tar.gz:
 speex: speex-$(SPEEX_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/speex.patch
-ifdef HAVE_BEOS
-       patch -p0 < Patches/speex-BeOS.patch
-endif
 
 .speex: speex
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)
@@ -922,10 +877,11 @@ faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz
        $(EXTRACT_GZ)
-       (cd $@; 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
@@ -957,19 +913,13 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
 libebml-$(LIBEBML_VERSION).tar.bz2:
        $(WGET) $(LIBEBML_URL)
 
-## No reasons to use SVN anymore
-#ifdef SVN
-#libebml:
-#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
-#else
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-#endif
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
 ifdef HAVE_WIN64
-       patch -p0 < Patches/libebml-win64.patch
+       patch -p0 < Patches/libebml-win64.patch
 endif
 
 .ebml: libebml
@@ -980,12 +930,6 @@ else
        $(RANLIB) $(PREFIX)/lib/libebml.a
 endif
        touch $@
-## No reasons to use SVN anymore
-#ifdef SVN
-#libebml-source: libebml
-#      tar cfvz  libebml-$(DATE).tar.gz libebml
-#SOURCE += libebml-source
-#endif
 
 CLEAN_FILE += .ebml
 CLEAN_PKG += libebml
@@ -998,14 +942,8 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
 libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
        $(WGET) $(LIBMATROSKA_URL)
 
-## No reasons to use SVN anymore
-#if SVN
-#libmatroska:
-#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
-#else
 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)
@@ -1020,13 +958,6 @@ else
 endif
        touch $@
 
-## No reasons to use SVN anymore
-#ifdef SVN
-#libmatroska-source: libmatroska
-#      tar cfvz libmatroska-$(DATE).tar.gz libmatroska
-#
-#SOURCE += libmatroska-source
-#endif
 
 CLEAN_FILE += .matroska
 CLEAN_PKG += libmatroska
@@ -1076,21 +1007,13 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-       $(SVN) co $(FFMPEG_SVN) ffmpeg
-ifeq ($(HOST),i586-pc-beos)
-       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
+       $(SVN) co $(FFMPEG_SVN) ffmpeg -r 19836
+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_BEOS
-       (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
-endif
-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
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1125,7 +1048,7 @@ FFMPEGCONF += \
        --disable-protocols \
        --disable-network
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=ac3 --enable-libmp3lame
 endif
 
 ifdef HAVE_WINCE
@@ -1137,12 +1060,12 @@ else
 .ffmpeg: ffmpeg .lame .gsm
 endif
 endif
-       (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)
+       (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
@@ -1174,7 +1097,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
@@ -1279,6 +1202,9 @@ 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
+endif
 
 .live: live
 ifdef HAVE_WIN32
@@ -1324,9 +1250,6 @@ goom$(GOOM2k4_VERSION).tar.gz:
 
 goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/goom.patch
-endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
@@ -1334,13 +1257,11 @@ else
        patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
        patch -p0 < Patches/goom2k4-0-memleaks.patch
+       patch -p0 < Patches/goom2k4-autotools.patch
+       (cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
 
 .goom2k4: goom
-ifdef HAVE_DARWIN_OS
-       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-else
-       (cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
-endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
        touch $@
 
 CLEAN_FILE += .goom2k4
@@ -1356,10 +1277,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/caca_driver_cocoa.diff
-       patch -p0 < Patches/caca_macosx.diff
        patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
        (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
@@ -1412,9 +1331,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
 
@@ -1448,9 +1364,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
@@ -1490,9 +1407,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
@@ -1701,9 +1628,6 @@ twolame-$(TWOLAME_VERSION).tar.gz:
 
 twolame: twolame-$(TWOLAME_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_BEOS
-       patch -p0 < Patches/twolame-BeOS.patch
-endif
 ifdef HAVE_WIN32
        (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
 endif
@@ -1795,23 +1719,11 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 # libraw1394
 # ***************************************************************************
 
-#ifdef SVN
-#libraw1394:
-#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
-#        (cd $<; libtoolize --copy --force; \
-#                autopoint -f; \
-#                aclocal -I extras/contrib/share/aclocal; \
-#                autoconf; \
-#                autoheader; \
-#                automake --add-missing --copy -Wall)
-#
-#else
 libraw1394-$(LIBRAW1394_VERSION).tar.gz:
        $(WGET) $(LIBRAW1394_URL)
 
 libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
        $(EXTRACT_GZ)
-#endif
 
 .raw1394: libraw1394
        (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install)
@@ -1826,23 +1738,11 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 # libdc1394
 # ***************************************************************************
 
-#ifdef SVN
-#libdc1394:
-#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
-#        (cd $<; libtoolize --copy --force; \
-#                autopoint -f; \
-#                aclocal -I extras/contrib/share/aclocal; \
-#                autoconf; \
-#                autoheader; \
-#                automake --add-missing --copy -Wall)
-#
-#else
 libdc1394-$(LIBDC1394_VERSION).tar.gz:
        $(WGET) $(LIBDC1394_URL)
 
 libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
        $(EXTRACT_GZ)
-#endif
 
 .dc1394: libdc1394
        (cd $<; ./configure --prefix=$(PREFIX) && \
@@ -1977,7 +1877,7 @@ glib-$(GLIB_VERSION).tar.bz2:
 glib: glib-$(GLIB_VERSION).tar.bz2
        $(EXTRACT_BZ2)
        (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
-ifdef HAVE_DARWIN_10
+ifdef HAVE_DARWIN_64
        (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
 endif
 
@@ -2158,7 +2058,6 @@ 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)
@@ -2384,7 +2283,7 @@ taglib-$(TAGLIB_VERSION).tar.gz:
 taglib: taglib-$(TAGLIB_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
-       patch -p0 < Patches/taglib.patch
+       patch -p0 < Patches/taglib-static.patch
 endif
 ifdef HAVE_CYGWIN
        patch -p0 < Patches/taglib-cygwin.patch
@@ -2448,7 +2347,7 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
        patch -p0 < Patches/fluid-win32.patch
-       cd $@; ./autogen.sh
+       cd $@; ./autogen.sh || true
 endif
 
 .fluid: fluidsynth
@@ -2469,19 +2368,15 @@ liboil-$(OIL_VERSION).tar.gz:
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d liboil -p1 < Patches/liboil-noshared.patch
-       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
        patch -d liboil -p1 < Patches/liboil-win64.patch
+       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
+       (cd $@; autoreconf)
+
 
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
-ifdef HAVE_DARWIN_OS_ON_INTEL
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
-else
-       patch -p0 < Patches/liboil-ppc.patch
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -force_cpusubtype_ALL")
-       patch -p0 < Patches/liboil-ppc-hack.patch
-endif
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
 endif
@@ -2521,7 +2416,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 $@
 
@@ -2533,19 +2428,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
@@ -2595,6 +2485,121 @@ CLEAN_FILE += .gsm
 CLEAN_PKG += gsm
 DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
 
+# *********
+# projectM
+# *********
+ifdef SVN
+libprojectM:
+       $(SVN) co $(LIBPROJECTM_SVN) libprojectM
+       patch -d libprojectM -p0 < Patches/libprojectM-fpic.patch
+else
+libprojectM-$(LIBPROJECTM_VERSION).tar.bz2:
+       $(WGET) $(LIBPROJECTM_URL)
+
+libprojectM: libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+endif
+
+.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)
+       touch $@
+
+CLEAN_FILE += .libprojectM
+CLEAN_PKG += libprojectM
+DISTCLEAN_PKG += libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
+
+# ***************************************************************************
+# 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_FILES += .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_FILES += .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 )
+
+CLEAN_FILE += .regex
+CLEAN_PKG += regex
+DISTCLEAN_PKG += regex-$(REGEX_VERSION).tar.gz
 
 
 # ***************************************************************************