* Backport to 0.8.5-1 of all contrib updates on trunk between [15211] and [16403]

extras/contrib/bootstrap

@@ -43,11 +43,6 @@ fi
 rm -f config.mak
 echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
 
-echo "BUILD = $BUILD" >> config.mak
-echo "HOST = $HOST" >> config.mak
-
-echo "PREFIX = `pwd`" >> config.mak
-
 if test "$HOST" != "$BUILD"; then
     CC="${HOST}-gcc"
     CXX="${HOST}-g++"
@@ -73,8 +68,8 @@ case $HOST in
 	    echo "HAVE_DARWIN_OS = 1" >> config.mak
             echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
 	    echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
-	    EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-	    EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+	    #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+	    #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
 	    echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i686-apple-darwin8)
@@ -117,10 +112,11 @@ case $HOST in
         ;;
     i686-pc-cygwin)
             echo "HAVE_WIN32 = 1" >> config.mak
-            CC="gcc -mno-cygwin"
-            CXX="g++ -mno-cygwin"
-            EXTRA_CFLAGS=" -mno-cygwin"
-            EXTRA_CPPFLAGS=" -mno-cygwin"
+            CC="gcc -mno-cygwin -isystem /usr/include/mingw"
+            CXX="g++ -mno-cygwin -isystem /usr/include/mingw"
+            HOST=`$CC -dumpmachine`
+            EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
+            EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
             EXTRA_LDFLAGS=" -mno-cygwin"
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         ;;
@@ -133,6 +129,11 @@ case $HOST in
         ;;
 esac
 
+echo "BUILD = $BUILD" >> config.mak
+echo "HOST = $HOST" >> config.mak
+
+echo "PREFIX = `pwd`" >> config.mak
+
 echo "CC = ${CC}" >> config.mak
 echo "CXX = ${CXX}" >> config.mak
 echo "LD = ${LD}" >> config.mak
@@ -156,6 +157,8 @@ if test -f /sw/bin/svn; then
         echo "SVN = /sw/bin/svn" >> config.mak
 elif test -f /usr/local/bin/svn; then
         echo "SVN = /usr/local/bin/svn" >> config.mak
+elif test -f /opt/local/bin/svn; then
+	echo "SVN = /opt/local/bin/svn" >> config.mak
 elif svn help >/dev/null 2>&1; then
         echo "SVN = svn" >> config.mak
 else

extras/contrib/src/Makefile

-# ***************************************************************************
+#***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
 # Copyright (C) 2003 - 2006 the VideoLAN team
@@ -8,8 +8,9 @@
 #          Derk-Jan Hartman <hartman at videolan dot org>
 #          Eric Petit <titer@m0k.org>
 #          Felix Kühne <fkuehne@users.sourceforge.net>
-#          Christophe Mutricy <xtophe@nxtelevision.com>
+#          Christophe Mutricy <xtophe AT xtelevision.com>
 #          Gildas Bazin <gbazin at videolan dot org>
+#          Damien Fouilleul <damienf at videolan dot org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -81,14 +82,24 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
-ifneq ($(BUILD),$(HOST))
-# We are cross compiling
-HOSTCONF=--host=$(HOST) --build=$(BUILD)
-FFMPEGCONF=--cross-prefix=$(HOST)-
-X264CONF=--crosscompile=$(HOST)
-else
-   ifneq ($(CC),)
+# For ffmpeg if not cross compiling
+ifneq ($(CC),)
   FFMPEGCONF=--cc="$(CC)"
+endif
+
+#
+# cross compiling
+#
+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
+    #
+    HOSTCONF=--host=$(HOST) --build=$(BUILD)
+    ifeq ($(findstring cygwin,$(BUILD)),)
+	# We are REALLY cross compiling
+	FFMPEGCONF=--cross-prefix=$(HOST)-
+	X264CONF=--crosscompile=$(HOST)
     endif
 endif
 
@@ -108,12 +119,15 @@ FFMPEGCONF+= --enable-mp3lame --enable-faac
 endif
 
 ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86
+FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos
 endif
 
 ifeq ($(HOST),i686-apple-darwin8)
 FFMPEGCONF += --enable-memalign-hack
 X264CONF += --enable-pic
+ifneq ($(HOST),i686-apple-darwin8)
+FFMPEG_CFLAGS += -DHAVE_LRINTF
+endif
 endif
 
 # ***************************************************************************
@@ -160,7 +174,7 @@ else
 	.FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.gnutls .dvdnav .dvbpsi .wxwidgets .dirac \
+	.dvdnav .dvbpsi .wxwidgets .qt4 .dirac \
 	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
 #	.SDL_image  .daap .cddb .cdio .vcdimager .portaudio 
   else
@@ -176,8 +190,9 @@ else
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame\
 	.png .gpg-error .gcrypt .gnutls .mpcdec\
-	.gnutls .dvdnav .dvbpsi .wxwidgets .dirac \
+	.dvdnav .dvbpsi .wxwidgets .dirac \
 	.aclocal .libdca
+#	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
   endif
@@ -191,17 +206,26 @@ FORCE:
 # ***************************************************************************
 
 define EXTRACT_GZ
-	tar xzf $<
+	rm -rf $@ || true
+	tar xzf $< --exclude='[*?:<>\|]' 
 	mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true
 	touch $@
 endef
 
 define EXTRACT_BZ2
-	bunzip2 -c $< | tar xf -
+	rm -rf $@ || true
+	bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' 
 	mv $(patsubst %.tar.bz2,%,$(notdir $<)) $@ || true
 	touch $@
 endef
 
+define EXTRACT_ZIP
+	rm -rf $@ || true
+	unzip $<
+	mv $(patsubst %.zip,%,$(notdir $<)) $@ || true
+	touch $@
+endef
+
 ### Darwin-specific ###
 # These macros prepare the dynamic libraries for inclusion in the Mac OS X
 # bundle. For instance if you're building a library named libtoto.dylib,
@@ -667,10 +691,16 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/theora.patch
+	patch -p0 < Patches/theora-1.0a7.patch
 	(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 $@
 
@@ -692,7 +722,7 @@ ifdef HAVE_WIN32
 	(cd $@; aclocal && automake)
 endif
   
-.shout: libshout .theora .ogg
+.shout: libshout .theora .ogg .speex
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install )
 	$(INSTALL_NAME)
 	touch $@
@@ -744,6 +774,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)
@@ -778,7 +811,7 @@ faad: faad2-$(FAAD2_VERSION).tar.bz2
 	touch $@
 
 CLEAN_FILE += .faad
-CLEAN_PKG += faad2
+CLEAN_PKG += faad
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
 
 # ***************************************************************************
@@ -886,19 +919,12 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 # ***************************************************************************
 
 ffmpeg:
-	echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
-	CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
+	$(SVN) co $(FFMPEG_SVN)  ffmpeg
 ifeq ($(HOST),i586-pc-beos)
