contribs: opus: Fix MSVC build

This is applied upstream and can be removed when we update opus version

diff --git a/contrib/src/opus/msvc.patch b/contrib/src/opus/msvc.patch
new file mode 100644 (file)
index 0000000..5167719
--- /dev/null
+++ b/contrib/src/opus/msvc.patch
@@ -0,0 +1,11 @@
+--- opus/celt/float_cast.h     2013-11-29 21:17:15.000000000 +0100
++++ /home/vlc/vlc/contrib/windowsphone/opus/celt/float_cast.h  2014-12-15 16:55:21.951193100 +0100
+@@ -97,7 +97,7 @@
+         {
+                 return _mm_cvtss_si32(_mm_load_ss(&value));
+         }
+-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN32) || defined (_WIN32))
++#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN32) || defined (_WIN32)) && !defined(_M_ARM)
+         #include <math.h>
+
+         /*      Win32 doesn't seem to have these functions.

diff --git a/contrib/src/opus/rules.mak b/contrib/src/opus/rules.mak
index 56f09336f2328df1366b0d9a6e01f7f31f1e55ef..b7e7959343de007f4bb1ea483e61e71f88b2271a 100644 (file)
--- a/contrib/src/opus/rules.mak
+++ b/contrib/src/opus/rules.mak
@@ -17,6 +17,9 @@ $(TARBALLS)/opus-$(OPUS_VERSION).tar.gz:
 opus: opus-$(OPUS_VERSION).tar.gz .sum-opus
        $(UNPACK)
        $(UPDATE_AUTOCONFIG)
+ifdef HAVE_VISUALSTUDIO
+       $(APPLY) $(SRC)/opus/msvc.patch
+endif
        $(MOVE)
 
 OPUS_CONF= --disable-extra-programs --disable-doc