From de2f4b62c9465cfeab91b39db6f14f342a8935b2 Mon Sep 17 00:00:00 2001 From: RDW Date: Wed, 7 May 2025 00:21:56 +0200 Subject: [PATCH 1/2] Deps: Update LabSound to the latest HEAD --- deps/LabSound/LabSound | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/LabSound/LabSound b/deps/LabSound/LabSound index 21e4e5f35..da521feba 160000 --- a/deps/LabSound/LabSound +++ b/deps/LabSound/LabSound @@ -1 +1 @@ -Subproject commit 21e4e5f35d2c26fd89165ecce70aed2fa1f62aca +Subproject commit da521feba56d1d9dd4ab66bdb4ebcebaee83e40d From 690c45fd6cc61ff612c95cfdd3f8de7afabcdade Mon Sep 17 00:00:00 2001 From: RDW Date: Wed, 7 May 2025 00:35:35 +0200 Subject: [PATCH 2/2] Deps: Fix LabSound build errors via diff patch One more workaround added to the pile. --- deps/LabSound/cmakebuild-fixup.diff | 16 ++++++++++++++++ deps/labsound-unixbuild.sh | 14 ++++++++++++++ deps/labsound-windowsbuild.sh | 14 ++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 deps/LabSound/cmakebuild-fixup.diff diff --git a/deps/LabSound/cmakebuild-fixup.diff b/deps/LabSound/cmakebuild-fixup.diff new file mode 100644 index 000000000..37fed5fe4 --- /dev/null +++ b/deps/LabSound/cmakebuild-fixup.diff @@ -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) diff --git a/deps/labsound-unixbuild.sh b/deps/labsound-unixbuild.sh index 1f0428ee5..912d5b5ef 100755 --- a/deps/labsound-unixbuild.sh +++ b/deps/labsound-unixbuild.sh @@ -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 diff --git a/deps/labsound-windowsbuild.sh b/deps/labsound-windowsbuild.sh index aa03e5a32..9fd421736 100755 --- a/deps/labsound-windowsbuild.sh +++ b/deps/labsound-windowsbuild.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