x264-svn-win32.patch: updated for x264 rev 380

Makefile: more cygwin related fixes

extras/contrib/src/Makefile

@@ -68,6 +68,8 @@ endif
 # For libebml/libmatroska. Grrr.
 ifneq ($(AR),)
 HOSTCC2=$(HOSTCC) AR="$(AR) rcvu"
+else
+HOSTCC2=$(HOSTCC)
 endif
 
 ifneq ($(BUILD),$(HOST))
@@ -820,7 +822,7 @@ endif
 
 .matroska: libmatroska .ebml
 ifdef HAVE_WIN32
-	(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CPPFLAGS=$(CFLAGS) libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+	(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && 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/libmatroska.a

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

@@ -223,8 +223,8 @@ Index: common/i386/mc-a2.asm
 +mmx_dw_5:
 +    times 4 dw -5
 +
---- configure	2005-11-23 18:31:49.062500000 +0000
-+++ config.new	2005-11-23 18:30:07.343750000 +0000
+--- configure	2005-11-28 15:42:12.390625000 +0000
++++ configure.new	2005-11-28 15:52:48.687500000 +0000
 @@ -7,6 +7,7 @@
  echo "available options:"
  echo ""
@@ -233,7 +233,7 @@ Index: common/i386/mc-a2.asm
  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"
-@@ -45,43 +46,138 @@
+@@ -46,31 +47,126 @@
  
  EXE=""
  
@@ -367,21 +367,23 @@ Index: common/i386/mc-a2.asm
      SYS="CYGWIN"
      CFLAGS="$CFLAGS -mno-cygwin"
      LDFLAGS="$LDFLAGS -mno-cygwin"
-     ASFLAGS="-f win32 -DPREFIX"
+@@ -78,13 +174,13 @@
      EXE=".exe"
+     DEVNULL="NUL"
      ;;
 -  MINGW*)
 +  mingw*)
      SYS="MINGW"
      ASFLAGS="-f win32 -DPREFIX"
      EXE=".exe"
+     DEVNULL="NUL"
      ;;
 -  SunOS)
 +  sunos)
      SYS="SunOS"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
      LDFLAGS="$LDFLAGS -lm"
-@@ -93,9 +189,8 @@
+@@ -96,9 +192,8 @@
      ;;
  esac
  
@@ -392,7 +394,7 @@ Index: common/i386/mc-a2.asm
      ARCH="X86"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      ;;
-@@ -105,7 +200,7 @@
+@@ -108,7 +203,7 @@
      AS="yasm"
      ASFLAGS="-f elf -m amd64"
      ;;
@@ -401,7 +403,7 @@ Index: common/i386/mc-a2.asm
      ARCH="PPC"
      if [ $SYS = MACOSX ]
      then
-@@ -153,86 +248,6 @@
+@@ -156,86 +251,6 @@
  
  CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
  
@@ -488,7 +490,7 @@ Index: common/i386/mc-a2.asm
  VFWFLAGS=
  if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
      CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-@@ -256,6 +271,9 @@
+@@ -259,6 +274,9 @@
  ASFLAGS=$ASFLAGS
  VFW=$vfw
  EXE=$EXE
@@ -497,7 +499,7 @@ Index: common/i386/mc-a2.asm
 +RANLIB=$RANLIB
  VIS=$vis
  HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
- EOF
+ DEVNULL=$DEVNULL
 --- Makefile.old	2005-11-23 17:25:15.953125000 +0000
 +++ Makefile	2005-11-23 17:38:09.796875000 +0000
 @@ -62,8 +62,8 @@