Refresh x264 patch and use pthread for x264 in win32

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6c44c927af39e0e0081fd5ad17b613c4b09ea11b..d1b99a65c89a038c99bd57aef894039dec67861e 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1214,7 +1214,11 @@ else
 endif
 endif
 
+ifdef HAVE_WIN32
+.x264: x264 .pthreads
+else
 .x264: x264
+endif
        (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pic && make && make install)
        touch $@
 

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index 2c59336cfab93a56b5918bf9244f0399ea2c3355..1ad3d91abf78176dafea9490d02bf3025d44b2b8 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -1,7 +1,18 @@
 Index: configure
 ===================================================================
---- configure  (revision 590)
+--- configure  (revision 612)
 +++ configure  (working copy)
+@@ -55,8 +55,8 @@
+ shared="no"
+ 
+ CC="${CC-gcc}"
+-CFLAGS="-Wall -I. -D__X264__"
+-LDFLAGS=""
++CFLAGS="$CFLAGS -Wall -I. -D__X264__"
++LDFLAGS="$LDFLAGS"
+ HAVE_GETOPT_LONG=1
+ 
+ AS="nasm"
 @@ -64,8 +64,101 @@
  
  EXE=""
@@ -104,7 +115,7 @@ Index: configure
  case "${MACHINE#*-*-}" in
    beos*)
      SYS="BEOS"
-@@ -178,88 +271,6 @@
+@@ -183,88 +276,6 @@
  esac
  
  CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
@@ -151,7 +162,7 @@ Index: configure
 -            LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
 -            ;;
 -        --enable-pthread)
--            pthread="yes"
+-            pthread="auto" # can't skip detection, since it differs by OS
 -            ;;
 -        --disable-pthread)
 -            pthread="no"
@@ -192,8 +203,8 @@ Index: configure
 -
  # autodetect options that weren't forced nor disabled
  
- if test "$pthread" = "auto" ; then
-@@ -349,6 +360,9 @@
+ libpthread=""
+@@ -363,6 +374,9 @@
  ASFLAGS=$ASFLAGS
  GTK=$gtk
  EXE=$EXE