contribs: vorbis: Fix msvc build

diff --git a/contrib/src/vorbis/msvc.patch b/contrib/src/vorbis/msvc.patch
new file mode 100644 (file)
index 0000000..1fa6320
--- /dev/null
+++ b/contrib/src/vorbis/msvc.patch
@@ -0,0 +1,11 @@
+--- libvorbis/lib/os.h 2014-01-22 10:53:32.000000000 +0100
++++ /home/vlc/vlc/contrib/windowsphone/libvorbis/lib/os.h      2014-12-15 16:54:46.588645600 +0100
+@@ -120,7 +120,7 @@
+
+ /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
+  * 64 bit compiler */
+-#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE)
++#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(_M_ARM)
+ #  define VORBIS_FPU_CONTROL
+
+ typedef ogg_int16_t vorbis_fpu_control;

diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index eedfbb1fd869e70f103e0d80dba9089d6957062e..eed4fecec0dfdb4241b2adb7027c8be878e081f7 100644 (file)
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -26,6 +26,9 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
        $(UNPACK)
        $(APPLY) $(SRC)/vorbis/osx.patch
+ifdef HAVE_VISUALSTUDIO
+       $(APPLY) $(SRC)/vorbis/msvc.patch
+endif
        $(UPDATE_AUTOCONFIG)
        $(MOVE)