Changeset 0a5027d1cdcff19dbb5e8f8fc9e325fa47ed091b

Timestamp:

11/01/05 12:30:23 (3 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1130844623 +0000

git-parent:

[77609b74c1bf8b53cab5c2a3906c0ad53bfff590]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1130844623 +0000

Message:

ALL: Merge the win32-contrib branch.

Todo:

Fix FLAC
SDL patch by Meuh

Files:

• configure.ac (modified) (2 diffs)
• extras/contrib/src/Makefile (modified) (46 diffs)
• extras/contrib/src/Patches/dirac-cross.patch (added)
• extras/contrib/src/Patches/faad2-20050513-win32.patch (added)
• extras/contrib/src/Patches/ffmpeg-20050513-win32.patch (added)
• extras/contrib/src/Patches/ffmpeg-beos.patch.cvs (added)
• extras/contrib/src/Patches/ffmpeg-cvs.patch (added)
• extras/contrib/src/Patches/ffmpeg.patch (deleted)
• extras/contrib/src/Patches/ffmpeg.patch.cvs (deleted)
• extras/contrib/src/Patches/fribidi-win32.patch (added)
• extras/contrib/src/Patches/gettext-osx.patch (added)
• extras/contrib/src/Patches/gettext.patch (deleted)
• extras/contrib/src/Patches/goom2k4-0-win32.patch (added)
• extras/contrib/src/Patches/goom2k4-0-win32.patch.bak (added)
• extras/contrib/src/Patches/libdvdnav-20050211-win32.patch (added)
• extras/contrib/src/Patches/libdvdread-20041028-win32.patch (added)
• extras/contrib/src/Patches/libdvdread-win32.patch (added)
• extras/contrib/src/Patches/libdvdread.patch (modified) (4 diffs)
• extras/contrib/src/Patches/libebml-svn-win32.patch (added)
• extras/contrib/src/Patches/libiconv.patch (modified) (1 diff)
• extras/contrib/src/Patches/libmatroska-win32.patch (added)
• extras/contrib/src/Patches/libogg-1.1-win32.patch (added)
• extras/contrib/src/Patches/libpng-1.2.5-win32.patch (added)
• extras/contrib/src/Patches/livedotcom-win32.patch (added)
• extras/contrib/src/Patches/tiff-cross.patch (added)
• extras/contrib/src/Patches/wx-cvs-2005-02-09-patch.diff (added)
• extras/contrib/src/Patches/wxMSW-win32.patch (added)
• extras/contrib/src/Patches/x264-20050624-win32.patch (added)
• extras/contrib/src/Patches/x264-svn-win32.patch (added)
• extras/contrib/src/Patches/xml2-win32.patch (added)
• extras/contrib/src/packages.mak (modified) (6 diffs)
• m4/vlc.m4 (modified) (1 diff)

configure.ac

@@ -88 +88 @@
-  if test -d ${topdir}/extras/contrib/lib; then
-    export PATH=${topdir}/extras/contrib/bin:$PATH
+dnl kludge because only the debian package provides a ffmpeg-config
+    with_ffmpeg_config_path=${topdir}/extras/contrib/bin    
-    CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
-    CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
@@ -96 +98 @@
-    OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
-    OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
+    if test $BUILD = $HOST; then
+        export PKG_CONFIG_PATH=${topdir}/extras/contrib/bin:$PKG_CONFIG_PATH
+    else
+        export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/bin
+    fi
-    if test -d ${topdir}/extras/contrib/vlc-lib; then
-      LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/vlc-lib"

extras/contrib/src/Makefile

@@ -55 +55 @@
-endif
-
+ifeq ($(HOST),i586-mingw32msvc)
+HAVE_WIN32=1
+endif
+ifeq ($(HOST),cygwin)
+HAVE_WIN32=1
+endif
+ifdef HAVE_WIN32
+export PATH := $(PREFIX)/bin:$(PATH)
+#EXTRA_CPPFLAGS = /usr/win32/include
+#EXTRA_LDFLAGS = /usr/win32/lib
+endif
+
-export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
-export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
@@ -69 +81 @@
-ifneq ($(BUILD),$(HOST))
-# We are cross compiling
-
+ --build=$(BUILD)  
-HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib
-# For libebml/libmatroska. Grrr.
-"AR=
+AR="
-FFMPEGCONF=--cross-prefix=$(HOST)-
+X264CONF=--cross-prefix=$(HOST)
+LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
-RANLIB=$(HOST)-ranlib
-else
@@ -81 +95 @@
-ifeq ($(HOST),i586-pc-beos)
-FFMPEGCONF+=--cpu=x86
+endif
+
+# Special target-dependant options
+#win
+ifdef HAVE_WIN32
+HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-depedency-tracking
+FFMPEGCONF+= --enable-mingw32  --enable-memalign-hack --cpu=x86
-endif
-
@@ -113 +134 @@
-  endif
- else
+  ifdef HAVE_WIN32
+
+   all: .iconv .intl .freetype .fribidi .zlib\
+    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+    .FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \
+    .live .goom2k4 .caca .mod .x264  .xml .twolame\
+    .png .gpg-error .gcrypt .gnutls \
+    .gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
+    .dx_headers .dshow_headers .aclocal .gecko-win32
+#   .SDL_image  .daap .cddb .cdio .vcdimager 
+   else
-# Standard Linux or other UNIX-like systems
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-endif
-
@@ -303 +340 @@
-gettext: gettext-$(GETTEXT_VERSION).tar.gz
-    $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
-    patch -p 0 < Patches/gettext.patch
+endif
-
-.intl: gettext .iconv
+ifdef HAVE_WIN32
+    ( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
+else
-    ( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) )
+endif
-ifeq ($(BUILD),i586-pc-beos)
-# The ugliest kludge ever - so libtool correctly links shared libraries
@@ -319 +362 @@
-    ( cd $< && make && make install )
-endif
+# Work around another non-sense of autoconf.
+ifdef HAVE_WIN32
+    (cd ../include; sed -i.bak '283 c #if !1' libintl.h)
+endif
-    $(INSTALL_NAME)
-    touch $@
@@ -335 +382 @@
-libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
-    $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
-    patch -p 0 < Patches/libiconv.patch
+endif
-
-.iconv: libiconv
-
+CPPFLAGS="-Dssize_t=long" 
-    $(INSTALL_NAME)
-    touch $@
@@ -375 +424 @@
-    $(EXTRACT_GZ)
-    patch -p 0 < Patches/fribidi.patch.real
-
-
-
+
+
+
+
+
-    $(INSTALL_NAME)
-    touch $@
@@ -488 +539 @@
-    $(EXTRACT_GZ)
-    patch -p 0 < Patches/ogg.patch
+#ifdef HAVE_WIN32
+#   (cd libogg;patch -p 0 <../Patches/libogg-1.1-win32.patch)
+#endiF
-
-.ogg: libogg
@@ -518 +572 @@
-# FIXME: shared libs disabled for now because of linking errors
-#   -- titer 2005/09/16
-
+$(HOSTCC) 
-#   $(INSTALL_NAME)
-    touch $@
@@ -579 +633 @@
-    $(EXTRACT_GZ)
-
-
-
+
+
+
-    $(INSTALL_NAME)
-    touch $@
@@ -624 +679 @@
-faad2: faad2-$(FAAD2_VERSION).tar.bz2
-    $(EXTRACT_BZ2)
-
+
+
+
-.faad: faad2
-
+bootstrap && ./
-    $(INSTALL_NAME)
-    touch $@
@@ -664 +721 @@
-
-.lame: lame
-share
+analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-fronten
-    touch $@
-
@@ -675 +732 @@
-# ***************************************************************************
-
-
-
-
-
+#
+
+#
+#
-libebml-$(LIBEBML_VERSION).tar.bz2:
-    $(WGET) $(LIBEBML_URL)
@@ -684 +741 @@
-libebml: libebml-$(LIBEBML_VERSION).tar.bz2
-    $(EXTRACT_BZ2)
-
+
+
+
+
-
-.ebml: libebml
+ifdef HAVE_WIN32
+    (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+else
-    (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
-    $(RANLIB) $(PREFIX)/lib/libebml.a
+endif   
-    touch $@
-
@@ -699 +763 @@
-# ***************************************************************************
-
-
-
-
-
+#
+#
+#
+#
-libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
-    $(WGET) $(LIBMATROSKA_URL)
@@ -708 +772 @@
-libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-    $(EXTRACT_BZ2)
-
-
-
+
+
+
+
+
+
+
+
+
-    (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
-    $(RANLIB) $(PREFIX)/lib/libmatroska.a
+endif
-    touch $@
-
@@ -723 +794 @@
-# ***************************************************************************
-
-# Note: we are using this cvs-snapshot of ffmpeg now, because this one 
-# compiles finely on 10.2 and is used in the win32-port as well, so we
-# experience the same bugs in both ports ;)
-
-ffmpeg:
-    echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
-    CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
-
-
+
+
+
+
+
-
-ffmpeg-$(FFMPEG_VERSION).tar.gz:
@@ -740 +810 @@
-#   patch -p 0 < Patches/ffmpeg.patch
-
-
---enable-mp3lame --enable-a52 --disable-ffplay && echo -e "#define HAVE_LRINTF 1" >> config.h && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib && make -C libavutil installlib
+ .faac .lame .zlib
+ --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done
-    touch $@
-
@@ -760 +830 @@
-
-.openslp: openslp
-
+$(HOSTCONF) 
-    touch $@
-
@@ -796 +866 @@
-# ***************************************************************************
-
-gz
+bz2
-    $(WGET) $(LIBDVDREAD_URL)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-.dvdread: libdvdread .dvdcss
-
-
-
+
+
+
+
-
-CLEAN_FILE += .dvdread
-CLEAN_PKG += libdvdread
-gz
+bz2
-
-# ***************************************************************************
@@ -816 +895 @@
-# ***************************************************************************
-
-gz
+bz2
-    $(WGET) $(LIBDVDNAV_URL)
-
-
-
-
+
+
+
+
+
+
-ifdef HAVE_DARWIN_OS
-    (cd $@; autoconf)
@@ -829 +911 @@
-
-.dvdnav: libdvdnav .dvdread
+ifdef HAVE_WIN32    
+    (cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) --disable-builtin-dvdread CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DNDEBUG -Dssize_t=long" && make  && make install)
+else
-    (cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+endif
-    $(INSTALL_NAME)
-    touch $@
@@ -835 +921 @@
-CLEAN_FILE += .dvdnav
-CLEAN_PKG += libdvdnav
-gz
+bz2
-
-# ***************************************************************************
@@ -866 +952 @@
-    $(EXTRACT_GZ)
-    patch -p 0 < Patches/live.patch
+    patch -p 0 < Patches/livedotcom-win32.patch
-    patch -p 0 < Patches/livedotcom-osx.patch
-
@@ -872 +959 @@
-    (cd $<; ./genMakefiles macosx-before-version-10.4 && make )
-else
+ifdef HAVE_WIN32
+    (cd $<;./genMakefiles mingw && make)
+else
-    (cd $<; ./genMakefiles macosx && make )
+endif
-endif
-    touch $@
@@ -908 +999 @@
-goom: goom$(GOOM2k4_VERSION).tar.gz
-    $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
-    patch -p 0 < Patches/goom.patch
+endif
+ifdef HAVE_WIN32
+    patch -p 0 <Patches/goom2k4-0-win32.patch
+endif
-
-.goom2k4: goom
-; ./configure --prefix=$(PREFIX) --disable-shared --enable-static
+&& autoconf configure.in >|configure &&./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest
-    touch $@
-
@@ -929 +1025 @@
-
-.caca: libcaca
-
+$(HOSTCONF) 
-    touch $@
-
@@ -954 +1050 @@
-
-.dts: libdts
-
+$(HOSTCONF) 
-    touch $@
-
@@ -968 +1064 @@
-x264: 
-    $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
+ifdef HAVE_WIN32
+    (cd x264; patch -p 0 <../Patches/x264-svn-win32.patch )
+else
-    cd x264 && patch -p 0 < ../Patches/x264_svn.patch
-    rm x264/x264.c
+endif
-else
-x264-$(X264_VERSION).tar.gz:
@@ -976 +1076 @@
-x264: x264-$(X264_VERSION).tar.gz
-    $(EXTRACT_GZ)
+ifdef HAVE_WIN32
+    (cd x264;patch -p 0 <../Patches/x264-20050624-win32.patch)
+else
-    patch -p 0 < Patches/x264.patch
-    rm x264/x264.c
-endif
+endif
-
-.x264: x264
---enable-pthread
+$(X264CONF)
-    touch $@
-
@@ -999 +1103 @@
-
-.mod: libmodplug
-
+$(HOSTCONF) 
-    touch $@
-
@@ -1010 +1114 @@
-# ***************************************************************************
-
-gz
+bz2
-    $(WGET) $(CDDB_URL)
-
-gz
-GZ
+bz2
+BZ2
-    patch -p 0 < Patches/libcddb.patch
-
-.cddb: libcddb
-
+$(HOSTCONF) 
-    touch $@
-
-CLEAN_FILE += .cddb
-CLEAN_PKG += libcddb
-gz
+bz2
-
-# ***************************************************************************
@@ -1086 +1190 @@
-
-# ***************************************************************************
+# wxWidgets
+# ***************************************************************************
+
+wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
+    $(WGET) $(WXWIDGETS_URL)
+
+wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
+    $(EXTRACT_GZ)
+#   (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
+
+.wxwidgets: wxwidgets
+    (cd wxwidgets; ./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  && make && make install)
+    $(INSTALL_NAME)
+    touch $@
+
+CLEAN_FILE += .wxwidgets
+CLEAN_PKG += wxwidgets
+DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
+
+# ***************************************************************************
+# zlib
+# ***************************************************************************
+
+zlib-$(ZLIB_VERSION).tar.gz:
+    $(WGET) $(ZLIB_URL)
+
+zlib: zlib-$(ZLIB_VERSION).tar.gz
+    $(EXTRACT_GZ)
+
+.zlib: zlib
+    (cd zlib; $(HOSTCC2) ./configure  --prefix=$(PREFIX) && make && make  install)
+    $(INSTALL_NAME)
+    touch $@
+
+CLEAN_FILE += .zlib
+CLEAN_PKG += zlib
+DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz
+
+
+
+# ***************************************************************************
+# xml
+# ***************************************************************************
+
+libxml2-$(XML_VERSION).tar.gz:
+    $(WGET) $(XML_URL)
+
+xml: libxml2-$(XML_VERSION).tar.gz
+    $(EXTRACT_GZ)
+ifdef HAVE_WIN32
+    patch -p 0 < Patches/xml2-win32.patch
+    rm -f xml/aclocal.m4
+endif
+
+.xml: xml
+    (cd xml; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install)
+    $(INSTALL_NAME)
+    touch $@
+
+CLEAN_FILE += .xml
+CLEAN_PKG += xml
+DISTCLEAN_PKG += libxml2-$(XML_VERSION).tar.gz
+
+
+# ***************************************************************************
-# twolame
-# ***************************************************************************
@@ -1114 +1283 @@
-    $(EXTRACT_BZ2)
-    cat Patches/libpng.patch | sed s,PREFIX,$(PREFIX), | patch -p0
-
-
+
+
+
+
+
-    (cd $<; cp scripts/makefile.macosx Makefile && make && make install)
+else
+ifdef HAVE_WIN32
+    (cd $<; cp scripts/makefile.cygwin Makefile && make && make install)
+else
+    (cd $<;./configure $(HOSTCONF) --prefix=$(PREFIX) && make   && make install)
+endif
+endif
+    $(INSTALL_NAME)  
-    touch $@
-
@@ -1139 +1319 @@
-CLEAN_FILE += .zvbi
-CLEAN_PKG += zvbi
-
+#
-
-# ***************************************************************************
@@ -1152 +1332 @@
-
-.gpg-error: libgpg-error
-
+$(HOSTCONF) 
-    $(INSTALL_NAME)
-    touch $@
@@ -1164 +1344 @@
-# ***************************************************************************
-
-gz
+bz2
-    $(WGET) $(GCRYPT_URL)
-
-gz
-GZ
-
+bz2
+BZ2
+#
-
-.gcrypt: libgcrypt .gpg-error
-
+
+
-    $(INSTALL_NAME)
-    touch $@
@@ -1178 +1359 @@
-CLEAN_FILE += .gcrypt
-CLEAN_PKG += libgcrypt
-gz
+bz2
-
-# ***************************************************************************
@@ -1189 +1370 @@
-gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
-    $(EXTRACT_BZ2)
+    (cd gnutls/gl ;ln -s alloca_.h alloca.h)
-
-.gnutls: gnutls .gcrypt .gpg-error
-
+
+
+
+
+
-    $(INSTALL_NAME)
-    touch $@
@@ -1274 +1460 @@
-
-# ***************************************************************************
+# Gecko SDK win32
+# ***************************************************************************
+
+gecko-sdk-i586-pc-msvc-1.7.5.zip:
+    $(WGET) $(GECKO_SDK_WIN32_URL)
+
+libIDL-0.6.3-win32-bin.zip:
+    $(WGET) $(LIBIDL_WIN32_BIN_URL)
+
+vc71-glib-1.2.10-bin.zip:
+    $(WGET) $(VC71_GLIB_WIN32_BIN_URL)
+
+gecko-sdk-win32: gecko-sdk-i586-pc-msvc-1.7.5.zip libIDL-0.6.3-win32-bin.zip vc71-glib-1.2.10-bin.zip
+    unzip  gecko-sdk-i586-pc-msvc-1.7.5.zip
+    rm -rf ../gecko-sdk
+    mv gecko-sdk ..
+    unzip libIDL-0.6.3-win32-bin.zip
+    unzip vc71-glib-1.2.10-bin.zip
+    mv libIDL-0.6.3-win32-bin/libIDL-0.6.dll ../gecko-sdk/bin
+    rm -rf libIDL-0.6.3-win32-bin
+    mv vc71/bin/glib-1.2.dll ../gecko-sdk/bin
+    rm -rf vc71
+
+.gecko-win32: gecko-sdk-win32
+    touch $@
+
+CLEAN_FILE += .gecko-win32
+CLEAN_PKG += gecko-sdk-win32
+DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.7.5.zip libIDL-0.6.3-win32-bin.zip vc71-glib-1.2.10-bin.zip
+
+# ***************************************************************************
-# mozilla
-# ***************************************************************************
@@ -1302 +1519 @@
-
-.jpeg: jpeg
---prefix=$(PREFIX) CFLAGS="$(CFLAGS)"
+$(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC)
-    $(RANLIB) $(PREFIX)/lib/libjpeg.a
-    touch $@
@@ -1321 +1538 @@
-    $(EXTRACT_GZ)
-    patch -p 0 < Patches/tiff.patch
+ifneq ($(HOST),$(BUILD))
+    patch -p 0 < Patches/tiff-cross.patch
+endif
-
-.tiff: tiff
-./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
+ ./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 
-    touch $@
-
@@ -1342 +1562 @@
-
-.SDL: SDL
-
+$(HOSTCONF) 
-    $(INSTALL_NAME)
-    touch $@
@@ -1362 +1582 @@
-
-.SDL_image: SDL_image .SDL .png .jpeg .tiff
-
+$(HOSTCONF) 
-    $(INSTALL_NAME)
-    touch $@
@@ -1387 +1607 @@
-CLEAN_PKG += libmpcdec
-DISTCLEAN_PKG += libmpcdec-$(MUSE_VERSION).tar.bz2
+
+
+
+# ***************************************************************************
+ # Dirac
+ # ***************************************************************************
+
+dirac-$(DIRAC_VERSION).tar.gz:
+    $(WGET) $(DIRAC_URL)
+
+dirac: dirac-$(DIRAC_VERSION).tar.gz
+    $(EXTRACT_GZ)
+ifneq ($(HOST),$(BUILD))
+    patch -p 0 <Patches/dirac-cross.patch
+    (cd $@; autoconf && automake)
+endif
+
+.dirac: dirac
+    (cd $<; aclocal && ./configure $(HOSTCONF) --prefix=$(PREFIX)  CFLAGS="$(CFLAGS)" && DOC_DIR="" make && DOC_DIR="" make install)
+    $(INSTALL_NAME)
+    touch $@
+
+CLEAN_FILE += .dirac
+CLEAN_PKG += dirac
+DISTCLEAN_PKG += dirac-$(DIRAC_VERSION).tar.gz
+
+# *************************************************************************
+# DirectX headers
+# *************************************************************************
+win32-dx7headers.tgz:
+    $(WGET) $(DX_HEADERS_URL)
+.dx_headers: win32-dx7headers.tgz
+    (cd ../include ; tar xzf ../src/$<)
+    touch $@
+CLEAN_FILE += .dx_headers
+DISTCLEAN_PKG += win32-dx7headers.tgz
+ 
+# *************************************************************************
+# DirectShow headers
+# *************************************************************************
+dshow-headers.tgz:
+    $(WGET) $(DSHOW_HEADERS_URL)
+.dshow_headers: dshow-headers.tgz
+    (cd ../include ; tar xzf ../src/$<)
+    touch $@
+CLEAN_FILE += .dshow_headers
+DISTCLEAN_PKG += dshow-headers.tgz
+                                                          
-
-# ***************************************************************************

extras/contrib/src/Patches/libdvdread.patch

@@ -1 @@
-Only in libdvdread/dvdread: .dvd_input.c.swp
-diff -ru libdvdread-0.9.4/dvdread/bswap.h libdvdread/dvdread/bswap.h
---- libdvdread-0.9.4/dvdread/bswap.h    2002-12-15 01:09:12.000000000 +0100
@@ -7 +6 @@
-  */
- 
-
-
+ || defined(WIN32)
+WIN32) || defined(
- #define B2N_16(x) \
-  x = ((((x) & 0xff00) >> 8) | \
@@ -15 +14 @@
---- libdvdread-0.9.4/dvdread/dvd_reader.c   2003-02-13 23:31:21.000000000 +0100
-+++ libdvdread/dvdread/dvd_reader.c 2005-08-31 19:24:57.000000000 +0200
-03,8 +303
-if( path == NULL )
-      return 0;
-
-
-
-
-
-
-
+24,8 +324
+else
+#endif
+    {
+    
+    
+    
+    
+    
+    
-@@ -315,7 +314,7 @@
-     have_css = dvdinput_setup();
@@ -69 +68 @@
- }
- 
-Only in libdvdread/dvdread: dvd_reader.c.orig

extras/contrib/src/Patches/libiconv.patch

@@ -1 @@
-diff -Naur libiconv.old/lib/aliases.gperf libiconv/lib/aliases.gperf
---- libiconv.old/lib/aliases.gperf  2003-05-22 22:17:15.000000000 +0200
-+++ libiconv/lib/aliases.gperf  2005-08-04 18:54:43.000000000 +0200
-@@ -21,6 +21,7 @@
- US, ei_ascii
- CSASCII, ei_ascii
- UTF-8, ei_utf8
-+UTF-8-MAC, ei_utf8mac
- UCS-2, ei_ucs2
- ISO-10646-UCS-2, ei_ucs2
- CSUNICODE, ei_ucs2
-diff -Naur libiconv.old/lib/aliases.h libiconv/lib/aliases.h
---- libiconv.old/lib/aliases.h  2003-05-22 22:17:17.000000000 +0200
-+++ libiconv/lib/aliases.h  2005-08-04 18:54:43.000000000 +0200
-@@ -1,4 +1,4 @@
--/* ANSI-C code produced by gperf version 3.0 */
-+/* ANSI-C code produced by gperf version 3.0.1 */
- /* Command-line: gperf -m 10 lib/aliases.gperf  */
- /* Computed positions: -k'1,3-11,$' */
- 
-@@ -32,7 +32,7 @@
- #line 1 "lib/aliases.gperf"
- struct alias { int name; unsigned int encoding_index; };
- 
--#define TOTAL_KEYWORDS 324
-+#define TOTAL_KEYWORDS 325
- #define MIN_WORD_LENGTH 2
- #define MAX_WORD_LENGTH 45
- #define MIN_HASH_VALUE 15
-@@ -55,11 +55,11 @@
-       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880,   6,  69, 880,  44,   5,
--        6,  18,  60,   9,   8,  50,  14,  13, 271, 880,
-+      880, 880, 880, 880, 880,   6, 142, 880,  44,   5,
-+        6,  18,  60,   9,   8,  50,  14,  13, 291, 880,
-       880, 880, 880, 880, 880, 107, 152,   5,  29,   7,
--       43, 112,  42,   5, 341, 106,  10, 158,   8,   5,
--        6, 880,  61,  38,  98, 152, 194, 112,  30,  10,
-+      205, 112,  42,   5, 341, 106,  10, 158,   8,   5,
-+        6, 880,  61,  38,  98, 152, 110, 112,  30,  10,
-         6, 880, 880, 880, 880,  60, 880, 880, 880, 880,
-       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-@@ -205,6 +205,7 @@
-     char stringpool_str171[sizeof("MAC")];
-     char stringpool_str172[sizeof("ISO_8859-3")];
-     char stringpool_str173[sizeof("ISO-IR-109")];
-+    char stringpool_str174[sizeof("VISCII")];
-     char stringpool_str175[sizeof("ISO8859-7")];
-     char stringpool_str176[sizeof("ISO-8859-10")];
-     char stringpool_str177[sizeof("CSASCII")];
-@@ -212,6 +213,7 @@
-     char stringpool_str179[sizeof("ISO-IR-179")];
-     char stringpool_str182[sizeof("ISO-8859-7")];
-     char stringpool_str184[sizeof("ISO-IR-203")];
-+    char stringpool_str186[sizeof("CSVISCII")];
-     char stringpool_str189[sizeof("ISO-IR-149")];
-     char stringpool_str190[sizeof("MS-EE")];
-     char stringpool_str191[sizeof("ISO-IR-148")];
-@@ -237,34 +239,28 @@
-     char stringpool_str222[sizeof("ISO-IR-14")];
-     char stringpool_str225[sizeof("ELOT_928")];
-     char stringpool_str227[sizeof("LATIN7")];
--    char stringpool_str228[sizeof("UTF-16")];
-+    char stringpool_str228[sizeof("TCVN")];
-     char stringpool_str230[sizeof("ISO_8859-10")];
-     char stringpool_str232[sizeof("CSUNICODE")];
-     char stringpool_str233[sizeof("UCS-2LE")];
--    char stringpool_str234[sizeof("UTF-8")];
-     char stringpool_str235[sizeof("ISO-IR-100")];
-     char stringpool_str236[sizeof("ISO_8859-7")];
--    char stringpool_str237[sizeof("UTF-32")];
-     char stringpool_str238[sizeof("CHAR")];
-     char stringpool_str241[sizeof("UNICODE-1-1")];
-     char stringpool_str242[sizeof("CSUNICODE11")];
-     char stringpool_str244[sizeof("TIS620")];
-     char stringpool_str245[sizeof("EUCKR")];
--    char stringpool_str246[sizeof("UTF-16LE")];
-     char stringpool_str247[sizeof("LATIN4")];
-     char stringpool_str250[sizeof("KSC_5601")];
-     char stringpool_str251[sizeof("TIS-620")];
-     char stringpool_str252[sizeof("EUC-KR")];
-     char stringpool_str254[sizeof("IBM-CP1133")];
-     char stringpool_str256[sizeof("ISO_8859-4")];
--    char stringpool_str257[sizeof("UTF-32LE")];
--    char stringpool_str258[sizeof("VISCII")];
-     char stringpool_str259[sizeof("KOI8-R")];
-     char stringpool_str262[sizeof("ISO_8859-14")];
-     char stringpool_str264[sizeof("CSKOI8R")];
-     char stringpool_str266[sizeof("GREEK8")];
-     char stringpool_str267[sizeof("MS-CYRL")];
--    char stringpool_str270[sizeof("CSVISCII")];
-     char stringpool_str280[sizeof("IBM850")];
-     char stringpool_str283[sizeof("ISO-IR-144")];
-     char stringpool_str286[sizeof("BIG5")];
-@@ -283,12 +279,11 @@
-     char stringpool_str303[sizeof("KOREAN")];
-     char stringpool_str304[sizeof("CSISOLATIN2")];
-     char stringpool_str305[sizeof("CN-BIG5")];
--    char stringpool_str306[sizeof("UTF-7")];
-+    char stringpool_str307[sizeof("TCVN-5712")];
-     char stringpool_str308[sizeof("CSISOLATIN6")];
-     char stringpool_str309[sizeof("CSISOLATINCYRILLIC")];
-     char stringpool_str310[sizeof("CSISOLATIN5")];
--    char stringpool_str312[sizeof("TCVN")];
--    char stringpool_str315[sizeof("TIS620.2529-1")];
-+    char stringpool_str312[sizeof("TCVN5712-1")];
-     char stringpool_str318[sizeof("CSGB2312")];
-     char stringpool_str320[sizeof("ISO-10646-UCS-2")];
-     char stringpool_str321[sizeof("UCS-4")];
-@@ -301,12 +296,12 @@
-     char stringpool_str328[sizeof("CSISOLATIN3")];
-     char stringpool_str329[size