X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=db932b3f4144b1de1386e128e314e2aae50d0251;hb=7b98b7beab067b7b739e9156634238c6141ef5fa;hp=ae8f52dc4c1ac6a82db919c8265ffe14b5e3b738;hpb=bf8d85d77b6fc8c47704a0b787aca8ee8d72bb47;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ae8f52dc4c..db932b3f41 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -116,12 +116,15 @@ 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 --disable-debug
+FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
+endif
+ifdef HAVE_WIN64
+FFMPEGCONF+= --cpu=x86_64
 endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --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+= --enable-mingwce --cpu=armv4l --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 endif
 
 ifdef HAVE_UCLIBC
@@ -130,25 +133,22 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
+FFMPEGCONF+= --enable-small --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
 
-ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos
-endif
-
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack
 endif
 
 ifdef HAVE_DARWIN_OS
+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
@@ -162,9 +162,21 @@ 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
 X264CONF += --enable-pic
 endif
 
+ifdef HAVE_ISA_THUMB
+NOTHUMB ?= -mno-thumb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -213,39 +225,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
 # ***************************************************************************
@@ -328,23 +307,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
 # ***************************************************************************
@@ -406,11 +368,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
@@ -445,12 +402,27 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/libiconv.patch
+endif
+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_64
+.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)
@@ -474,15 +446,16 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.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)
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-	(cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./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) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
+	(cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install)
   endif
 else
   ifdef HAVE_DARWIN_OS
@@ -564,20 +537,9 @@ 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)
 
@@ -587,7 +549,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
 
 # ***************************************************************************
@@ -600,6 +561,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)
@@ -655,10 +619,13 @@ lua-$(LUA_VERSION).tar.gz:
 
 lua: lua-$(LUA_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+	(cd $@; sed -e 's%gcc%$(CC)%' -e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  src/Makefile)
+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
@@ -681,11 +648,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 $@
 
@@ -722,12 +689,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)
 
@@ -755,7 +716,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 !"
@@ -767,7 +728,7 @@ 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 && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -794,29 +755,31 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifndef HAVE_DARWIN_OS
 	patch -p0 < Patches/theora.patch
 else
-	patch -p0 < Patches/theora_mac.patch
+ifdef HAVE_DARWIN_OS_ON_INTEL
+	patch -p0 < Patches/theora_mac_intel32.patch
+else
+	patch -p0 < Patches/theora_mac_ppc.patch
+endif
 endif
 	patch -p0 < Patches/libtheora-includes.patch
 ifdef HAVE_WIN32
 	patch -p0 < Patches/theora-doc.patch
 endif
-	(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
 THEORACONF += --disable-asm
 endif
 
 .theora: libtheora .ogg
-ifdef HAVE_BEOS
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
-else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
-endif
+	(cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -858,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
 
@@ -892,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)
@@ -914,7 +877,7 @@ faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	(cd $@; sh ./bootstrap)
+	(cd $@; echo|$(HOSTCC) -iquote . -E - || sed -i 's/-iquote /-I/' libfaad/Makefile.am; sh ./bootstrap)
 
 .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)
@@ -949,17 +912,14 @@ 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
+endif
 
 .ebml: libebml
 ifdef HAVE_WIN32
@@ -969,12 +929,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
@@ -987,14 +941,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)
@@ -1009,13 +957,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
@@ -1066,20 +1007,19 @@ 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)
+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
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 else
 	(cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
+endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1092,7 +1032,7 @@ ifdef NO_TEXT_RELOCATION
 	echo "Broken LD. Fix your tools."
 	exit -1
 endif
-	patch -p0 < Patches/eac3_spectral.patch
+	(cd $@; patch -p1 < ../Patches/eac3_spectral.patch)
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1103,7 +1043,16 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 endif
 
-FFMPEGCONF += --enable-gpl --enable-postproc --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network
+FFMPEGCONF += \
+	--disable-debug \
+	--enable-gpl \
+	--enable-postproc \
+	--disable-ffserver \
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-devices \
+	--disable-protocols \
+	--disable-network
 ifdef HAVE_WIN32
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca
 endif
@@ -1117,7 +1066,7 @@ 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 $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
 ifdef SVN
@@ -1259,6 +1208,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
@@ -1304,9 +1256,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
@@ -1314,13 +1263,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
@@ -1338,8 +1285,8 @@ 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
+	patch -p0 < Patches/libcaca_driver_cocoa.diff
+	patch -p0 < Patches/libcaca_macosx.diff
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
@@ -1593,7 +1540,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 -nomake "examples demos" -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 -arch $(ARCH) && make && make install)
 	touch $@
 
 CLEAN_FILE += .qt4_mac
