[vlc-devel] commit: (contrib) Do not use --std= c99 for ffmpeg on contrib when crosscompiling to win32. (Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Oct 13 12:20:41 2008 +0200| [814cffc69ac1f4f34411292cbb1821117e369f6e] | committer: Jean-Paul Saman 

(contrib) Do not use --std=c99 for ffmpeg on contrib when crosscompiling to win32.

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

 extras/contrib/src/Makefile                       |    3 +++
 extras/contrib/src/Patches/ffmpeg-svn-win32.patch |   13 +++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0866a04..d65c07d 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1074,6 +1074,9 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
+endif
 ifdef NO_TEXT_RELOCATION
 	echo "Broken LD. Fix your tools."
 	exit -1
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..60bae91
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure	(revision 15594)
++++ configure	(working copy)
+@@ -1132,7 +1132,7 @@
+ TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
+ 
+ check_cflags -fasm
+-check_cflags -std=c99
++#check_cflags -std=c99
+ 
+ case "$arch" in
+     i386|i486|i586|i686|i86pc|BePC)