-	(cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch)
-endif
-ifdef HAVE_WIN32
-	patch -p 0 < Patches/ffmpeg-cvs-win32.patch
+	(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
 ifdef HAVE_WINCE
-	patch -p 1 < Patches/ffmpeg-cvs-wince.patch
-endif
-ifeq ($(HOST),i686-apple-darwin8)
-	(cd $@;patch -p 0 < ../Patches/ffmpeg-cvs-mactel.patch)
+	patch -p 1 < Patches/ffmpeg-svn-wince.patch
 endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
@@ -913,7 +939,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(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 && make install-libs install-headers)
 	touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -1052,8 +1078,8 @@ ifdef HAVE_DARWIN_OS
 	(cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
 	(cd $<; ./genMakefiles macosx && make)
 else
-	(cd $<; if [ ! -f groupsock/Makefile.head.orig ] then ; sed -e 's/=/= $$\(EXTRA_CPPFLAGS\)/'  -e 's%EXTRA_CPPFLAGS%$(EXTRA_CPPFLAGS)%' -e 's/$$\(//' -e 's/\)//' -i.orig groupsock/Makefile.head fi )
-	(cd $<; ./genMakefiles && make $(HOSTCC))
+	(cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head)
+	(cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
 endif
@@ -1098,6 +1124,9 @@ 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 -)
+endif
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -1301,6 +1330,25 @@ CLEAN_FILE += .wxwidgets
 CLEAN_PKG += wxwidgets
 DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 
+# ***************************************************************************
+# qt4 (win32 binary)
+# ***************************************************************************
+
+qt4-$(QT4_VERSION)-win32-bin.tar.gz:
+	$(WGET) $(QT4_URL)
+
+qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
+	$(EXTRACT_GZ)
+
+
+.qt4: qt4
+	(cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin)
+	touch $@
+
+CLEAN_FILE += .qt4
+CLEAN_PKG += qt4
+DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz
+
 # ***************************************************************************
 # zlib
 # ***************************************************************************
@@ -1380,6 +1428,9 @@ twolame-$(TWOLAME_VERSION).tar.gz:
 
 twolame: twolame-$(TWOLAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_BEOS
+	patch -p 0 < Patches/twolame-BeOS.patch
+endif
 
 .twolame: twolame
 	(cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -1404,6 +1455,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-makefile.patch)
+ifeq ($(HOST),i686-apple-darwin8)
+	(patch -p 0 < Patches/libpng-darwin-mactel.patch)
+endif
 
 .png: libpng 
 ifdef HAVE_DARWIN_OS
@@ -1411,8 +1466,12 @@ ifdef HAVE_DARWIN_OS
 else
 ifdef HAVE_WIN32
 	(cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static)
+else
+ifeq ($(PNG_VERSION),1.2.8)
+	(cd $<; PREFIX=$(PREFIX) DESTDIR=$(PREFIX) cp scripts/makefile.linux Makefile && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+endif
 endif
 	$(INSTALL_NAME)
 endif 
@@ -1449,6 +1508,7 @@ libgpg-error-$(GPGERROR_VERSION).tar.gz:
 
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p 0 < Patches/libgpg-error.patch
 
 .gpg-error: libgpg-error
 ifeq ($(HOST),i686-apple-darwin8)
@@ -1916,3 +1976,4 @@ clean-src: clean
 	rm -rf $(DISTCLEAN_PKG)
 
 distclean: clean-src
+

extras/contrib/src/Patches/ffmpeg-cvs-mactel.patch

-Index: libavcodec/i386/dsputil_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v
-retrieving revision 1.109
-diff -u -r1.109 dsputil_mmx.c
---- libavcodec/i386/dsputil_mmx.c	12 Jan 2006 22:43:17 -0000	1.109
-+++ libavcodec/i386/dsputil_mmx.c	26 Jan 2006 22:02:55 -0000
-@@ -52,7 +52,7 @@
- static const uint64_t ff_pb_3F attribute_used __attribute__ ((aligned(8))) = 0x3F3F3F3F3F3F3F3FULL;
- static const uint64_t ff_pb_FC attribute_used __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
- 
--#define JUMPALIGN() __asm __volatile (".balign 8"::)
-+#define JUMPALIGN() __asm __volatile (".p2align 3"::)
- #define MOVQ_ZERO(regd)  __asm __volatile ("pxor %%" #regd ", %%" #regd ::)
- 
- #define MOVQ_WONE(regd) \
-@@ -195,7 +195,7 @@
-     asm volatile(
-         "mov $-128, %%"REG_a"           \n\t"
-         "pxor %%mm7, %%mm7              \n\t"
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%0), %%mm0               \n\t"
-         "movq (%0, %2), %%mm2           \n\t"
-@@ -223,7 +223,7 @@
-     asm volatile(
-         "pxor %%mm7, %%mm7              \n\t"
-         "mov $-128, %%"REG_a"           \n\t"
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%0), %%mm0               \n\t"
-         "movq (%1), %%mm2               \n\t"
-@@ -366,7 +366,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movd (%1), %%mm0              \n\t"
-          "movd (%1, %3), %%mm1          \n\t"
-@@ -392,7 +392,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movq (%1), %%mm0              \n\t"
-          "movq (%1, %3), %%mm1          \n\t"
-@@ -418,7 +418,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movq (%1), %%mm0              \n\t"
-          "movq 8(%1), %%mm4             \n\t"
-Index: libavcodec/i386/dsputil_mmx_avg.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx_avg.h,v
-retrieving revision 1.29
-diff -u -r1.29 dsputil_mmx_avg.h
---- libavcodec/i386/dsputil_mmx_avg.h	12 Jan 2006 22:43:17 -0000	1.29
-+++ libavcodec/i386/dsputil_mmx_avg.h	26 Jan 2006 22:02:55 -0000
-@@ -754,7 +754,7 @@
-         "lea (%3, %3), %%"REG_a"        \n\t"
-         "movq (%1), %%mm0               \n\t"
-         PAVGB" 1(%1), %%mm0             \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm2    \n\t"
-         "movq (%1, %3), %%mm1           \n\t"
-Index: libavcodec/i386/dsputil_mmx_rnd.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h,v
-retrieving revision 1.22
-diff -u -r1.22 dsputil_mmx_rnd.h
---- libavcodec/i386/dsputil_mmx_rnd.h	12 Jan 2006 22:43:17 -0000	1.22
-+++ libavcodec/i386/dsputil_mmx_rnd.h	26 Jan 2006 22:02:55 -0000
-@@ -28,7 +28,7 @@
-     MOVQ_BFE(mm6);
-     __asm __volatile(
-         "lea    (%3, %3), %%"REG_a"     \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   1(%1), %%mm1            \n\t"
-@@ -69,7 +69,7 @@
-         "movq   %%mm4, (%3)             \n\t"
-         "add    %5, %3                  \n\t"
-         "decl   %0                      \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   (%2), %%mm1             \n\t"
-@@ -110,7 +110,7 @@
-     MOVQ_BFE(mm6);
-     __asm __volatile(
-         "lea        (%3, %3), %%"REG_a" \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   1(%1), %%mm1            \n\t"
-@@ -168,7 +168,7 @@
-         "movq   %%mm5, 8(%3)            \n\t"
-         "add    %5, %3                  \n\t"
-         "decl   %0                      \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   (%2), %%mm1             \n\t"
-@@ -206,7 +206,7 @@
-     __asm __volatile(
-         "lea (%3, %3), %%"REG_a"        \n\t"
-         "movq (%1), %%mm0               \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %3), %%mm1         \n\t"
-         "movq   (%1, %%"REG_a"),%%mm2   \n\t"
-@@ -246,7 +246,7 @@
-         "paddusw %%mm1, %%mm5           \n\t"
-         "xor    %%"REG_a", %%"REG_a"    \n\t"
-         "add    %3, %1                  \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %%"REG_a"), %%mm0  \n\t"
-         "movq   1(%1, %%"REG_a"), %%mm2 \n\t"
-@@ -458,7 +458,7 @@
-     __asm __volatile(
-         "lea    (%3, %3), %%"REG_a"     \n\t"
-         "movq   (%1), %%mm0             \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %3), %%mm1         \n\t"
-         "movq   (%1, %%"REG_a"), %%mm2  \n\t"
-@@ -509,7 +509,7 @@
-         "paddusw %%mm1, %%mm5           \n\t"
-         "xor    %%"REG_a", %%"REG_a"    \n\t"
-         "add    %3, %1                  \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %%"REG_a"), %%mm0  \n\t"
-         "movq   1(%1, %%"REG_a"), %%mm2 \n\t"
-Index: libavcodec/i386/fdct_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/fdct_mmx.c,v
-retrieving revision 1.19
-diff -u -r1.19 fdct_mmx.c
---- libavcodec/i386/fdct_mmx.c	22 Dec 2005 01:10:09 -0000	1.19
-+++ libavcodec/i386/fdct_mmx.c	26 Jan 2006 22:02:55 -0000
-@@ -350,61 +350,67 @@
- 
- static always_inline void fdct_row_sse2(const int16_t *in, int16_t *out)
- {
-+#define FDCT_ROW_SSE2_H1(i,t) \
-+        "movq      " #i "(%0), %%xmm2      \n\t" \
-+        "movq      " #i "+8(%0), %%xmm0    \n\t" \
-+        "movdqa    " #t "+32(%1), %%xmm3   \n\t" \
-+        "movdqa    " #t "+48(%1), %%xmm7   \n\t" \
-+        "movdqa    " #t "(%1), %%xmm4      \n\t" \
-+        "movdqa    " #t "+16(%1), %%xmm5   \n\t"
-+
-+#define FDCT_ROW_SSE2_H2(i,t) \
-+        "movq      " #i "(%0), %%xmm2      \n\t" \
-+        "movq      " #i "+8(%0), %%xmm0    \n\t" \
-+        "movdqa    " #t "+32(%1), %%xmm3   \n\t" \
-+        "movdqa    " #t "+48(%1), %%xmm7   \n\t"
-+
-+#define FDCT_ROW_SSE2(i) \
-+        "movq      %%xmm2, %%xmm1       \n\t" \
-+        "pshuflw   $27, %%xmm0, %%xmm0  \n\t" \
-+        "paddsw    %%xmm0, %%xmm1       \n\t" \
-+        "psubsw    %%xmm0, %%xmm2       \n\t" \
-+        "punpckldq %%xmm2, %%xmm1       \n\t" \
-+        "pshufd    $78, %%xmm1, %%xmm2  \n\t" \
-+        "pmaddwd   %%xmm2, %%xmm3       \n\t" \
-+        "pmaddwd   %%xmm1, %%xmm7       \n\t" \
-+        "pmaddwd   %%xmm5, %%xmm2       \n\t" \
-+        "pmaddwd   %%xmm4, %%xmm1       \n\t" \
-+        "paddd     %%xmm7, %%xmm3       \n\t" \
-+        "paddd     %%xmm2, %%xmm1       \n\t" \
-+        "paddd     %%xmm6, %%xmm3       \n\t" \
-+        "paddd     %%xmm6, %%xmm1       \n\t" \
-+        "psrad     %3, %%xmm3           \n\t" \
-+        "psrad     %3, %%xmm1           \n\t" \
-+        "packssdw  %%xmm3, %%xmm1       \n\t" \
-+        "movdqa    %%xmm1, " #i "(%4)   \n\t"
-+
-     asm volatile(
--        ".macro FDCT_ROW_SSE2_H1 i t    \n\t"
--        "movq      \\i(%0), %%xmm2      \n\t"
--        "movq      \\i+8(%0), %%xmm0    \n\t"
--        "movdqa    \\t+32(%1), %%xmm3   \n\t"
--        "movdqa    \\t+48(%1), %%xmm7   \n\t"
--        "movdqa    \\t(%1), %%xmm4      \n\t"
--        "movdqa    \\t+16(%1), %%xmm5   \n\t"
--        ".endm                          \n\t"
--        ".macro FDCT_ROW_SSE2_H2 i t    \n\t"
--        "movq      \\i(%0), %%xmm2      \n\t"
--        "movq      \\i+8(%0), %%xmm0    \n\t"
--        "movdqa    \\t+32(%1), %%xmm3   \n\t"
--        "movdqa    \\t+48(%1), %%xmm7   \n\t"
--        ".endm                          \n\t"
--        ".macro FDCT_ROW_SSE2 i         \n\t"
--        "movq      %%xmm2, %%xmm1       \n\t"
--        "pshuflw   $27, %%xmm0, %%xmm0  \n\t"
--        "paddsw    %%xmm0, %%xmm1       \n\t"
--        "psubsw    %%xmm0, %%xmm2       \n\t"
--        "punpckldq %%xmm2, %%xmm1       \n\t"
--        "pshufd    $78, %%xmm1, %%xmm2  \n\t"
--        "pmaddwd   %%xmm2, %%xmm3       \n\t"
--        "pmaddwd   %%xmm1, %%xmm7       \n\t"
--        "pmaddwd   %%xmm5, %%xmm2       \n\t"
--        "pmaddwd   %%xmm4, %%xmm1       \n\t"
--        "paddd     %%xmm7, %%xmm3       \n\t"
--        "paddd     %%xmm2, %%xmm1       \n\t"
--        "paddd     %%xmm6, %%xmm3       \n\t"
--        "paddd     %%xmm6, %%xmm1       \n\t"
--        "psrad     %3, %%xmm3           \n\t"
--        "psrad     %3, %%xmm1           \n\t"
--        "packssdw  %%xmm3, %%xmm1       \n\t"
--        "movdqa    %%xmm1, \\i(%4)      \n\t"
--        ".endm                          \n\t"
-+//        ".macro FDCT_ROW_SSE2_H1 i t    \n\t"
-+//        ".endm                          \n\t"
-+//        ".macro FDCT_ROW_SSE2_H2 i t    \n\t"
-+//        ".endm                          \n\t"
-+//        ".macro FDCT_ROW_SSE2 i         \n\t"
-+//        ".endm                          \n\t"
-         "movdqa    (%2), %%xmm6         \n\t"
--        "FDCT_ROW_SSE2_H1 0 0           \n\t"
--        "FDCT_ROW_SSE2 0                \n\t"
--        "FDCT_ROW_SSE2_H2 64 0          \n\t"
--        "FDCT_ROW_SSE2 64               \n\t"
--
--        "FDCT_ROW_SSE2_H1 16 64         \n\t"
--        "FDCT_ROW_SSE2 16               \n\t"
--        "FDCT_ROW_SSE2_H2 112 64        \n\t"
--        "FDCT_ROW_SSE2 112              \n\t"
--
--        "FDCT_ROW_SSE2_H1 32 128        \n\t"
--        "FDCT_ROW_SSE2 32               \n\t"
--        "FDCT_ROW_SSE2_H2 96 128        \n\t"
--        "FDCT_ROW_SSE2 96               \n\t"
--
--        "FDCT_ROW_SSE2_H1 48 192        \n\t"
--        "FDCT_ROW_SSE2 48               \n\t"
--        "FDCT_ROW_SSE2_H2 80 192        \n\t"
--        "FDCT_ROW_SSE2 80               \n\t"
-+        FDCT_ROW_SSE2_H1(0,0)
-+        FDCT_ROW_SSE2(0)
-+        FDCT_ROW_SSE2_H2(64,0)
-+        FDCT_ROW_SSE2(64)
-+
-+        FDCT_ROW_SSE2_H1(16,64)
-+        FDCT_ROW_SSE2(16)
-+        FDCT_ROW_SSE2_H2(112,64)
-+        FDCT_ROW_SSE2(112)
-+
-+        FDCT_ROW_SSE2_H1(32,128)
-+        FDCT_ROW_SSE2(32)
-+        FDCT_ROW_SSE2_H2(96,128)
-+        FDCT_ROW_SSE2(96)
-+
-+        FDCT_ROW_SSE2_H1(48,192)
-+        FDCT_ROW_SSE2(48)
-+        FDCT_ROW_SSE2_H2(80,192)
-+        FDCT_ROW_SSE2(80)
-         :
-         : "r" (in), "r" (tab_frw_01234567_sse2.tab_frw_01234567_sse2), "r" (fdct_r_row_sse2.fdct_r_row_sse2), "i" (SHIFT_FRW_ROW), "r" (out)
-     );
-Index: libavcodec/i386/idct_mmx_xvid.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/idct_mmx_xvid.c,v
-retrieving revision 1.4
-diff -u -r1.4 idct_mmx_xvid.c
---- libavcodec/i386/idct_mmx_xvid.c	12 Jan 2006 22:43:18 -0000	1.4
-+++ libavcodec/i386/idct_mmx_xvid.c	26 Jan 2006 22:02:55 -0000
-@@ -295,17 +295,17 @@
-   "movq 8+" #A1 ",%%mm1                \n\t"/* 1     ; x7 x6 x5 x4*/\
-   "movq %%mm0,%%mm2                \n\t"/* 2     ; x3 x2 x1 x0*/\
-   "movq " #A3 ",%%mm3                  \n\t"/* 3     ; w05 w04 w01 w00*/\
--  "pshufw $0b10001000,%%mm0,%%mm0  \n\t"/* x2 x0 x2 x0*/\
-+  "pshufw $0x88,%%mm0,%%mm0  \n\t"/* x2 x0 x2 x0*/\
-   "movq 8+" #A3 ",%%mm4                \n\t"/* 4     ; w07 w06 w03 w02*/\
-   "movq %%mm1,%%mm5                \n\t"/* 5     ; x7 x6 x5 x4*/\
-   "pmaddwd %%mm0,%%mm3             \n\t"/* x2*w05+x0*w04 x2*w01+x0*w00*/\
-   "movq 32+" #A3 ",%%mm6               \n\t"/* 6     ; w21 w20 w17 w16*/\
--  "pshufw $0b10001000,%%mm1,%%mm1  \n\t"/* x6 x4 x6 x4*/\
-+  "pshufw $0x88,%%mm1,%%mm1  \n\t"/* x6 x4 x6 x4*/\
-   "pmaddwd %%mm1,%%mm4             \n\t"/* x6*w07+x4*w06 x6*w03+x4*w02*/\
-   "movq 40+" #A3 ",%%mm7               \n\t"/* 7    ; w23 w22 w19 w18*/\
--  "pshufw $0b11011101,%%mm2,%%mm2  \n\t"/* x3 x1 x3 x1*/\
-+  "pshufw $0xdd,%%mm2,%%mm2  \n\t"/* x3 x1 x3 x1*/\
-   "pmaddwd %%mm2,%%mm6             \n\t"/* x3*w21+x1*w20 x3*w17+x1*w16*/\
--  "pshufw $0b11011101,%%mm5,%%mm5  \n\t"/* x7 x5 x7 x5*/\
-+  "pshufw $0xdd,%%mm5,%%mm5  \n\t"/* x7 x5 x7 x5*/\
-   "pmaddwd %%mm5,%%mm7             \n\t"/* x7*w23+x5*w22 x7*w19+x5*w18*/\
-   "paddd " #A4 ",%%mm3                 \n\t"/* +%4*/\
-   "pmaddwd 16+" #A3 ",%%mm0            \n\t"/* x2*w13+x0*w12 x2*w09+x0*w08*/\
-@@ -330,7 +330,7 @@
-   "packssdw %%mm0,%%mm3            \n\t"/* 0     ; y3 y2 y1 y0*/\
-   "packssdw %%mm4,%%mm7            \n\t"/* 4     ; y6 y7 y4 y5*/\
-   "movq %%mm3, " #A2 "                  \n\t"/* 3     ; save y3 y2 y1 y0*/\
--  "pshufw $0b10110001,%%mm7,%%mm7  \n\t"/* y7 y6 y5 y4*/\
-+  "pshufw $0xb1,%%mm7,%%mm7  \n\t"/* y7 y6 y5 y4*/\
-   "movq %%mm7,8                +" #A2 "\n\t"/* 7     ; save y7 y6 y5 y4*/\
- 
- 
-Index: libavcodec/i386/motion_est_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/motion_est_mmx.c,v
-retrieving revision 1.19
-diff -u -r1.19 motion_est_mmx.c
---- libavcodec/i386/motion_est_mmx.c	12 Jan 2006 22:43:18 -0000	1.19
-+++ libavcodec/i386/motion_est_mmx.c	26 Jan 2006 22:02:55 -0000
-@@ -34,7 +34,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -70,7 +70,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -92,7 +92,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -118,7 +118,7 @@
- { //FIXME reuse src
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "movq "MANGLE(bone)", %%mm5     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-@@ -155,7 +155,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm1    \n\t"
-@@ -193,7 +193,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm1    \n\t"
-Index: libavcodec/i386/mpegvideo_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx.c,v
-retrieving revision 1.37
-diff -u -r1.37 mpegvideo_mmx.c
---- libavcodec/i386/mpegvideo_mmx.c	12 Jan 2006 22:43:18 -0000	1.37
-+++ libavcodec/i386/mpegvideo_mmx.c	26 Jan 2006 22:02:55 -0000
-@@ -66,7 +66,7 @@
-                 "packssdw %%mm5, %%mm5          \n\t"
-                 "psubw %%mm5, %%mm7             \n\t"
-                 "pxor %%mm4, %%mm4              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %3), %%mm0           \n\t"
-                 "movq 8(%0, %3), %%mm1          \n\t"
-@@ -129,7 +129,7 @@
-                 "packssdw %%mm5, %%mm5          \n\t"
-                 "psubw %%mm5, %%mm7             \n\t"
-                 "pxor %%mm4, %%mm4              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %3), %%mm0           \n\t"
-                 "movq 8(%0, %3), %%mm1          \n\t"
-@@ -222,7 +222,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -285,7 +285,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -357,7 +357,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -418,7 +418,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-Index: libavcodec/i386/mpegvideo_mmx_template.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
-retrieving revision 1.29
-diff -u -r1.29 mpegvideo_mmx_template.c
---- libavcodec/i386/mpegvideo_mmx_template.c	12 Jan 2006 22:43:18 -0000	1.29
-+++ libavcodec/i386/mpegvideo_mmx_template.c	26 Jan 2006 22:02:55 -0000
-@@ -111,7 +111,7 @@
-             "pxor %%mm6, %%mm6                  \n\t"
-             "psubw (%3), %%mm6                  \n\t" // -bias[0]
-             "mov $-128, %%"REG_a"               \n\t"
--            ".balign 16                         \n\t"
-+            ".p2align 4                         \n\t"
-             "1:                                 \n\t"
-             "pxor %%mm1, %%mm1                  \n\t" // 0
-             "movq (%1, %%"REG_a"), %%mm0        \n\t" // block[i]
-@@ -155,7 +155,7 @@
-             "pxor %%mm7, %%mm7                  \n\t" // 0
-             "pxor %%mm4, %%mm4                  \n\t" // 0
-             "mov $-128, %%"REG_a"               \n\t"
--            ".balign 16                         \n\t"
-+            ".p2align 4                         \n\t"
-             "1:                                 \n\t"
-             "pxor %%mm1, %%mm1                  \n\t" // 0
-             "movq (%1, %%"REG_a"), %%mm0        \n\t" // block[i]
-Index: libavcodec/i386/simple_idct_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/simple_idct_mmx.c,v
-retrieving revision 1.16
-diff -u -r1.16 simple_idct_mmx.c
---- libavcodec/i386/simple_idct_mmx.c	12 Jan 2006 22:43:18 -0000	1.16
-+++ libavcodec/i386/simple_idct_mmx.c	26 Jan 2006 22:02:55 -0000
-@@ -459,13 +459,12 @@
- 
- 
- //IDCT(      src0,   src4,   src1,    src5,    dst, rounder, shift)
--COL_IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--COL_IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--COL_IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--COL_IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+COL_IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+COL_IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+COL_IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+COL_IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
- 
- #else
--
- #define DC_COND_IDCT(src0, src4, src1, src5, dst, rounder, shift) \
-         "movq " #src0 ", %%mm0          \n\t" /* R4     R0      r4      r0 */\
-         "movq " #src4 ", %%mm1          \n\t" /* R6     R2      r6      r2 */\
-@@ -783,10 +782,10 @@
- 
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
-         "#.balign 16                    \n\t"\
-@@ -860,10 +859,10 @@
-         "movd %%mm5, 80+" #dst "        \n\t"
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
-         "#.balign 16                    \n\t"\
-@@ -928,10 +927,10 @@
- 
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
-         "#.balign 16                    \n\t"\
-@@ -1007,10 +1006,10 @@
-         "movd %%mm5, 80+" #dst "        \n\t"
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
-         "#.balign 16                    \n\t"\
-@@ -1073,10 +1072,10 @@
- 
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
-         "#.balign 16                    \n\t"\
-@@ -1141,10 +1140,10 @@
- 
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    0(%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--//IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--//IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    0(%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+//IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+//IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
- 
-@@ -1217,10 +1216,10 @@
- 
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(    (%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
-         "jmp 9f                         \n\t"
- 
- 
-@@ -1259,10 +1258,10 @@
-         "movq %%mm0, 80+" #dst "        \n\t"
- 
- //IDCT(  src0,   src4,   src1,    src5,    dst, rounder, shift)
--IDCT(   0(%1), 64(%1), 32(%1),  96(%1),  0(%0),/nop, 20)
--//IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0),/nop, 20)
--IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0),/nop, 20)
--//IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0),/nop, 20)
-+IDCT(   0(%1), 64(%1), 32(%1),  96(%1),  0(%0), "nop", 20)
-+//IDCT(   8(%1), 72(%1), 40(%1), 104(%1),  4(%0), "nop", 20)
-+IDCT(  16(%1), 80(%1), 48(%1), 112(%1),  8(%0), "nop", 20)
-+//IDCT(  24(%1), 88(%1), 56(%1), 120(%1), 12(%0), "nop", 20)
- 
- 
- #endif

extras/contrib/src/Patches/ffmpeg-cvs-win32.patch

-Index: libavutil/common.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
-retrieving revision 1.153
-diff -u -r1.153 common.h
---- ffmpeg.orig/libavutil/common.h	19 Sep 2005 23:26:47 -0000	1.153
-+++ ffmpeg/libavutil/common.h	1 Nov 2005 21:40:31 -0000
-@@ -543,7 +543,7 @@
-     }\
- }
- 
--#ifndef HAVE_LRINTF
-+#if !defined(HAVE_LRINTF) && !defined(__MINGW32__)
- /* XXX: add ISOC specific test to avoid specific BSD testing. */
- /* better than nothing implementation. */
- /* btw, rintf() is existing on fbsd too -- alex */

extras/contrib/src/Patches/gnutls-win32.patch

---- gnutls.orig/lib/gnutls_buffers.c	2006-03-08 18:26:31.000000000 +0100
-+++ gnutls/lib/gnutls_buffers.c	2006-03-08 18:25:58.000000000 +0100
-@@ -244,7 +244,11 @@
- 	    _gnutls_read_log("READ: %d returned from %d, errno=%d\n", i,
+--- gnutls-1.4.0/lib/gnutls_buffers.c	2006-03-08 11:44:59.000000000 +0100
++++ gnutls/lib/gnutls_buffers.c	2006-07-12 14:29:06.000000000 +0200
+@@ -275,9 +275,12 @@
+ 	{
+ 	  _gnutls_read_log ("READ: %d returned from %d, errno=%d\n", i,
  			    fd, errno);
- 
+-
 +#ifdef _WIN32
 +       if (WSAGetLastError() == WSAEWOULDBLOCK) {
 +#else
- 	    if (errno == EAGAIN || errno == EINTR) {
+ 	  if (errno == EAGAIN || errno == EINTR)
+ 	    {
 +#endif
- 		if (sizeOfPtr - left > 0) {
+ 	      if (sizeOfPtr - left > 0)
+ 		{
  
- 		    _gnutls_read_log("READ: returning %d bytes from %d\n",
-@@ -635,7 +639,11 @@
- 						     left);
+@@ -707,8 +710,12 @@
  
- 	if (i == -1) {
+       if (i == -1)
+ 	{
 +#ifdef _WIN32
 +      if (WSAGetLastError() == WSAEWOULDBLOCK) {
 +#else
- 	    if (errno == EAGAIN || errno == EINTR) {
+ 	  if (errno == EAGAIN || errno == EINTR)
+ 	    {
 +#endif
- 		session->internals.record_send_buffer_prev_size +=
- 		    n - left;
+ 	      session->internals.record_send_buffer_prev_size += n - left;
  
+ 	      retval =

extras/contrib/src/Patches/goom2k4-0-nommx.patch

+--- configure.in.orig	2006-07-13 17:23:23.000000000 +0200
++++ configure.in	2006-07-13 17:23:37.000000000 +0200
+@@ -58,7 +58,7 @@
+ dnl ARCH
+ case "$host" in
+ i*86-*-*)
+-	AC_DEFINE(HAVE_MMX)
++#	AC_DEFINE(HAVE_MMX)
+ 	AC_DEFINE(CPU_X86)
+ 	HAVE_MMX="yes"
+ 	;;

extras/contrib/src/Patches/libgpg-error.patch

+--- libgpg-error/src/gpg-error.c	2005-12-18 15:24:34.000000000 +0000
++++ libgpg-error.patch/src/gpg-error.c	2006-07-27 23:10:46.000000000 +0100
+@@ -78,10 +78,14 @@
+   locale_dir = get_locale_dir ();
+   if (locale_dir)
+     {
++#ifdef ENABLE_NLS
+       bindtextdomain (PACKAGE, locale_dir);
++#endif
+       drop_locale_dir (locale_dir);
+     }
++#ifdef ENABLE_NLS
+   textdomain (PACKAGE);
++#endif
+ }
+ 
+ 

extras/contrib/src/Patches/libogg-1.1-win32.patch

@@ -3,9 +3,9 @@ Index: include/ogg/os_types.h
 RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
 retrieving revision 1.12
 diff -u -r1.12 os_types.h
---- include/ogg/os_types.h	18 Sep 2002 04:42:09 -0000	1.12
-+++ include/ogg/os_types.h	18 Apr 2003 13:48:18 -0000
-@@ -24,7 +24,7 @@
+--- libogg/include/ogg/os_types.h	18 Sep 2002 04:42:09 -0000	1.12
++++ libogg/include/ogg/os_types.h	18 Apr 2003 13:48:18 -0000
+@@ -27,7 +27,7 @@
  #define _ogg_realloc realloc
  #define _ogg_free    free
  

extras/contrib/src/Patches/libogg-1.1.3.patch

+--- ../libogg-1.1.3/configure.in	2005-11-28 05:26:07.000000000 +0100
++++ configure.in	2006-07-11 19:52:15.000000000 +0200
+@@ -45,27 +45,27 @@
+         case $host in 
+         *-*-linux*)
+                 DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O20 -ffast-math -fsigned-char"
++                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
+                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
+ 		;;
+         sparc-sun-*)
+                 DEBUG="-g -Wall -fsigned-char -mv8"
+-                CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
++                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
+                 PROFILE="-pg -g -O20 -fsigned-char -mv8" 
+ 		;;
+ 	*-*-darwin*)
+ 		DEBUG="-fno-common -g -Wall -fsigned-char"
+-		CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
++		EXTRA_CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
+ 		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
+ 		;;
+         *)
+                 DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O20 -fsigned-char"
++                EXTRA_CFLAGS="-O20 -fsigned-char"
+                 PROFILE="-O20 -g -pg -fsigned-char" 
+ 		;;
+         esac
+ fi
+-CFLAGS="$CFLAGS $cflags_save"
++CFLAGS="$EXTRA_CFLAGS $cflags_save"
+ DEBUG="$DEBUG $cflags_save"
+ PROFILE="$PROFILE $cflags_save"
+ 

extras/contrib/src/Patches/libogg-1.1.patch

-diff -ruN libogg-1.1.2/configure.in libogg/configure.in
---- libogg-1.1.2/configure.in	2004-09-23 15:30:58.000000000 +0200
-+++ libogg/configure.in	2005-11-14 22:16:04.000000000 +0100
-@@ -28,17 +28,17 @@
-         case $host in 
-         *-*-irix*)
-                 DEBUG="-g -signed" 
--                CFLAGS="-O2 -w -signed"
-+                EXTRA_CFLAGS="-O2 -w -signed"
-                 PROFILE="-p -g3 -O2 -signed"
- 		;;
-         sparc-sun-solaris*)
-                 DEBUG="-v -g"
--                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+                EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
- 		;;
-         *)
-                 DEBUG="-g"
--                CFLAGS="-O"
-+                EXTRA_CFLAGS="-O"
-                 PROFILE="-g -p" 
- 		;;
-         esac
-@@ -46,30 +46,30 @@
+--- /libogg-1.1.3/configure.in	2005-11-28 05:26:07.000000000 +0100
++++ libogg/configure.in	2006-07-11 19:52:15.000000000 +0200
+@@ -45,27 +45,27 @@
          case $host in 
          *-*-linux*)
                  DEBUG="-g -Wall -fsigned-char"
@@ -54,8 +32,4 @@ diff -ruN libogg-1.1.2/configure.in libogg/configure.in
 +CFLAGS="$EXTRA_CFLAGS $cflags_save"
  DEBUG="$DEBUG $cflags_save"
  PROFILE="$PROFILE $cflags_save"
--LDFLAGS="$LDFLAGS $ldflags_save"
-+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
- 
- dnl Checks for programs.
  

extras/contrib/src/Patches/libpng-darwin-mactel.patch

+--- libpng/scripts/makefile.darwin	2006-07-28 16:53:49.000000000 +0200
++++ libpng2/scripts/makefile.darwin	2006-07-28 16:45:50.000000000 +0200
+@@ -65,7 +65,7 @@
+ 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+ 	pngwtran.o pngmem.o pngerror.o pngpread.o 
+ 
+-OBJSDLL = $(OBJS:.o=.pic.o)
++OBJSDLL = $(OBJS:.o=.pic.o) pnggccrd.pic.o
+ 
+ .SUFFIXES:      .c .o .pic.o
+ 
+@@ -226,5 +226,6 @@
+ pngwtran.o pngwtran.pic.o: png.h pngconf.h
+ pngwutil.o pngwutil.pic.o: png.h pngconf.h
+ pngpread.o pngpread.pic.o: png.h pngconf.h
++pnggccrd.o pnggccrd.pic.o: png.h pngconf.h
+ 
+ pngtest.o: png.h pngconf.h

extras/contrib/src/Patches/libpng-makefile.patch

+--- libpng-1.2.8/scripts/makefile.linux	2004-12-03 01:14:31.000000000 +0100
++++ libpng/scripts/makefile.linux	2006-07-14 10:12:00.000000000 +0200
+@@ -13,7 +13,7 @@
+ # where "make install" puts libpng12.a, libpng12.so*,
+ # libpng12/png.h and libpng12/pngconf.h
+ # Prefix must be a full pathname.
+-prefix=/usr/local
++prefix=$(PREFIX)
+ exec_prefix=$(prefix)
+ 
+ # Where the zlib library and include files are located.
+@@ -53,7 +53,7 @@
+ # If you're going to install into a temporary location
+ # via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+ # you execute make install.
+-DESTDIR=
++#DESTDIR=
+ 
+ DB=$(DESTDIR)$(BINPATH)
+ DI=$(DESTDIR)$(INCPATH)

extras/contrib/src/Patches/libpng-osx.patch

---- libpng/scripts/makefile.darwin.orig	2004-12-03 00:14:31.000000000 +0000
-+++ libpng/scripts/makefile.darwin	2006-04-10 21:55:35.000000000 +0100
-@@ -7,7 +7,7 @@
+diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
+--- libpng-1.2.12/scripts/makefile.darwin	2006-06-27 22:22:40.000000000 +0200
++++ libpng/scripts/makefile.darwin	2006-07-27 12:07:18.000000000 +0200
+@@ -7,14 +7,14 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
  # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
 -prefix=/usr/local
 +prefix=??PREFIX??
+ exec_prefix=$(prefix)
  
  # Where the zlib library and include files are located
- #ZLIBLIB=/usr/local/lib
-@@ -16,8 +16,8 @@
- ZLIBINC=../zlib
+-#ZLIBLIB=/usr/local/lib
+-#ZLIBINC=/usr/local/include
+-ZLIBLIB=../zlib
+-ZLIBINC=../zlib
++ZLIBLIB=/usr/lib
++ZLIBINC=/usr/include
++#ZLIBLIB=../zlib
++#ZLIBINC=../zlib
+ 
+ # Library name:
+ LIBNAME = libpng12
+@@ -38,8 +38,8 @@
+ RANLIB=ranlib
+ RM_F=/bin/rm -f
  
- CC=cc
 -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
 +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
  
- #RANLIB=echo
- RANLIB=ranlib
-@@ -58,7 +58,7 @@
- .c.pic.o:
- 	$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
- 
--all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config
-+all: libpng.a pngtest libpng.pc libpng-config
- 
- libpng.a: $(OBJS)
- 	ar rc $@ $(OBJS)
-@@ -164,7 +164,7 @@
+ INCPATH=$(prefix)/include
+ LIBPATH=$(exec_prefix)/lib
+@@ -178,7 +178,7 @@
  	chmod 755 $(DB)/$(LIBNAME)-config
- 	(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+ 	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
  
 -install: install-static install-shared install-man install-config
 +install: install-static install-man install-config

extras/contrib/src/Patches/libpng-win32.patch

---- scripts/makefile.cygwin	2004-12-03 00:14:31.000000000 +0000
-+++ scripts/makefile.cygwin	2006-04-09 17:56:32.203125000 +0100
+--- scripts/makefile.cygwin	2006-06-27 22:22:40.000000000 +0200
++++ scripts/makefile.cygwin	2006-07-12 13:18:15.000000000 +0200
 @@ -35,7 +35,6 @@
  # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
  # list at the bottom of this makefile.
@@ -8,7 +8,7 @@
  ifdef MINGW
  MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
  MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
-@@ -43,13 +42,12 @@
+@@ -43,14 +42,13 @@
  
  # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
  ifndef prefix
@@ -16,6 +16,7 @@
 -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
 +prefix=??PREFIX??
  endif
+ exec_prefix=$(prefix)
  
  # Where the zlib library and include files are located
 -ZLIBLIB= /usr/lib
@@ -25,17 +26,17 @@
  #ZLIBLIB=../zlib
  #ZLIBINC=../zlib
  
-@@ -94,7 +92,9 @@
+@@ -95,7 +93,9 @@
  LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
  
- MKDIR=/bin/mkdir -pv
+ MKDIR_P=/bin/mkdir -pv
 +ifndef RANLIB
  RANLIB=ranlib
 +endif
  #RANLIB=echo
  
  INCPATH=$(prefix)/include
-@@ -173,10 +173,10 @@
+@@ -174,7 +174,7 @@
  	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
  
  $(STATLIB): $(OBJS)
@@ -43,8 +44,4 @@
 +	$(AR) rc $@ $(OBJS)
  	$(RANLIB) $@
  
--$(SHAREDDEF): scripts/png32ms.def
-+$(SHAREDDEF): scripts/pngw32.def
- 	cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
- 	sed -e 's/\([^;]*\);/;/' > $@
- 
+ $(SHAREDDEF): scripts/pngw32.def

extras/contrib/src/Patches/libvorbis-1.1.patch

@@ -65,9 +65,7 @@ diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
          esac
  fi
 -CFLAGS="$CFLAGS $cflags_save"
--LDFLAGS="$LDFLAGS $ldflags_save"
 +CFLAGS="$EXTRA_CFLAGS $cflags_save"
-+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
  
  dnl --------------------------------------------------
  dnl Check for headers

extras/contrib/src/Patches/live-osx.patch

@@ -15,8 +15,8 @@ diff -ruN live.orig/config.macosx live/config.macosx
 --- live.orig/config.macosx	2006-02-15 23:14:39.000000000 +0100
 +++ live/config.macosx	2006-02-22 21:53:01.000000000 +0100
 @@ -1,4 +1,4 @@
--COMPILE_OPTS =		$(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t
-+COMPILE_OPTS =		$(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE
+-COMPILE_OPTS =		$(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
++COMPILE_OPTS =		$(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
  C =			c
  C_COMPILER =		cc
  C_FLAGS =		$(COMPILE_OPTS)

extras/contrib/src/Patches/speex-BeOS.patch

+diff -ruN speex/libspeex/testecho.c speex-2/libspeex/testecho.c
+--- speex/libspeex/testecho.c	2006-02-11 22:39:51.000000000 +0000
++++ speex-2/libspeex/testecho.c	2006-08-01 12:00:22.000000000 +0000
+@@ -22,6 +22,7 @@
+    short echo_buf[NN], ref_buf[NN], e_buf[NN];
+    SpeexEchoState *st;
+    SpeexPreprocessState *den;
++   int tmp = 8000;
+ 
+    if (argc != 4)
+    {
+@@ -34,7 +35,6 @@
+ 
+    st = speex_echo_state_init(NN, TAIL);
+    den = speex_preprocess_state_init(NN, 8000);
+-   int tmp = 8000;
+    speex_echo_ctl(st, SPEEX_ECHO_SET_SAMPLING_RATE, &tmp);
+ 
+    while (read(ref_fd, ref_buf, NN*2))

extras/contrib/src/Patches/speex.patch

-diff -ru speex-1.1.10/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
---- speex-1.1.10/libspeex/stack_alloc.h	2005-04-25 07:58:00.000000000 +0000
-+++ speex/libspeex/stack_alloc.h	2005-09-20 19:59:55.049666072 +0000
-@@ -64,7 +64,7 @@
+diff -ruN speex-1.1.12/libspeex/kiss_fft.h speex/libspeex/kiss_fft.h
+--- speex-1.1.12/libspeex/kiss_fft.h	2005-12-22 12:14:33.000000000 +0100
++++ speex/libspeex/kiss_fft.h	2006-07-26 15:38:39.000000000 +0200
+@@ -5,7 +5,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <memory.h>
+-#include <malloc.h>
++//#include <malloc.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN speex-1.1.12/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
+--- speex-1.1.12/libspeex/stack_alloc.h	2006-01-31 23:25:10.000000000 +0100
++++ speex/libspeex/stack_alloc.h	2006-07-26 15:38:04.000000000 +0200
+@@ -109,7 +109,7 @@
  
  #endif
  
@@ -10,32 +22,32 @@ diff -ru speex-1.1.10/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
  #define VARDECL(var) 
  #define ALLOC(var, size, type) type var[size]
  #elif defined(USE_ALLOCA)
-diff -ruN speex-1.1.10/Makefile.am speex/Makefile.am
---- speex-1.1.10/Makefile.am	Thu Jun  9 08:22:08 2005
-+++ speex/Makefile.am	Fri Aug 26 14:55:35 2005
+diff -ruN speex-1.1.12/Makefile.am speex/Makefile.am
+--- speex-1.1.12/Makefile.am	2005-11-23 12:42:56.000000000 +0100
++++ speex/Makefile.am	2006-07-26 15:38:04.000000000 +0200
 @@ -13,9 +13,9 @@
- EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
+ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
  
  #Fools KDevelop into including all files
--SUBDIRS = libspeex include @src@ doc win32 symbian
-+SUBDIRS = libspeex include doc win32 symbian
+-SUBDIRS = libspeex include @src@ doc win32 symbian ti
++SUBDIRS = libspeex include doc win32 symbian ti
  
--DIST_SUBDIRS = libspeex include src doc win32 symbian
-+DIST_SUBDIRS = libspeex include doc win32 symbian
+-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
++DIST_SUBDIRS = libspeex include doc win32 symbian ti
  
  rpm: dist
  	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
-diff -ruN speex-1.1.10/Makefile.in speex/Makefile.in
---- speex-1.1.10/Makefile.in	Thu Jun  9 08:25:48 2005
-+++ speex/Makefile.in	Fri Aug 26 14:56:21 2005
+diff -ruN speex-1.1.12/Makefile.in speex/Makefile.in
+--- speex-1.1.12/Makefile.in	2006-02-10 11:13:16.000000000 +0100
++++ speex/Makefile.in	2006-07-26 15:38:04.000000000 +0200
 @@ -194,8 +194,8 @@
- EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
+ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
  
  #Fools KDevelop into including all files
--SUBDIRS = libspeex include @src@ doc win32 symbian
--DIST_SUBDIRS = libspeex include src doc win32 symbian
-+SUBDIRS = libspeex include doc win32 symbian
-+DIST_SUBDIRS = libspeex include doc win32 symbian
+-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
++SUBDIRS = libspeex include doc win32 symbian ti
++DIST_SUBDIRS = libspeex include doc win32 symbian ti
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  

extras/contrib/src/Patches/theora-1.0a7.patch

+Index: libtheora/lib/dsp.h
+===================================================================
+--- libtheora/lib/dsp.h (revision 11456)
++++ libtheora/lib/dsp.h (revision 11701)
+@@ -20,5 +20,4 @@
+ 
+ #include <theora/theora.h>
+-typedef unsigned long int ogg_uint64_t;
+ 
+ typedef struct
+Index: libtheora/lib/x86_64/dsp_mmx.c
+===================================================================
+--- libtheora/lib/x86_64/dsp_mmx.c (revision 11441)
++++ libtheora/lib/x86_64/dsp_mmx.c (revision 11701)
+@@ -20,4 +20,6 @@
+ #include "codec_internal.h"
+ #include "dsp.h"
++
++typedef unsigned long long ogg_uint64_t;
+ 
+ static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x0080008000800080LL;
+Index: libtheora/lib/x86_64/dsp_mmxext.c
+===================================================================
+--- libtheora/lib/x86_64/dsp_mmxext.c (revision 11441)
++++ libtheora/lib/x86_64/dsp_mmxext.c (revision 11701)
+@@ -21,4 +21,6 @@
+ #include "dsp.h"
+ 
++typedef unsigned long long ogg_uint64_t;
++
+ static ogg_uint32_t sad8x8__mmxext (unsigned char *ptr1, ogg_uint32_t stride1,
+                                     unsigned char *ptr2, ogg_uint32_t stride2)
+Index: libtheora/lib/x86_64/recon_mmx.c
+===================================================================
+--- libtheora/lib/x86_64/recon_mmx.c (revision 11441)
++++ libtheora/lib/x86_64/recon_mmx.c (revision 11701)
+@@ -17,4 +17,6 @@
+ 
+ #include "codec_internal.h"
++
++typedef unsigned long long ogg_uint64_t;
+ 
+ static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x8080808080808080LL;

extras/contrib/src/Patches/theora.patch

-diff -ruN libtheora-1.0alpha5/Makefile.am libtheora/Makefile.am
---- libtheora-1.0alpha5/Makefile.am	Mon Aug 15 20:02:15 2005
-+++ libtheora/Makefile.am	Thu Aug 25 21:11:34 2005
-@@ -2,7 +2,7 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
- 
--SUBDIRS = lib include doc examples debian tests
-+SUBDIRS = lib include doc debian tests
- 
- EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
- 	theora-uninstalled.pc.in
-diff -ruN libtheora-1.0alpha5/Makefile.in libtheora/Makefile.in
---- libtheora-1.0alpha5/Makefile.in	Sat Aug 20 21:30:42 2005
-+++ libtheora/Makefile.in	Thu Aug 25 21:11:46 2005
-@@ -224,7 +224,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
--SUBDIRS = lib include doc examples debian tests
-+SUBDIRS = lib include doc debian tests
- EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
- 	theora-uninstalled.pc.in
- 
-diff -ruN libtheora-1.0alpha5/configure.ac libtheora/configure.ac
---- libtheora-1.0alpha5/configure.ac	2005-08-20 20:43:13.000000000 +0200
-+++ libtheora/configure.ac	2005-11-14 22:49:14.000000000 +0100
-@@ -89,7 +89,7 @@
+diff -ruN libtheora-1.0alpha7/configure.ac libtheora/configure.ac
+--- libtheora-1.0alpha7/configure.ac	2006-06-20 22:04:50.000000000 +0200
++++ libtheora/configure.ac	2006-07-11 20:08:04.000000000 +0200
+@@ -88,7 +88,7 @@
          case $host in 
          *)
-                 DEBUG="-g"
+                 DEBUG="-g -DDEBUG"
 -                CFLAGS="-O"
 +                EXTRA_CFLAGS="-O"
-                 PROFILE="-g -p" ;;
+                 PROFILE="-g -p -DDEBUG" ;;
          esac
  else
-@@ -97,12 +97,12 @@
+@@ -96,11 +96,11 @@
          case $host in 
          *)
-                 DEBUG="-g -W -D__NO_MATH_INLINES"
--                CFLAGS="-g -O2 -Wall"
-+                EXTRA_CFLAGS="-g -O2 -Wall"
-                 PROFILE="-W -pg -g -O2 -fno-inline-functions";;
+                 DEBUG="-g -Wall -DDEBUG -D__NO_MATH_INLINES"
+-                CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++                EXTRA_CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+                 PROFILE="-Wall -pg -g -O3 -fno-inline-functions -DDEBUG";;
          esac
  fi
 -CFLAGS="$CFLAGS $cflags_save"
--LDFLAGS="$LDFLAGS $ldflags_save"
 +CFLAGS="$EXTRA_CFLAGS $cflags_save"
-+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
  
- dnl Set extra linker options
- case "$target_os" in
+ cpu_x86_64=no
+ cpu_x86_32=no
+diff -ruN libtheora-1.0alpha7/Makefile.am libtheora/Makefile.am
+--- libtheora-1.0alpha7/Makefile.am	2006-06-13 00:57:36.000000000 +0200
++++ libtheora/Makefile.am	2006-07-11 20:04:43.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
+ 
+-SUBDIRS = lib include doc examples tests m4
++SUBDIRS = lib include doc tests m4
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+diff -ruN libtheora-1.0alpha7/Makefile.in libtheora/Makefile.in
+--- libtheora-1.0alpha7/Makefile.in	2006-06-20 22:06:56.000000000 +0200
++++ libtheora/Makefile.in	2006-07-11 20:05:06.000000000 +0200
+@@ -231,7 +231,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
+-SUBDIRS = lib include doc examples tests m4
++SUBDIRS = lib include doc tests m4
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am

extras/contrib/src/Patches/twolame-BeOS.patch

+diff -ruN twolame/configure twolame-2/configure
+--- twolame/configure	2006-07-03 18:50:30.000000000 +0000
++++ twolame/configure	2006-08-01 11:47:41.000000000 +0000
+@@ -21068,7 +21068,7 @@
+ 
+ 
+ 
+-CFLAGS="$CFLAGS -std=c99 -Wunused -Wall"
++CFLAGS="$CFLAGS -Wunused -Wall"
+ LDFLAGS="$LDFLAGS"
+ 
+ # If debugging is enabled then make warnings errors
+diff -ruN twolame/configure.ac twolame-2/configure.ac
+--- twolame/configure.ac	2006-07-03 18:50:04.000000000 +0000
++++ twolame/configure.ac	2006-08-01 11:47:32.000000000 +0000
+@@ -113,7 +113,7 @@
+ 
+ dnl ############## Compiler and Linker Flags
+ 
+-CFLAGS="$CFLAGS -std=c99 -Wunused -Wall"
++CFLAGS="$CFLAGS -Wunused -Wall"
+ LDFLAGS="$LDFLAGS"
+ 
+ # If debugging is enabled then make warnings errors

extras/contrib/src/Patches/x264-svn-win32.patch

 Index: configure
 ===================================================================
---- configure	(revision 473)
-+++ configure	(working copy)
-@@ -7,6 +7,7 @@
- echo "available options:"
- echo ""
- echo "  --help                   print this message"
-+echo "  --crosscompile=ARCH      crosscompile for ARCH"
- echo "  --enable-avis-input      enables avisynth input (win32 only)"
- echo "  --enable-mp4-output      enables mp4 output (using gpac)"
- echo "  --enable-vfw             compiles the VfW frontend"
-@@ -64,43 +65,143 @@
+--- configure	(rvision 547)
++++ configure	(copie de travail)
+@@ -66,48 +66,147 @@
  
  EXE=""
  
@@ -114,7 +106,6 @@ Index: configure
 +            ;;
 +    esac
 +done
-+
 +
  case "$UNAMES" in
 -  BeOS)
@@ -138,6 +129,12 @@ Index: configure
      SYS="NETBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
+-  OpenBSD)
++  openbsd)
+     SYS="OPENBSD"
+     CFLAGS="$CFLAGS -I/usr/X11R6/include"
+     LDFLAGS="$LDFLAGS -lm"
+     ;;
 -  Linux)
 +  linux)
      SYS="LINUX"
@@ -163,7 +160,7 @@ Index: configure
      SYS="SunOS"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
      LDFLAGS="$LDFLAGS -lm"
-@@ -112,9 +213,8 @@
+@@ -119,9 +218,8 @@
      ;;
  esac
  
@@ -174,21 +171,20 @@ Index: configure
      ARCH="X86"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      AS="nasm"
-@@ -135,7 +235,7 @@
+@@ -142,7 +240,7 @@
      AS="yasm"
      ASFLAGS="-f elf -m amd64"
      ;;
--  "Power Macintosh"|ppc)
-+  "power macintosh"|ppc)
+-  "Power Macintosh"|ppc|ppc64)
++  "power macintosh"|ppc|ppc64)
      ARCH="PPC"
      if [ $SYS = MACOSX ]
      then
-@@ -183,90 +283,7 @@
- 
+@@ -191,95 +289,6 @@
  CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
  
--# parse options
- 
+ # parse options
+-
 -for opt do
 -    optarg="${opt#*=}"
 -    case "$opt" in
@@ -254,6 +250,12 @@ Index: configure
 -        --disable-vfw)
 -            vfw="no"
 -            ;;
+-        --enable-gtk)
+-            gtk="yes"
+-            ;;
+-        --disable-gtk)
+-            gtk="no"
+-            ;;
 -        --enable-shared)
 -            shared="yes"
 -            if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
@@ -274,9 +276,9 @@ Index: configure
  # autodetect options that weren't forced nor disabled
  
  if test "$pthread" = "auto" ; then
-@@ -351,6 +368,9 @@
- ASFLAGS=$ASFLAGS
+@@ -365,6 +374,9 @@
  VFW=$vfw
+ GTK=$gtk
  EXE=$EXE
 +AR=$AR
 +AROPTS=$AROPTS
@@ -286,8 +288,8 @@ Index: configure
  DEVNULL=$DEVNULL
 Index: Makefile
 ===================================================================
---- Makefile	(revision 473)
-+++ Makefile	(working copy)
+--- Makefile	(rvision 547)
++++ Makefile	(copie de travail)
 @@ -64,8 +64,8 @@
  default: $(DEP) x264$(EXE)
  
@@ -298,10 +300,10 @@ Index: Makefile
 +	$(RANLIB) libx264.a
  
  $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME)
-@@ -133,14 +133,14 @@
- distclean: clean
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+@@ -138,14 +138,14 @@
  	rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
+ 	$(MAKE) -C gtk distclean
  
 -install: x264 $(SONAME)
 +install: x264$(EXE)
@@ -314,6 +316,6 @@ Index: Makefile
 -	ranlib $(DESTDIR)$(libdir)/libx264.a
 +	install x264$(EXE)  $(DESTDIR)$(bindir)
 +	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
- 	$(if $(SONAME), ln -sf $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.so)
+ 	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
  	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
  

extras/contrib/src/packages.mak

@@ -6,7 +6,7 @@
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
-#          Felix Khne <fkuehne@users.sourceforge.net>
+#          Felix Kühne <fkuehne@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 GNU=http://ftp.belnet.be/mirror/ftp.gnu.org/gnu
 SF=http://switch.dl.sourceforge.net/sourceforge
 VIDEOLAN=http://download.videolan.org/pub/videolan
-PERL_VERSION=5.8.5
+PERL_VERSION=5.8.8
 PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
 # Autoconf > 2.57 doesn't work ok on BeOS. Don't ask why.
 # we have to use a newer though, because bootstrap won't work otherwise
@@ -38,14 +38,14 @@ AUTOMAKE_VERSION=1.9.6
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.15.0
 PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkgconfig-$(PKGCFG_VERSION).tar.gz
-LIBICONV_VERSION=1.9.1
+LIBICONV_VERSION=1.9.2
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
-GETTEXT_VERSION=0.14.5
+GETTEXT_VERSION=0.14.6
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FREETYPE2_VERSION=2.1.9
 FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 FRIBIDI_VERSION=0.10.4
-FRIBIDI_URL=$(SF)/fribidi/fribidi-$(FRIBIDI_VERSION).tar.gz
+FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
 A52DEC_VERSION=0.7.4
 A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
 MPEG2DEC_VERSION=0.4.1-cvs
@@ -56,18 +56,18 @@ LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz
-OGG_VERSION=1.1.2
+OGG_VERSION=1.1.3
 OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
-VORBIS_VERSION=1.1.1
+VORBIS_VERSION=1.1.2
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.0alpha5
-THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
+THEORA_VERSION=1.0alpha7
+THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.1.2
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
-SPEEX_VERSION=1.1.10
+SPEEX_VERSION=1.1.12
 SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
-SHOUT_VERSION=2.2
+SHOUT_VERSION=2.2.2
 SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 FAAD2_VERSION=20040923
 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
@@ -76,14 +76,14 @@ FAAC_VERSION=1.24
 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
 LAME_VERSION=3.97b2
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.7.6
+LIBEBML_VERSION=0.7.7
 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
 LIBMATROSKA_VERSION=0.8.0
 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
-FFMPEG_CVSROOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg
-LIBDVDCSS_VERSION=1.2.8
+FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
+LIBDVDCSS_VERSION=1.2.9
 LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 LIBDVDREAD_VERSION=20041028
 LIBDVDREAD_URL=$(VIDEOLAN)/contrib/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
@@ -101,8 +101,8 @@ LIBCACA_URL=http://sam.zoy.org/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDTS_VERSION=0.0.2
 LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
 LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
-MODPLUG_VERSION=0.7
-MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
+MODPLUG_VERSION=0.8
+MODPLUG_URL=$(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
 MASH_VERSION=5.2
 MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
 CDDB_VERSION=1.2.1
@@ -111,15 +111,15 @@ VCDIMAGER_VERSION=0.7.21
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.72
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
-PNG_VERSION=1.2.8
-PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.1
+PNG_VERSION=1.2.12
+PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
+GPGERROR_VERSION=1.3
 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz
 #GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
 GCRYPT_VERSION=1.2.2
 GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=1.2.10
+GNUTLS_VERSION=1.4.0
 GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 DAAP_VERSION=0.4.0
 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
@@ -133,7 +133,7 @@ LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win
 GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
 MOZILLA_VERSION=1.7.5
 MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
-TWOLAME_VERSION=0.3.2
+TWOLAME_VERSION=0.3.8
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
 X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
@@ -145,15 +145,18 @@ SDL_VERSION=1.2.8
 SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
 SDL_IMAGE_VERSION=1.2.4
 SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
-MUSE_VERSION=1.2.1
-MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
-WXWIDGETS_VERSION=2.6.2
+MUSE_VERSION=1.2.2
+#MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
+MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
+WXWIDGETS_VERSION=2.6.3
 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
+QT4_VERSION=4.2.0-tp1
+QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.gz
 ZLIB_VERSION=1.2.3
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
-XML_VERSION=2.6.20
+XML_VERSION=2.6.26
 XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz
-DIRAC_VERSION=0.5.3
+DIRAC_VERSION=0.5.4
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
 DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
 DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz