[vlc-devel] commit: Revert "Contrib: remove patch unneeded for Windows" ( Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Jan 9 17:08:19 CET 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan  9 16:56:43 2010 +0100| [870146382734486fc8af6d0d15b757874477a4ce] | committer: Jean-Baptiste Kempf 

Revert "Contrib: remove patch unneeded for Windows"

This reverts commit 10b9d038ae2c80fb41e23520ef1284258594f17c.

Yeah, sorry guys, but it looks like the dxva2 code needs it :'(

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=870146382734486fc8af6d0d15b757874477a4ce
---

 extras/contrib/src/Makefile                       |    1 +
 extras/contrib/src/Patches/ffmpeg-svn-win32.patch |   11 +++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 40b9152..d1efbb6 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1038,6 +1038,7 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
 ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
 endif
 ifdef NO_TEXT_RELOCATION
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
new file mode 100644
index 0000000..d06af7a
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2009-07-26 00:06:36.000000000 +0200
++++ configure	2009-07-26 00:08:21.000000000 +0200
+@@ -1674,7 +1674,7 @@
+ fi
+ 
+ add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
+-check_cflags -std=c99
++#check_cflags -std=c99
+ check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
+ #include <stdlib.h>
+ EOF




More information about the vlc-devel mailing list