diff options
7 files changed, 51 insertions, 0 deletions
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat index 06d08b3427..cf15ac8567 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat @@ -36,9 +36,19 @@ CALL get_mingw_env.bat cd %CUR_PATH%
+rem update fstab to install path
SET FSTAB=%MINGW_INSTALL_PATH%
SET FSTAB=%FSTAB:\=/%
SET FSTAB=%FSTAB:"=%
ECHO %FSTAB% /mingw>>"%MSYS_INSTALL_PATH%\etc\fstab"
+rem patch mingw headers to compile ffmpeg
+xcopy mingw_support\postinstall\* "%MSYS_INSTALL_PATH%\postinstall\" /E /Q /I /Y
+cd "%MSYS_INSTALL_PATH%\postinstall"
+CALL pi_patches.bat
+
+cd %CUR_PATH%
+
rmdir %TMP_PATH% /S /Q
+
+pause
diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/nomt.diff b/project/BuildDependencies/mingw_support/postinstall/patches/nomt.diff new file mode 100644 index 0000000000..13a84b721e --- /dev/null +++ b/project/BuildDependencies/mingw_support/postinstall/patches/nomt.diff @@ -0,0 +1,11 @@ +--- /mingw/include/stdio.h.orig 2010-06-27 14:30:24.000000000 -0300 ++++ /mingw/include/stdio.h 2010-01-09 01:39:12.000000000 -0200 +@@ -366,7 +366,7 @@ + _CRTIMP int __cdecl __MINGW_NOTHROW _filbuf (FILE*); + _CRTIMP int __cdecl __MINGW_NOTHROW _flsbuf (int, FILE*); + +-#if !defined _MT ++#if 0 + + __CRT_INLINE int __cdecl __MINGW_NOTHROW getc (FILE* __F) + { diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/strcasecmp.diff b/project/BuildDependencies/mingw_support/postinstall/patches/strcasecmp.diff new file mode 100644 index 0000000000..ce65791f52 --- /dev/null +++ b/project/BuildDependencies/mingw_support/postinstall/patches/strcasecmp.diff @@ -0,0 +1,12 @@ +--- /mingw/include/string.h.orig 2010-06-27 13:46:10.000000000 -0300 ++++ /mingw/include/string.h 2010-06-27 14:01:04.000000000 -0300 +@@ -116,6 +116,9 @@ + #endif /* _UWIN */ + #endif /* _NO_OLDNAMES */ + ++#else ++int __cdecl __MINGW_NOTHROW strcasecmp (const char*, const char *); ++int __cdecl __MINGW_NOTHROW strncasecmp (const char *, const char *, size_t); + #endif /* Not __STRICT_ANSI__ */ + + #ifndef _WSTRING_DEFINED diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/tempnam.diff b/project/BuildDependencies/mingw_support/postinstall/patches/tempnam.diff new file mode 100644 index 0000000000..e3d9993e78 --- /dev/null +++ b/project/BuildDependencies/mingw_support/postinstall/patches/tempnam.diff @@ -0,0 +1,11 @@ +--- /mingw/include/stdio.h.orig 2010-06-27 14:30:24.000000000 -0300 ++++ /mingw/include/stdio.h 2010-06-27 14:32:24.000000000 -0300 +@@ -186,6 +186,8 @@ + _CRTIMP int __cdecl __MINGW_NOTHROW rmtmp(void); + _CRTIMP int __cdecl __MINGW_NOTHROW unlink (const char*); + #endif ++#else ++_CRTIMP char* __cdecl __MINGW_NOTHROW tempnam (const char*, const char*); + #endif /* __STRICT_ANSI__ */ + + _CRTIMP int __cdecl __MINGW_NOTHROW setvbuf (FILE*, char*, int, size_t); diff --git a/project/BuildDependencies/mingw_support/postinstall/pi_patches.bat b/project/BuildDependencies/mingw_support/postinstall/pi_patches.bat new file mode 100644 index 0000000000..eb5b17a2c1 --- /dev/null +++ b/project/BuildDependencies/mingw_support/postinstall/pi_patches.bat @@ -0,0 +1,2 @@ +PATH ..\bin;%PATH% +..\bin\sh.exe pi_patches.sh
\ No newline at end of file diff --git a/project/BuildDependencies/mingw_support/postinstall/pi_patches.sh b/project/BuildDependencies/mingw_support/postinstall/pi_patches.sh new file mode 100644 index 0000000000..3c24ec162e --- /dev/null +++ b/project/BuildDependencies/mingw_support/postinstall/pi_patches.sh @@ -0,0 +1,4 @@ +cd ..
+patch -p1 < postinstall/patches/nomt.diff
+patch -p1 < postinstall/patches/strcasecmp.diff
+patch -p1 < postinstall/patches/tempnam.diff
\ No newline at end of file diff --git a/project/BuildDependencies/scripts/get_msys_env.txt b/project/BuildDependencies/scripts/get_msys_env.txt index 3fcd5cd069..36717ecc7b 100644 --- a/project/BuildDependencies/scripts/get_msys_env.txt +++ b/project/BuildDependencies/scripts/get_msys_env.txt @@ -17,5 +17,6 @@ tar-1.23-1-msys-1.0.13-bin.tar.lzma http://downloads.sourceforge.net/projec gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/gzip/gzip-1.3.12-2/
gawk-3.1.7-2-msys-1.0.13-bin.tar.lzma http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/gawk/gawk-3.1.7-2/
xz-4.999.9beta_20100401-1-msys-1.0.13-bin.tar.gz http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/xz/xz-4.999.9beta_20100401-1/
+patch-2.6.1-1-msys-1.0.13-bin.tar.lzma http://downloads.sourceforge.net/project/mingw/MSYS/patch/patch-2.6.1-1/
; to get pr.exe
coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2 http://www.finalmediaplayer.com/downloads/3rdparty/
\ No newline at end of file |