X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=faa05e634f3ba005b277d85cbf49e0b00305f1cb;hb=8f77cb70b92aa2ffc78d21aafcf0d8022b6ebac4;hp=51e904c96ef199a3ffc8fdc999d571019d41ab5b;hpb=727eb9d899feb540f9ac298aeb125fa25d2cbbc8;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 51e904c96e..faa05e634f 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,7 +1,7 @@
-# ***************************************************************************
+#***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 - 2006 the VideoLAN team
+# Copyright (C) 2003 - 2007 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -36,6 +36,7 @@ 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 
@@ -82,20 +83,29 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
+# For ffmpeg if not cross compiling
+ifneq ($(CC),)
+  FFMPEGCONF=--cc="$(CC)"
+endif
+
 #
-# compiling for MinGW under Cygwin could be detected as cross compiling
-# unfortunately there isn't a complete separate GCC toolchain for MinGW under cygwin
+# cross compiling
 #
-ifeq (,$(findstring cygwin,$(BUILD)),)
-    ifneq ($(BUILD),$(HOST))
-    # We are cross compiling
-    HOSTCONF=--host=$(HOST) --build=$(BUILD)
-    FFMPEGCONF=--cross-prefix=$(HOST)-
-    X264CONF=--crosscompile=$(HOST)
+#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))
+    #
+    # Compiling for MinGW under Cygwin could be deemed as cross compiling
+    # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin
+    #
+    ifeq ($(findstring cygwin,$(BUILD)),)
+        # We are REALLY cross compiling
+        FFMPEGCONF=--cross-prefix=$(HOST)-
+        X264CONF=--crosscompile=$(HOST)
+	PTHREADSCONF="CROSS=$(HOST)-"
     else
-       ifneq ($(CC),)
-          FFMPEGCONF=--cc="$(CC)"
-       endif
+        # We are compiling for MinGW on Cygwin
+	PTHREADSCONF=$(HOSTCC)
     endif
 endif
 
@@ -123,7 +133,7 @@ FFMPEGCONF += --enable-memalign-hack
 endif
 
 ifdef HAVE_DARWIN_OS
-X264CONF += --enable-pic
+X264CONF += --enable-pic --enable-debug
 ifneq ($(HOST),i686-apple-darwin8)
 FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
@@ -135,18 +145,15 @@ endif
 
 ifdef HAVE_DARWIN_OS
  all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-	.FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
-	.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
-	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca
+    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+    .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
+    .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+    .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
+    .SDL_image .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder \
+    .libdca .tag .x264 .goom2k4 .aclocal
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
-ifneq ($(HOST),i686-apple-darwin8)
-all: .goom2k4
-endif
 else
 
  ifdef HAVE_BEOS
@@ -156,14 +163,16 @@ else
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.dvdnav .dvbpsi .aclocal .libdca
+   #.speex seems
   else
 # Cross compiling: we already have the Linux tools, only build the
 # libraries now
    all: .iconv .intl .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-	.FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
+	.FLAC .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
 	.dvdnav .dvbpsi .aclocal .libdca
   endif
+  #.speex
  else
 
   ifdef HAVE_WIN32
@@ -174,7 +183,8 @@ else
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
 	.dvdnav .dvbpsi .wxwidgets .qt4 .dirac \
-	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
+	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca \
+	.SDL_image
 #	.SDL_image  .daap .cddb .cdio .vcdimager .portaudio 
   else
 
@@ -187,10 +197,10 @@ else
    all: .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame\
-	.png .gpg-error .gcrypt .gnutls .mpcdec\
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
 	.dvdnav .dvbpsi .wxwidgets .dirac \
-	.aclocal .libdca
+	.aclocal .libdca .libraw1394 .libdc1394
 #	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
@@ -306,11 +316,11 @@ endif
 # autoconf
 # ***************************************************************************
 
-autoconf-$(AUTOCONF_VERSION).tar.gz:
+autoconf-$(AUTOCONF_VERSION).tar.bz2:
 	$(WGET) $(AUTOCONF_URL)
 
-autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
-	$(EXTRACT_GZ)
+autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 .autoconf: autoconf
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
@@ -318,7 +328,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
 
 CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
-DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
+DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
 # ***************************************************************************
 # libtool
