diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-12-01 17:22:39 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-12-01 17:23:53 +0530 |
| commit | e2bef710736f6d9e050630deaeae7541ed2b5398 (patch) | |
| tree | d42b2ac9bd1130c013cdc270b41d6af9a2c640df | |
| parent | 94122e73d20a5167a7c36fc0bd7b58a5995938de (diff) | |
webrtc-audio-processing.recipe: Fix segfault on windows x86
Just disable the SSE2 paths since this is a bug in our old toolchain.
Closes https://gitlab.freedesktop.org/gstreamer/cerbero/issues/216
| -rw-r--r-- | recipes/webrtc-audio-processing.recipe | 4 | ||||
| -rw-r--r-- | recipes/webrtc-audio-processing/0001-Disable-SSE2-codepaths-on-x86-windows.patch | 26 |
2 files changed, 29 insertions, 1 deletions
diff --git a/recipes/webrtc-audio-processing.recipe b/recipes/webrtc-audio-processing.recipe index d2a67a3d..c2d34f9e 100644 --- a/recipes/webrtc-audio-processing.recipe +++ b/recipes/webrtc-audio-processing.recipe @@ -41,7 +41,9 @@ class Recipe(recipe.Recipe): # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/merge_requests/1 'webrtc-audio-processing/0001-Initial-meson-build-files.patch', # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/merge_requests/2 - 'webrtc-audio-processing/0001-build-meson-fix-compilation-on-arm64.patch',] + 'webrtc-audio-processing/0001-build-meson-fix-compilation-on-arm64.patch', + # https://gitlab.freedesktop.org/gstreamer/cerbero/issues/216 + 'webrtc-audio-processing/0001-Disable-SSE2-codepaths-on-x86-windows.patch',] files_libs = ['libwebrtc_audio_processing'] files_devel = ['include/webrtc_audio_processing', 'lib/pkgconfig/webrtc-audio-processing.pc'] diff --git a/recipes/webrtc-audio-processing/0001-Disable-SSE2-codepaths-on-x86-windows.patch b/recipes/webrtc-audio-processing/0001-Disable-SSE2-codepaths-on-x86-windows.patch new file mode 100644 index 00000000..713303fd --- /dev/null +++ b/recipes/webrtc-audio-processing/0001-Disable-SSE2-codepaths-on-x86-windows.patch @@ -0,0 +1,26 @@ +From 5109cdef1f2bb0a07304159b20bb1bb832c48909 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Sun, 1 Dec 2019 16:11:24 +0530 +Subject: [PATCH] Disable SSE2 codepaths on x86 windows + +Closes https://gitlab.freedesktop.org/gstreamer/cerbero/issues/216 +--- + webrtc/system_wrappers/source/cpu_features.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/webrtc/system_wrappers/source/cpu_features.cc b/webrtc/system_wrappers/source/cpu_features.cc +index 49840eb..6000d6d 100644 +--- a/webrtc/system_wrappers/source/cpu_features.cc ++++ b/webrtc/system_wrappers/source/cpu_features.cc +@@ -47,7 +47,7 @@ static inline void __cpuid(int cpu_info[4], int info_type) { + #endif // _MSC_VER + #endif // WEBRTC_ARCH_X86_FAMILY + +-#if defined(WEBRTC_ARCH_X86_FAMILY) ++#if defined(WEBRTC_ARCH_X86_FAMILY) && !(defined(_WIN32) && defined(WEBRTC_ARCH_X86)) + // Actual feature detection for x86. + static int GetCPUInfo(CPUFeature feature) { + int cpu_info[4]; +-- +2.23.0 + |