vlc | branch: master | Rémi Duraffort <[email protected]> | Fri Dec 3 22:33:32 2010 +0100| [75d5cb1298f15d8cbc38242bf1b83a2df7edbd01] | committer: Rémi Duraffort
contribs: blind attempt to fix compilation of x264 on win32. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=75d5cb1298f15d8cbc38242bf1b83a2df7edbd01 --- extras/contrib/src/Patches/x264-svn-win32.patch | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch index 69afbf6..30249f1 100644 --- a/extras/contrib/src/Patches/x264-svn-win32.patch +++ b/extras/contrib/src/Patches/x264-svn-win32.patch @@ -1,6 +1,6 @@ --- configure 2008-04-06 09:07:25.000000000 +0200 +++ configure 2008-04-06 09:10:52.000000000 +0200 -@@ -343,6 +343,7 @@ +@@ -516,6 +516,7 @@ # autodetect options that weren't forced nor disabled libpthread="" @@ -8,7 +8,7 @@ if test "$pthread" = "auto" ; then pthread="no" case $SYS in -@@ -350,13 +351,13 @@ +@@ -523,13 +524,13 @@ pthread="yes" ;; MINGW) @@ -24,19 +24,8 @@ + elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then pthread="yes" libpthread="-lpthreadGC2 -lwsock32" - CFLAGS="$CFLAGS -DPTW32_STATIC_LIB" -@@ -443,6 +444,10 @@ - ASFLAGS=$ASFLAGS - GTK=$gtk - EXE=$EXE -+AR=$AR -+STRIP=$STRIP -+AROPTS=$AROPTS -+RANLIB=$RANLIB - VIS=$vis - HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG - DEVNULL=$DEVNULL -@@ -495,7 +500,7 @@ + define PTW32_STATIC_LIB +@@ -807,7 +808,7 @@ Description: H.264 (MPEG4 AVC) encoder library Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//') Libs: $pclibs @@ -44,4 +33,4 @@ +Cflags: -I$includedir $extradef EOF - + filters="crop select_every" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
