contribs: fribidi: Fix MSVC build

diff --git a/contrib/src/fribidi/msvc.patch b/contrib/src/fribidi/msvc.patch
new file mode 100644 (file)
index 0000000..052bc1e
--- /dev/null
+++ b/contrib/src/fribidi/msvc.patch
@@ -0,0 +1,18 @@
+--- fribidi/charset/fribidi-char-sets.c        2012-12-02 17:25:40.000000000 +0100
++++ /home/vlc/vlc/contrib/windowsphone/fribidi/charset/fribidi-char-sets.c     2014-12-15 16:54:39.537785800 +0100
+@@ -117,6 +117,7 @@
+ # include <glib/gstrfuncs.h>
+ # define fribidi_strcasecmp g_ascii_strcasecmp
+ #else /* !FRIBIDI_USE_GLIB */
++#if !defined(_MSC_VER)
+ static char
+ toupper (
+   /* input */
+@@ -125,6 +126,7 @@
+ {
+   return c < 'a' || c > 'z' ? c : c + 'A' - 'a';
+ }
++#endif
+
+ static int
+ fribidi_strcasecmp (

diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak
index ffb116578ccac795bf1755c177816c7ca12d2675..57a7a930465b4ce04f2533961c22c9b02dbc9a3e 100644 (file)
--- a/contrib/src/fribidi/rules.mak
+++ b/contrib/src/fribidi/rules.mak
@@ -16,6 +16,9 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 .sum-fribidi
        $(UNPACK)
        $(APPLY) $(SRC)/fribidi/fribidi.patch
        $(APPLY) $(SRC)/fribidi/no-ansi.patch
+ifdef HAVE_VISUALSTUDIO
+       $(APPLY) $(SRC)/fribidi/msvc.patch
+endif
        $(MOVE)
 
 # FIXME: DEPS_fribidi = iconv $(DEPS_iconv)