Tweaks for fixing JUCE support

Signed-off-by: falkTX <[email protected]>
mod-audio · Nov 7, 2024 · 336238e · 336238e
1 parent c9412fd
commit 336238e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/plugins-dep/package/juce-6.0/toolchainfile.cmake b/plugins-dep/package/juce-6.0/toolchainfile.cmake
@@ -32,7 +32,12 @@ endif()
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 endif()
+
+set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
+set(JUCE_MOD_BUILD TRUE)
diff --git a/plugins-dep/package/juce-6.1/toolchainfile.cmake b/plugins-dep/package/juce-6.1/toolchainfile.cmake
@@ -32,7 +32,12 @@ endif()
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 endif()
+
+set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
+set(JUCE_MOD_BUILD TRUE)
diff --git a/plugins-dep/package/juce-7.0/05_always-generate-lv2-helper.patch b/plugins-dep/package/juce-7.0/05_always-generate-lv2-helper.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4262a9852..4f2dcfa6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,7 @@ install(FILES "${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake"
+               "${JUCE_CMAKE_UTILS_DIR}/juce_LinuxSubprocessHelper.cpp"
+         DESTINATION "${JUCE_INSTALL_DESTINATION}")
+
+-if(("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}") AND (NOT JUCE_BUILD_HELPER_TOOLS))
++if("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}")
+     _juce_add_lv2_manifest_helper_target()
+
+     if(TARGET juce_lv2_helper)
diff --git a/plugins-dep/package/juce-7.0/juce-7.0.mk b/plugins-dep/package/juce-7.0/juce-7.0.mk
@@ -4,7 +4,7 @@
 #
 ######################################
 
-JUCE_7_0_VERSION = c3099e733e90b8a2e7071698980abd70efb9a4e7
+JUCE_7_0_VERSION = 76a34204602b6a2a46b64bf3eb3ccb0e3c41b9f8
 JUCE_7_0_VERSION_PROJECT = JUCE-7.0.9
 JUCE_7_0_SITE = $(call github,DISTRHO,juce,$(JUCE_7_0_VERSION))
 JUCE_7_0_DEPENDENCIES = host-juce-7.0 freetype
@@ -41,9 +41,11 @@ define HOST_JUCE_7_0_POST_INSTALL_JUCEAIDE
 endef
 
 define JUCE_7_0_INSTALL_STAGING_CMDS
+	$(INSTALL) -d $(STAGING_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)
 	$(INSTALL) -d $(STAGING_DIR)/usr/include
 	$(INSTALL) -d $(STAGING_DIR)/usr/lib/cmake
 	cp $(HOST_DIR)/usr/bin/juceaide70 $(STAGING_DIR)/usr/bin/
+	cp $(HOST_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)/juce_lv2_helper $(STAGING_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)/
 	cp -r $(HOST_DIR)/usr/include/$(JUCE_7_0_VERSION_PROJECT) $(STAGING_DIR)/usr/include/
 	cp -r $(HOST_DIR)/usr/lib/cmake/$(JUCE_7_0_VERSION_PROJECT) $(STAGING_DIR)/usr/lib/cmake/
 	ln -sf JUCEConfig.cmake $(STAGING_DIR)/usr/lib/cmake/$(JUCE_7_0_VERSION_PROJECT)/$(JUCE_7_0_VERSION_PROJECT)Config.cmake

diff --git a/plugins-dep/package/juce-7.0/toolchainfile.cmake b/plugins-dep/package/juce-7.0/toolchainfile.cmake
@@ -32,7 +32,12 @@ endif()
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
   set(CROSSCOMPILING TRUE)
   set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
+  separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
 endif()
+
+set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
+set(JUCE_MOD_BUILD TRUE)