@@ -376,15 +386,16 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 # pkgconfig
 # ***************************************************************************
 
-pkgconfig-$(PKGCFG_VERSION).tar.gz:
+pkg-config-$(PKGCFG_VERSION).tar.gz:
 	$(WGET) $(PKGCFG_URL)
 
-pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
+pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
+	patch -d pkgconfig -p0 < Patches/pkgcfg.patch
 
 .pkgcfg: pkgconfig
-	(cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+	(cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 	touch $@
 
 CLEAN_FILE += .pkgcfg
@@ -401,15 +412,17 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/gettext-macosx.patch
-	(cd $@; ./autogen.sh)
+	patch -p0 < Patches/gettext-macosx.patch 
+endif
+ifdef HAVE_WIN32
+	patch -p0 < Patches/gettext-win32.patch
 endif
 
 .intl: gettext .iconv
 ifdef HAVE_WIN32
-	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
+	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
 else
-	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) )
+	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java)
 endif
 ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -425,7 +438,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-	(cd ../include; sed -i.orig '283 c #if !1' libintl.h)
+	(cd ../include; sed -i.orig '311 c #if !1' libintl.h)
 endif
 	$(INSTALL_NAME)
 	touch $@
@@ -444,7 +457,7 @@ libiconv-$(LIBICONV_VERSION).tar.gz:
 libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/libiconv.patch
+	patch -p0 < Patches/libiconv.patch
 endif
 
 ifdef HAVE_DARWIN_OS
@@ -489,9 +502,9 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/fribidi.patch.real
+	patch -p0 < Patches/fribidi.patch.real
 ifdef HAVE_WIN32
-	patch -p 0 <Patches/fribidi-win32.patch
+	patch -p0 <Patches/fribidi-win32.patch
 endif
 .fribidi: fribidi .iconv
 	(cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
@@ -530,17 +543,16 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #	cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #	(cd $@; ./bootstrap)
 
-#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-#	$(WGET) $(MPEG2DEC_URL)
+mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+	$(WGET) $(MPEG2DEC_URL)
 
 # It is easier to use bootstrapped versions...
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-	$(WGET) $(MPEG2DEC_SNAPSHOT)
-	mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
+#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+#	$(WGET) $(MPEG2DEC_SNAPSHOT)
+#	mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
 mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/mpeg2dec.patch
 
 .mpeg2: mpeg2dec
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
@@ -604,10 +616,10 @@ libogg-$(OGG_VERSION).tar.gz:
 
 libogg: libogg-$(OGG_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/ogg.patch
-	patch -p 0 < Patches/libogg-1.1.patch
+	patch -p0 < Patches/ogg.patch
+	patch -p0 < Patches/libogg-1.1.patch
 ifdef HAVE_WINCE
-	patch -p 0 < Patches/libogg-wince.patch
+	patch -p0 < Patches/libogg-wince.patch
 endif
 	(cd $@; autoconf)
 
@@ -629,14 +641,14 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 #	cvs -d $(OGG_CVSROOT) login
 #	cvs -d $(OGG_CVSROOT) co vorbis
 #	(cd $@; ./autogen.sh)
-#	patch -p 0 < Patches/vorbis.patch
+#	patch -p0 < Patches/vorbis.patch
 
 libvorbis-$(VORBIS_VERSION).tar.gz:
 	$(WGET) $(VORBIS_URL)
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/libvorbis-1.1.patch
+	patch -p0 < Patches/libvorbis-1.1.patch
 	(cd $@; autoconf)
 
 .vorbis: libvorbis .ogg
@@ -694,7 +706,12 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	(cd $@; autoconf)
 
 .theora: libtheora .ogg
+ifdef HAVE_BEOS
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm && make && make install)
+else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest && make && make install)
+
+endif
 	$(INSTALL_NAME)
 	touch $@
 
