diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-28 10:04:12 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-28 10:04:12 (GMT) |
| commit | 9eb2f14dcb6a3a1026093902f21d71b030f0720c (patch) | |
| tree | f8327037b6c8ed98006776c54a6544b577880e4f | |
| parent | c05d2c62a9c05aa9942cb82e1c863321b2f17061 (diff) | |
| download | mxe-9eb2f14dcb6a3a1026093902f21d71b030f0720c.zip mxe-9eb2f14dcb6a3a1026093902f21d71b030f0720c.tar.gz mxe-9eb2f14dcb6a3a1026093902f21d71b030f0720c.tar.bz2 | |
libbluray: mingw-w64 4.01 compatibility fix
| -rw-r--r-- | src/libbluray-1-fix-strncasecmp.patch | 20 | ||||
| -rw-r--r-- | src/libbluray-1.patch | 54 |
2 files changed, 54 insertions, 20 deletions
diff --git a/src/libbluray-1-fix-strncasecmp.patch b/src/libbluray-1-fix-strncasecmp.patch deleted file mode 100644 index befe435..0000000 --- a/src/libbluray-1-fix-strncasecmp.patch +++ /dev/null @@ -1,20 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -Naur a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c ---- a/src/libbluray/bdnav/meta_parse.c 2013-04-26 13:42:38.000000000 -0700 -+++ b/src/libbluray/bdnav/meta_parse.c 2013-11-09 15:41:29.000000000 -0800 -@@ -29,6 +29,13 @@ - #include "meta_parse.h" - #include "libbluray/register.h" - -+#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) -+#define strncasecmp _strnicmp -+#ifdef __STRICT_ANSI__ -+#undef __STRICT_ANSI__ -+#endif -+#endif -+ - #include <stdlib.h> - #include <string.h> - #include <errno.h> diff --git a/src/libbluray-1.patch b/src/libbluray-1.patch new file mode 100644 index 0000000..19ac52a --- /dev/null +++ b/src/libbluray-1.patch @@ -0,0 +1,54 @@ +This file is part of MXE. +See index.html for further information. + +From ff299bd94040b27db9fb119cfd6ffd2635033ec9 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sat, 28 Mar 2015 10:57:00 +0100 +Subject: [PATCH 1/2] fix strncasecmp + + +diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c +index 3cd9abd..bcb5814 100644 +--- a/src/libbluray/bdnav/meta_parse.c ++++ b/src/libbluray/bdnav/meta_parse.c +@@ -29,6 +29,13 @@ + #include "meta_parse.h" + #include "libbluray/register.h" + ++#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) ++#define strncasecmp _strnicmp ++#ifdef __STRICT_ANSI__ ++#undef __STRICT_ANSI__ ++#endif ++#endif ++ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-- +2.1.0 + + +From 6f58d5eb267e1b183b82f6bd1fec4433cc24946e Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sat, 28 Mar 2015 10:58:04 +0100 +Subject: [PATCH 2/2] fix include order + + +diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c +index e800611..e14ab28 100644 +--- a/src/file/dirs_win32.c ++++ b/src/file/dirs_win32.c +@@ -29,8 +29,8 @@ + #include <stdio.h> + #include <string.h> + +-#include <shlobj.h> + #include <windows.h> ++#include <shlobj.h> + #include <limits.h> + #include <direct.h> + +-- +2.1.0 + |