[vlc-devel] commit: Contribs/win32: Use std=gnu99 (Jean-Baptiste Kempf )

git version control git at videolan.org
Thu Feb 19 16:56:31 CET 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at sasmira.jbkempf.com> | Thu Feb 19 16:54:29 2009 +0100| [cbb613cdc42171252ca46318165ab6ad7fa32beb] | committer: Jean-Baptiste Kempf 

Contribs/win32: Use std=gnu99

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

 extras/contrib/src/Patches/ffmpeg-svn-win32.patch |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
index 2e06224..bd715fc 100644
--- a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
+++ b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
@@ -1,13 +1,24 @@
 Index: configure
 ===================================================================
---- configure	(revision 15654)
-+++ configure	(working copy)
-@@ -1141,7 +1141,7 @@
- TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
- TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
+--- configure	(révision 17381)
++++ configure	(copie de travail)
+@@ -1359,7 +1359,7 @@
+     die "C compiler test failed."
+ fi
  
 -check_cflags -std=c99
 +#check_cflags -std=c99
  
  case "$arch" in
      i386|i486|i586|i686|i86pc|BePC)
+@@ -1531,8 +1531,8 @@
+         objformat="win32"
+         enable dos_paths
+         if ! enabled x86_64; then
+-            check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
+-                die "ERROR: MinGW runtime version must be >= 3.15."
++            check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 13)" ||
++                die "ERROR: MinGW runtime version must be >= 3.13."
+             enabled_any avisynth vfwcap_demuxer &&
+                 { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" ||
+                   die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.13 or later."; }




More information about the vlc-devel mailing list