Merge pull request #689 from evo-lua/labsound-update-latest

Update LabSound to the latest HEAD

Author: rdw-software

deps/LabSound/LabSound

@@ -0,0 +1,16 @@
+diff --git a/cmake/LabSound.cmake b/cmake/LabSound.cmake
+index 82b3326e..583b1640 100644
+--- a/cmake/LabSound.cmake
++++ b/cmake/LabSound.cmake
+@@ -44,9 +44,9 @@ elseif (LABSOUND_USE_RTAUDIO)
+     )
+ endif()
+ 
+-option(LABSOUND_INTERNAL_LIBSAMPLERATE, "Use internal libsamplerate", ON)
++option(LABSOUND_INTERNAL_LIBSAMPLERATE "Use internal libsamplerate" ON)
+ if (LABSOUND_INTERNAL_LIBSAMPLERATE)
+-    set(LABSOUND_LSR "${LABSOUND_ROOT}/src/internal/src/samplerate.c")
++    set(LABSOUND_LSR "${LABSOUND_ROOT}/src/internal/src/libSampleRate.c")
+ else()
+     find_package(libsamplerate)
+     if (NOT libsamplerate_FOUND)

deps/LabSound/cmakebuild-fixup.diff

@@ -6,6 +6,20 @@ OUT_DIR=$(pwd)/ninjabuild-unix
 SRC_DIR=$(pwd)/deps/LabSound/LabSound
 BUILD_DIR=$SRC_DIR/cmakebuild-unix
 
+cleanup() {
+    echo "Reverting CMakeLists patch (to make sure the build is idempotent)"
+    cd $SRC_DIR
+    git apply -R ../cmakebuild-fixup.diff
+    cd -
+}
+
+trap cleanup EXIT
+
+echo "Applying CMakeLists patch (this should hopefully be temporary)"
+cd $SRC_DIR
+git apply ../cmakebuild-fixup.diff
+cd -
+
 cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-fpermissive -DCMAKE_CXX_COMPILER=g++ -DLABSOUND_USE_MINIAUDIO=OFF -DLABSOUND_USE_RTAUDIO=ON
 cmake --build $BUILD_DIR --clean-first --config Release
 

deps/labsound-unixbuild.sh

@@ -6,6 +6,20 @@ OUT_DIR=$(pwd)/ninjabuild-windows
 SRC_DIR=$(pwd)/deps/LabSound/LabSound
 BUILD_DIR=$SRC_DIR/cmakebuild-windows
 
+cleanup() {
+    echo "Reverting CMakeLists patch (to make sure the build is idempotent)"
+    cd $SRC_DIR
+    git apply -R ../cmakebuild-fixup.diff
+    cd -
+}
+
+trap cleanup EXIT
+
+echo "Applying CMakeLists patch (this should hopefully be temporary)"
+cd $SRC_DIR
+git apply ../cmakebuild-fixup.diff
+cd -
+
 cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-fpermissive -DCMAKE_CXX_COMPILER=g++ -DLABSOUND_USE_MINIAUDIO=OFF -DLABSOUND_USE_RTAUDIO=ON
 cmake --build $BUILD_DIR --clean-first --config Release