[vlc-commits] contrib:opus: remove an unneeded MSVC patch

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at gmail.com> | Sat Jan 30 09:26:40 2016 +0100| [38f229116df2ed0cce63b6dc570771a3ec0843e2] | committer: Jean-Baptiste Kempf

contrib:opus: remove an unneeded MSVC patch

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38f229116df2ed0cce63b6dc570771a3ec0843e2
---

 contrib/src/opus/msvc.patch |   11 -----------
 contrib/src/opus/rules.mak  |    3 ---
 2 files changed, 14 deletions(-)

diff --git a/contrib/src/opus/msvc.patch b/contrib/src/opus/msvc.patch
deleted file mode 100644
index 5167719..0000000
--- a/contrib/src/opus/msvc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 f746c31..0c002d2 100644
--- a/contrib/src/opus/rules.mak
+++ b/contrib/src/opus/rules.mak
@@ -17,9 +17,6 @@ $(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