Merge pull request microsoft#138 from fwcd/mixxx/soundtouch-emscripte…

…n-o3 [soundtouch] Fix WASM build by using -O3 instead of -Ofast (microsoft#37103)
fwcd · Mar 5, 2024 · 2df9e55 · 2df9e55
2 parents 5e1a10e + 6ad5eae
commit 2df9e55
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake
@@ -5,6 +5,8 @@ vcpkg_from_github(
     REF ${VERSION}
     SHA512 93f757b2c1abe16be589e0d191e6c0416c5980843bd416cd5cb820b65a705d98081c0fc7ca0d9880af54b5343318262c77ba39a096bb240ceec084e93ceef964
     HEAD_REF master
+    PATCHES
+        use-o3-emscripten.patch # Upstream PR: https://codeberg.org/soundtouch/soundtouch/pulls/29
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/soundtouch/use-o3-emscripten.patch b/ports/soundtouch/use-o3-emscripten.patch
@@ -0,0 +1,34 @@
+From 405c4586d4556982fd5bbddf1c70bc4815465c51 Mon Sep 17 00:00:00 2001
+Date: Sat, 2 Mar 2024 23:02:06 +0100
+Subject: [PATCH] Use -O3 instead of -Ofast when targeting Emscripten (WASM)
+
+---
+ CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14f23e8..dabcb9c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,11 +3,16 @@ project(SoundTouch VERSION 2.3.2 LANGUAGES CXX)
+
+ include(GNUInstallDirs)
+
++set(COMPILE_OPTIONS)
++
+ if(MSVC)
+   set(COMPILE_DEFINITIONS /O2 /fp:fast)
+-  set(COMPILE_OPTIONS )
+ else()
+-  set(COMPILE_OPTIONS -Ofast)
++  if(EMSCRIPTEN)
++    list(APPEND COMPILE_OPTIONS -O3)
++  else()
++    list(APPEND COMPILE_OPTIONS -Ofast)
++  endif()
+ endif()
+
+ #####################
+-- 
+2.43.0
+
diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "soundtouch",
   "version": "2.3.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.",
   "homepage": "https://www.surina.net/soundtouch",
   "supports": "!uwp",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7914,7 +7914,7 @@
     },
     "soundtouch": {
       "baseline": "2.3.2",
-      "port-version": 1
+      "port-version": 3
     },
     "soxr": {
       "baseline": "0.1.3",

diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a30af1c2b397ee59f6c0048c5453ebbdf4626415",
+      "version": "2.3.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ac2649a7dd79e3a99721c357c744f81b94643a3c",
+      "version": "2.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "a2f43b08cb75d26f5756e611a64f5708dcbfb0a1",
       "version": "2.3.2",