Merge pull request #137 from fwcd/mixxx/rubberband-fftw3-ios-wasm

[rubberband] Use FFTW3 when targeting iOS or WASM (microsoft#37101)
mixxxdj · Mar 5, 2024 · 5e1a10e · 5e1a10e
2 parents eddd0f2 + 78a74a0
commit 5e1a10e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake
@@ -14,9 +14,12 @@ else()
 endif()
 
 # Select fastest available FFT library according https://github.com/breakfastquay/rubberband/blob/default/COMPILING.md#fft-libraries-supported
-if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
-    set(FFT_LIB "fftw")
-elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+if(
+    (VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
+    OR (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    OR VCPKG_TARGET_IS_IOS
+    OR VCPKG_TARGET_IS_EMSCRIPTEN
+)
     set(FFT_LIB "fftw")
 else()
     set(FFT_LIB "sleef")

diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json
@@ -1,19 +1,20 @@
 {
   "name": "rubberband",
   "version": "3.3.0",
+  "port-version": 1,
   "description": "A high quality software library for audio time-stretching and pitch-shifting.",
   "homepage": "https://www.breakfastquay.com/rubberband/",
   "license": "GPL-2.0-or-later",
   "supports": "!uwp & !(windows & static) & !xbox",
   "dependencies": [
     {
       "name": "fftw3",
-      "platform": "(arm & windows) | (x86 & windows) | (arm64 & osx)"
+      "platform": "(arm & windows) | (x86 & windows) | (arm64 & osx) | ios | emscripten"
     },
     "libsamplerate",
     {
       "name": "sleef",
-      "platform": "!(arm & windows) & !(x86 & windows) & !(arm64 & osx)"
+      "platform": "!(arm & windows) & !(x86 & windows) & !(arm64 & osx) & !ios & !emscripten"
     },
     {
       "name": "vcpkg-tool-meson",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7474,7 +7474,7 @@
     },
     "rubberband": {
       "baseline": "3.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "rxcpp": {
       "baseline": "4.1.1",

diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "478bcca88451fbdd2fa88816f21449c1b8675e9d",
+      "version": "3.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f3a5ed426944950b92d114499028a3c4c5ed3219",
       "version": "3.3.0",