vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Fri Jan 9 17:47:55 2015 +0100| [8a049b809e992c196729655f93bbe3c7049cdc97] | committer: Hugo Beauzée-Luyssen
contribs: opus: Fix MSVC build This is applied upstream and can be removed when we update opus version > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a049b809e992c196729655f93bbe3c7049cdc97 --- contrib/src/opus/msvc.patch | 11 +++++++++++ contrib/src/opus/rules.mak | 3 +++ 2 files changed, 14 insertions(+) diff --git a/contrib/src/opus/msvc.patch b/contrib/src/opus/msvc.patch new file mode 100644 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 56f0933..b7e7959 100644 --- 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
