contribs: openjpeg: Fix windows build

diff --git a/contrib/src/openjpeg/msvc.patch b/contrib/src/openjpeg/msvc.patch
new file mode 100644 (file)
index 0000000..ec00afe
--- /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 f9d4316737b1ed039ace3451f272351d621a9a99..eeafcc9f9d415a2f5d5352ebc485bd5bc61d6809 100644 (file)
--- 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)