Commit e752c6df authored by Seungha Yang's avatar Seungha Yang 🐑
Browse files

spandsp: Fix build error with Visual Studio 2019

We don't build spandsp library using MSVC but spandsp plugin is
built by using MSVC.

Part-of: <gstreamer/cerbero!692>
parent 27bcba2b
Pipeline #299651 canceled with stages
in 68 minutes and 59 seconds
...@@ -13,7 +13,11 @@ class Recipe(recipe.Recipe): ...@@ -13,7 +13,11 @@ class Recipe(recipe.Recipe):
patches = [ 'spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch', patches = [ 'spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch',
'spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch', 'spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch',
'spandsp/0001-Make-the-public-API-accessible-from-MSVC.patch', 'spandsp/0001-Make-the-public-API-accessible-from-MSVC.patch',
'spandsp/0001-Delete-redundant-function-prototype-in-header.patch',] 'spandsp/0001-Delete-redundant-function-prototype-in-header.patch',
# upstream commit
# https://github.com/freeswitch/spandsp/commit/9e00aa6e4718f21ddbac3ebac5248a504380c1f2
'spandsp/0001-FS-6010-resolve.patch',
]
files_libs = ['libspandsp'] files_libs = ['libspandsp']
files_devel = ['include/spandsp', 'include/spandsp.h', 'lib/pkgconfig/spandsp.pc'] files_devel = ['include/spandsp', 'include/spandsp.h', 'lib/pkgconfig/spandsp.pc']
......
From ce03adee8dee58a25c9bfa6e137390e9c13d6ca2 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 29 Nov 2013 22:16:49 -0600
Subject: [PATCH] FS-6010 --resolve
---
src/spandsp/fast_convert.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/spandsp/fast_convert.h b/src/spandsp/fast_convert.h
index 10679ea..af54e68 100644
--- a/src/spandsp/fast_convert.h
+++ b/src/spandsp/fast_convert.h
@@ -247,6 +247,7 @@ extern "C"
* Therefore implement inline versions of these functions here.
*/
+#if (_MSC_VER < 1800)
__inline long int lrint(double x)
{
long int i;
@@ -287,6 +288,7 @@ extern "C"
frndint
}
}
+#endif
__inline long int lfastrint(double x)
{
@@ -316,6 +318,7 @@ extern "C"
/* x86_64 machines will do best with a simple assignment. */
#include <intrin.h>
+#if (_MSC_VER < 1800)
__inline long int lrint(double x)
{
return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) );
@@ -325,6 +328,7 @@ extern "C"
{
return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) );
}
+#endif
__inline long int lfastrint(double x)
{
--
2.25.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment