From c4fa23a3de82eb02171db7fb3e6e99c60d1eb7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 9 Jan 2015 16:52:03 +0100
Subject: [PATCH] contribs: openjpeg: Fix windows build
---
contrib/src/openjpeg/msvc.patch | 11 +++++++++++
contrib/src/openjpeg/rules.mak | 3 +++
2 files changed, 14 insertions(+)
create mode 100644 contrib/src/openjpeg/msvc.patch
diff --git a/contrib/src/openjpeg/msvc.patch b/contrib/src/openjpeg/msvc.patch
new file mode 100644
index 000000000000..ec00afe7b734
--- /dev/null
+++ b/contrib/src/openjpeg/msvc.patch
@@ -0,0 +1,11 @@
+--- openjpeg/libopenjpeg/opj_includes.h 2012-02-07 11:49:55.000000000 +0100
++++ /home/vlc/vlc/contrib/windowsphone/openjpeg/libopenjpeg/opj_includes.h 2014-12-15 16:54:31.303058600 +0100
+@@ -87,7 +87,7 @@
+ #endif
+
+ /* MSVC and Borland C do not have lrintf */
+-#if defined(_MSC_VER) || defined(__BORLANDC__)
++#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(__BORLANDC__)
+ static INLINE long lrintf(float f){
+ #ifdef _M_X64
+ return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index f9d4316737b1..eeafcc9f9d41 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -11,6 +11,9 @@ $(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
$(UNPACK)
$(APPLY) $(SRC)/openjpeg/freebsd.patch
+ifdef HAVE_VISUALSTUDIO
+ $(APPLY) $(SRC)/openjpeg/msvc.patch
+endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
--
GitLab