@@ -1681,15 +1628,12 @@ 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
 
 .twolame: twolame
-	(cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
+	(cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1775,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)
@@ -1806,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) && \
@@ -1957,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
 
@@ -2065,20 +1985,20 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 # libjpeg
 # ***************************************************************************
 
-jpeg-$(JPEG_VERSION).tar.gz:
+jpegsrc.v$(JPEG_VERSION).tar.gz:
 	$(WGET) $(JPEG_URL)
 
-jpeg: jpeg-$(JPEG_VERSION).tar.gz
+jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
-.jpeg: jpeg
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib)
+.jpeg: jpeg-7
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
 	$(RANLIB) $(PREFIX)/lib/libjpeg.a
 	touch $@
 
 CLEAN_FILE += .jpeg
-CLEAN_PKG += jpeg
-DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
+CLEAN_PKG += jpeg-7
+DISTCLEAN_PKG += jpegsrc.v$(JPEG_VERSION).tar.gz
 
 # ***************************************************************************
 # tiff
@@ -2138,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)
@@ -2364,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
@@ -2424,12 +2343,11 @@ DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 fluidsynth-$(FLUID_VERSION).tar.gz:
 	$(WGET) $(FLUID_URL)
 
-
 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
@@ -2450,16 +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-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
@@ -2495,32 +2412,41 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
 	$(WGET) $(ASS_URL)
 
-ifdef GIT
 libass:
 	$(GIT) clone $(ASS_GIT)
-ifneq ($(HOST),$(BUILD))
-	patch -p0 < Patches/libass-cross.patch
-endif
 	(cd $@; autoreconf -ivf)
-else
-# mplayer patches up to August 8, 2008 are included
-libass: libass-$(ASS_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
-	(cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
-ifneq ($(HOST),$(BUILD))
-	patch -p0 < Patches/libass-cross.patch
-	(cd $@; autoreconf -ivf)
-endif
-endif
 
-.libass: libass .png
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+.libass: libass
+	(cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
 	touch $@
 
 CLEAN_FILE += .libass
 CLEAN_PKG += libass
 DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 
+# ***************************************************************************
+# Sparkle
+# ***************************************************************************
+
+"Sparkle-$(SPARKLE_VERSION).zip":
+	$(WGET) $(SPARKLE_URL)
+
+Sparkle: "Sparkle-$(SPARKLE_VERSION).zip"
+	rm -rf $@ || true
+	unzip $<
+	touch $@
+
+.Sparkle: Sparkle
+	rm -rf ../Sparkle
+	mv Sparkle ..
+	mkdir Sparkle
+	(cd $<)
+	touch $@
+
+CLEAN_FILE += .Sparkle
+CLEAN_PKG += Sparkle
+DISTCLEAN_PKG += Sparkle-$(SPARKLE_VERSION).zip
+
 # ***************************************************************************
 # UPNP library
 # ***************************************************************************
@@ -2552,6 +2478,9 @@ gsm: gsm-$(GSM_VERSION).tar.gz
 ifneq ($(HOST),$(BUILD))
 	(patch -p0 < Patches/gsm-cross.patch)
 endif
+ifdef HAVE_DARWIN_OS
+	(cd $@; sed -e 's%-O2%-O2\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%# LDFLAGS 	=%LDFLAGS 	= $(EXTRA_LDFLAGS)%' -e 's%gcc%$(CC)%' -i.orig  Makefile)
+endif
 
 .gsm: gsm
 	(cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)
@@ -2577,7 +2506,7 @@ clean-src: clean
 	rm -rf $(DISTCLEAN_PKG)
 
 clean-svn:
-	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live
+	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live libass
 
 distclean: clean-src