@@ -735,10 +752,10 @@ flac-$(FLAC_VERSION).tar.gz:
 flac: flac-$(FLAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/flac-mactel.patch
+	patch -p0 < Patches/flac-mactel.patch
 endif
 ifneq ($(HOST),$(BUILD))
-	(patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
+	(patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf)
 endif
 
 .FLAC: flac 
@@ -768,6 +785,9 @@ 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)
@@ -786,7 +806,7 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 #	@echo "*** Please type return here : ***"
 #	cvs -d $(FAAD2_CVSROOT) login
 #	cvs -d $(FAAD2_CVSROOT) co faad2
-#	(cd $@; patch -p 0 < ../Patches/faad2.patch)
+#	(cd $@; patch -p1 < ../Patches/faad2.patch)
 #	(cd $@; sh ./bootstrap)
 
 faad2-$(FAAD2_VERSION).tar.bz2:
@@ -794,7 +814,7 @@ faad2-$(FAAD2_VERSION).tar.bz2:
 
 faad: faad2-$(FAAD2_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	(cd $@; patch -p 0  < ../Patches/faad2.patch && ./bootstrap)
+	(cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap)
 
 .faad: faad
 	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
@@ -814,7 +834,7 @@ faac-$(FAAC_VERSION).tar.bz2:
 
 faac: faac-$(FAAC_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/faac.patch
+	patch -p0 < Patches/faac.patch
 
 .faac: faac
 	(cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
@@ -858,7 +878,7 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 endif
 ifdef HAVE_WIN32
-	(cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch)
+	(cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
 
 .ebml: libebml
@@ -889,7 +909,7 @@ libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 endif
 ifdef HAVE_WIN32
-	(cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch)
+	(cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
 endif
 
 .matroska: libmatroska .ebml
@@ -912,29 +932,31 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN)  ffmpeg
 ifeq ($(HOST),i586-pc-beos)
-	(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
+	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
 ifdef HAVE_WINCE
-	patch -p 1 < Patches/ffmpeg-svn-wince.patch
+	patch -p1 < Patches/ffmpeg-svn-wince.patch
 endif
-ifeq ($(HOST),i686-apple-darwin8)
-	(cd $@;patch -p 0 < ../Patches/ffmpeg-svn-mactel.patch)
+ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
+endif
+ifdef HAVE_BEOS
+	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
-#	(cd $@; patch -p0 < ../Patches/ffmpeg-install.patch)
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	$(WGET) $(FFMPEG_URL)
 
 #ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
 #	$(EXTRACT_GZ)
-#	patch -p 0 < Patches/ffmpeg.patch
+#	patch -p0 < Patches/ffmpeg.patch
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
 else
 .ffmpeg: ffmpeg .faac .lame
 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-network --enable-a52 --disable-ffplay && 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-network --enable-a52 --disable-ffplay --enable-swscaler && make install-libs install-headers)
 	touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -982,7 +1004,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 #		rm -rf $@ \
 #		exit 1; \
 #	fi
-#	(cd libdvdread; patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
+#	(cd libdvdread; patch -p0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
 #endif
 
 #.dvdread: libdvdread .dvdcss
@@ -1013,8 +1035,8 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
 
 libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/dvdnav.patch
-	patch -p 0 < Patches/libdvdnav-mactel.patch
+	patch -p0 < Patches/dvdnav.patch
+	patch -p0 < Patches/libdvdnav-mactel.patch
 	(cd $@; ./autogen.sh noconfig)
 
 .dvdnav: libdvdnav .dvdcss
@@ -1058,9 +1080,9 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/live.patch
-	patch -p 0 < Patches/livedotcom-win32.patch
-	patch -p 0 < Patches/live-osx.patch
+	patch -p0 < Patches/live.patch
+	patch -p0 < Patches/livedotcom-win32.patch
+	patch -p0 < Patches/live-osx.patch
 
 .live: live
 ifdef HAVE_WIN32 
@@ -1113,14 +1135,13 @@ goom$(GOOM2k4_VERSION).tar.gz:
 goom: goom$(GOOM2k4_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/goom.patch
+	patch -p0 < Patches/goom.patch
 endif
 ifdef HAVE_WIN32
 	(cd $@; dos2unix configure.in)
-	patch -p 0 <Patches/goom2k4-0-win32.patch
-endif
-ifndef HAVE_DARWIN_OS
-	(cd goom; patch -p 0 <../Patches/goom2k4-0-nommx.patch; cd -)
+	patch -p0 < Patches/goom2k4-0-win32.patch
+else
+	patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 
 .goom2k4: goom
@@ -1180,7 +1201,7 @@ ifdef SVN
 x264: 
 	$(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 ifdef HAVE_WIN32
-	(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
+	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
 else
 x264-$(X264_VERSION).tar.gz:
@@ -1189,19 +1210,20 @@ x264-$(X264_VERSION).tar.gz:
 x264: x264-$(X264_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
-	(cd x264;patch -p 0 <../Patches/x264-20050624-win32.patch)
+	(cd x264;patch -p0 <../Patches/x264-20050624-win32.patch)
 else
-	patch -p 0 < Patches/x264.patch
+	patch -p0 < Patches/x264.patch
 	rm x264/x264.c
 endif
 endif
 
-ifeq ($(HOST),i686-apple-darwin8)
-.x264: x264 .nasm
+ifdef HAVE_WIN32
+.x264: x264 .pthreads
+	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
 .x264: x264
-endif
 	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+endif
 	touch $@
 
 CLEAN_FILE += .x264
@@ -1279,7 +1301,7 @@ libcdio: libcdio-$(CDIO_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .cdio: libcdio
-	(cd $<; ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
+	(cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
 	touch $@
 
 CLEAN_FILE += .cdio
@@ -1317,7 +1339,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 #	(cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
-	(cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --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)
+	(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)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1353,10 +1375,10 @@ zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/zlib.patch
+	patch -p0 < Patches/zlib.patch
 
 .zlib: zlib
-	(cd zlib; $(HOSTCC2) ./configure  --prefix=$(PREFIX) && make install)
+	(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1375,7 +1397,7 @@ pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz:
 portaudio: pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifneq ($(HOST),$(BUILD))
-	(patch -p 0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
+	(patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
 
 .portaudio: portaudio 
@@ -1398,7 +1420,7 @@ libxml2-$(XML_VERSION).tar.gz:
 xml: libxml2-$(XML_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
-	patch -p 0 < Patches/xml2-win32.patch
+	patch -p0 < Patches/xml2-win32.patch
 	rm -f xml/aclocal.m4
 endif
 
@@ -1423,9 +1445,18 @@ 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_DARWIN_OS
+	patch -p0 < Patches/twolame-osx.patch
+endif
 
 .twolame: twolame
-	(cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+ifdef HAVE_WIN32
+	(cd twolame/win32; wget "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
+endif	
+	(cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1447,7 +1478,10 @@ ifdef HAVE_WIN32
 else
 	(cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
 endif
-	(patch -p 0 < Patches/libpng-1.2.8-makefile.patch)
+	(patch -p0 < Patches/libpng-makefile.patch)
+ifeq ($(HOST),i686-apple-darwin8)
+	(patch -p0 < Patches/libpng-darwin-mactel.patch)
+endif
 
 .png: libpng 
 ifdef HAVE_DARWIN_OS
@@ -1492,18 +1526,83 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 # gpg-error 
 # ***************************************************************************
 
+# 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
+
+.libraw1394: libraw1394
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libraw1394
+CLEAN_PKG += libraw1394
+DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
+
+# ***************************************************************************
+# 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
+
+.libdc1394: libdc1394
+	(cd $<; ./configure --prefix=$(PREFIX) && \
+	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
+	 make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libdc1394
+CLEAN_PKG += libdc1394
+DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
+
+# ***************************************************************************
 libgpg-error-$(GPGERROR_VERSION).tar.gz:
 	$(WGET) $(GPGERROR_URL)
 
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/libgpg-error.patch
+ifdef HAVE_WIN32
+	patch -p0 < Patches/libgpg-error-win32.patch
+endif
 
 .gpg-error: libgpg-error
 ifeq ($(HOST),i686-apple-darwin8)
 	(cd $<; ./autogen.sh)
 endif
-# MinGW host is not properly detected when building on cygwin
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --host=$(HOST) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install)
 #	$(INSTALL_NAME)
 	touch $@
 
@@ -1520,14 +1619,14 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/gcrypt.patch
+	patch -p0 < Patches/gcrypt.patch
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
 else
 ifeq ($(HOST),i686-apple-darwin8)
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)
 endif
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
@@ -1547,11 +1646,13 @@ gnutls-$(GNUTLS_VERSION).tar.bz2:
 
 gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
+ifdef HAVE_WIN32
 	patch -p0 < Patches/gnutls-win32.patch
+endif
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --program-prefix="" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif
@@ -1571,7 +1672,7 @@ libopendaap-$(DAAP_VERSION).tar.bz2:
 
 libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/daap.patch
+	patch -p0 < Patches/daap.patch
 
 .opendaap: libopendaap
 	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install)
@@ -1591,7 +1692,7 @@ glib-$(GLIB_VERSION).tar.gz:
 
 glib: glib-$(GLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/glib.patch
+	patch -p0 < Patches/glib.patch
 
 .glib: glib
 	(cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install)
@@ -1706,21 +1807,17 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
 
 tiff-$(TIFF_VERSION).tar.gz:
 	$(WGET) $(TIFF_URL)
-	mv tiff-$(TIFF_VERSION)-tar.gz $@
 
 tiff: tiff-$(TIFF_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/tiff.patch
-ifneq ($(HOST),$(BUILD))
-	patch -p 0 < Patches/tiff-cross.patch
-endif
 
 .tiff: tiff
 ifdef HAVE_WIN32
-	(cd $<;  ./configure  --noninteractive --target=$(HOST) --with-CC=$(HOST)-gcc --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no  && make -C libtiff && make -C libtiff install)
+	(cd $<; ./configure  --target=i586-mingw32msvc --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) --host=$(HOST) &&make -C port && make -C libtiff && make -C libtiff install)
 else
-	(cd $<; ./configure --noninteractive --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install)
+	(cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port &&make -C libtiff && make -C libtiff install)
 endif
+	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .tiff
@@ -1736,10 +1833,9 @@ SDL-$(SDL_VERSION).tar.gz:
 
 SDL: SDL-$(SDL_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/SDL.patch
 
 .SDL: SDL
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --enable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1756,10 +1852,10 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
 
 SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/SDL_image.patch
+	patch -p0 < Patches/SDL_image.patch
 
 .SDL_image: SDL_image .SDL .png .jpeg .tiff
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1776,7 +1872,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
 
 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/mpcdec.patch
+	patch -p0 < Patches/mpcdec.patch
 ifdef HAVE_WIN32
 	(cd $@; ./autogen.sh)
 endif
@@ -1806,10 +1902,10 @@ dirac-$(DIRAC_VERSION).tar.gz:
 dirac: dirac-$(DIRAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 <Patches/dirac-osx.patch
+	patch -p0 <Patches/dirac-osx.patch
 endif
 ifneq ($(HOST),$(BUILD))
-	patch -p 0 <Patches/dirac-cross.patch
+	patch -p0 <Patches/dirac-cross.patch
 	(cd $@; aclocal && autoconf && automake)
 endif
 
@@ -1884,9 +1980,9 @@ clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz
 	tar xzf $<
 	mv $(patsubst %.tar.gz,Cyberlink,$(patsubst %.tgz,Cyberlink,$(notdir $<))) $@ || true
 	touch $@
-	patch -p 0 < Patches/clinkcc.patch
+	patch -p0 < Patches/clinkcc.patch
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/clinkcc_osx.patch
+	patch -p0 < Patches/clinkcc_osx.patch
 endif
 
 .clinkcc: clinkcc
@@ -1951,6 +2047,34 @@ CLEAN_FILE += .unicows
 CLEAN_PKG += libunicows
 DISTCLEAN_PKG += libunicows-$(UNICOWS_VERSION)-src.tar.gz
 
+# ***************************************************************************
+# TagLib read and editing of tags of popular audio formats
+# ***************************************************************************
+
+taglib-$(TAGLIB_VERSION).tar.gz:
+	$(WGET) $(TAGLIB_URL)
+
+taglib: taglib-$(TAGLIB_VERSION).tar.gz
+	$(EXTRACT_GZ)
+
+.tag: taglib
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	$(INSTALL_NAME)
+	touch $@
+
+
+pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
+	$(WGET) $(PTHREADS_URL)
+
+pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+	$(EXTRACT_GZ)
+
+.pthreads: pthreads
+	(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-inlined; cp pthread.h ../../include/; cp *.dll *.a ../../lib/)
+	$(INSTALL_NAME)
+	touch $@
+
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************