Update x264 patch.

[vlc] / extras / contrib / src / Patches / x264-svn-win32.patch

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index c5aedca2334e4065cb75893eafd63d3209b5593a..e5c40fd12d23c0f66848fdd06668d338fd3fb922 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -29,8 +29,8 @@
  
  uninstall:
        rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
---- configure  (révision 385)
-+++ configure  (copie de travail)
+--- configure   (revision 452)
++++ configure   (working copy)
 @@ -7,6 +7,7 @@
  echo "available options:"
  echo ""
@@ -39,10 +39,10 @@
  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"
-@@ -58,47 +59,143 @@
- 
+@@ -62,45 +63,141 @@
+
  EXE=""
- 
+
 -UNAMES="`uname -s`"
 +AR="ar"
 +AROPTS="rc"
@@ -56,29 +56,29 @@
 +for opt do
 +    optarg="${opt#*=}"
 +    case "$opt" in
-+      --crosscompile=*)
-+          CROSS="$optarg"
-+          CC="$CROSS-gcc"
-+          AR="$CROSS-ar"
-+          RANLIB="$CROSS-ranlib"
-+          UNAMES="`echo $CROSS | cut -d- -f2`"
-+          UNAMEM="`echo $CROSS | cut -d- -f1`"
-+          ;;
-+      --prefix=*)
-+          prefix="$optarg"
-+          ;;
-+      --exec-prefix=*)
-+          eprefix="$optarg"
-+          ;;
-+      --bindir=*)
-+          bindir="$optarg"
-+          ;;
-+      --libdir=*)
-+          libdir="$optarg"
-+          ;;
-+      --includedir=*)
-+          includedir="$optarg"
-+          ;;
++       --crosscompile=*)
++           CROSS="$optarg"
++           CC="$CROSS-gcc"
++           AR="$CROSS-ar"
++           RANLIB="$CROSS-ranlib"
++           UNAMES="`echo $CROSS | cut -d- -f2`"
++           UNAMEM="`echo $CROSS | cut -d- -f1`"
++           ;;
++       --prefix=*)
++           prefix="$optarg"
++           ;;
++       --exec-prefix=*)
++           eprefix="$optarg"
++           ;;
++       --bindir=*)
++           bindir="$optarg"
++           ;;
++       --libdir=*)
++           libdir="$optarg"
++           ;;
++       --includedir=*)
++           includedir="$optarg"
++           ;;
 +        --enable-avis-input)
 +            if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
 +                CFLAGS="$CFLAGS -DAVIS_INPUT"
@@ -125,7 +125,7 @@
 +            LDFLAGS="$LDFLAGS -pg"
 +            gprof="yes"
 +            ;;
-+       --enable-pic)
++        --enable-pic)
 +            CFLAGS="$CFLAGS -fPIC"
 +            ASFLAGS="$ASFLAGS -D__PIC__"
 +            pic="yes"
@@ -178,7 +178,6 @@
      SYS="CYGWIN"
      CFLAGS="$CFLAGS -mno-cygwin"
      LDFLAGS="$LDFLAGS -mno-cygwin"
-     ASFLAGS="-f win32 -DPREFIX"
      EXE=".exe"
 -    DEVNULL="NUL"
 -    vfw="yes"
@@ -186,7 +185,6 @@
 -  MINGW*)
 +  mingw*)
      SYS="MINGW"
-     ASFLAGS="-f win32 -DPREFIX"
      EXE=".exe"
 -    DEVNULL="NUL"
 -    vfw="yes"
@@ -196,18 +194,18 @@
      SYS="SunOS"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
      LDFLAGS="$LDFLAGS -lm"
-@@ -110,9 +202,8 @@
+@@ -112,9 +209,8 @@
      ;;
  esac
- 
+
 -UNAMEM="`uname -m`"
  case "$UNAMEM" in
 -  i386|i486|i586|i686|BePC)
 +  i386|i486|i586|i686|bepc)
      ARCH="X86"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
-     ;;
-@@ -122,7 +213,7 @@
+     AS="nasm"
+@@ -135,7 +231,7 @@
      AS="yasm"
      ASFLAGS="-f elf -m amd64"
      ;;
@@ -216,17 +214,7 @@
      ARCH="PPC"
      if [ $SYS = MACOSX ]
      then
-@@ -144,9 +235,6 @@
-   ia64)
-     ARCH="IA64"
-     ;;
--  alpha)
--    ARCH="ALPHA"
--    ;;
-   mips|mipsel)
-     ARCH="MIPS"
-     ;;
-@@ -180,134 +273,6 @@
+@@ -183,134 +276,6 @@
 
  CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
 
@@ -361,7 +349,7 @@
  if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
      CFLAGS="$CFLAGS -s -fomit-frame-pointer"
      LDFLAGS="$LDFLAGS -s"
-@@ -317,6 +282,9 @@
+@@ -342,6 +307,9 @@
  ASFLAGS=$ASFLAGS
  VFW=$vfw
  EXE=$EXE
@@ -371,3 +359,5 @@
  VIS=$vis
  HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
  DEVNULL=$DEVNULL
+
+