Skip to content

Commit 336238e

Browse files
committed
Tweaks for fixing JUCE support
Signed-off-by: falkTX <falktx@falktx.com>
1 parent c9412fd commit 336238e

File tree

5 files changed

+31
-1
lines changed

5 files changed

+31
-1
lines changed

plugins-dep/package/juce-6.0/toolchainfile.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ endif()
3232
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
3333
set(CROSSCOMPILING TRUE)
3434
set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
35+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3536
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
3637
set(CROSSCOMPILING TRUE)
3738
set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
39+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3840
endif()
41+
42+
set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
43+
set(JUCE_MOD_BUILD TRUE)

plugins-dep/package/juce-6.1/toolchainfile.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ endif()
3232
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
3333
set(CROSSCOMPILING TRUE)
3434
set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
35+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3536
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
3637
set(CROSSCOMPILING TRUE)
3738
set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
39+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3840
endif()
41+
42+
set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
43+
set(JUCE_MOD_BUILD TRUE)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 4262a9852..4f2dcfa6b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -163,7 +163,7 @@ install(FILES "${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake"
6+
"${JUCE_CMAKE_UTILS_DIR}/juce_LinuxSubprocessHelper.cpp"
7+
DESTINATION "${JUCE_INSTALL_DESTINATION}")
8+
9+
-if(("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}") AND (NOT JUCE_BUILD_HELPER_TOOLS))
10+
+if("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}")
11+
_juce_add_lv2_manifest_helper_target()
12+
13+
if(TARGET juce_lv2_helper)

plugins-dep/package/juce-7.0/juce-7.0.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
######################################
66

7-
JUCE_7_0_VERSION = c3099e733e90b8a2e7071698980abd70efb9a4e7
7+
JUCE_7_0_VERSION = 76a34204602b6a2a46b64bf3eb3ccb0e3c41b9f8
88
JUCE_7_0_VERSION_PROJECT = JUCE-7.0.9
99
JUCE_7_0_SITE = $(call github,DISTRHO,juce,$(JUCE_7_0_VERSION))
1010
JUCE_7_0_DEPENDENCIES = host-juce-7.0 freetype
@@ -41,9 +41,11 @@ define HOST_JUCE_7_0_POST_INSTALL_JUCEAIDE
4141
endef
4242

4343
define JUCE_7_0_INSTALL_STAGING_CMDS
44+
$(INSTALL) -d $(STAGING_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)
4445
$(INSTALL) -d $(STAGING_DIR)/usr/include
4546
$(INSTALL) -d $(STAGING_DIR)/usr/lib/cmake
4647
cp $(HOST_DIR)/usr/bin/juceaide70 $(STAGING_DIR)/usr/bin/
48+
cp $(HOST_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)/juce_lv2_helper $(STAGING_DIR)/usr/bin/$(JUCE_7_0_VERSION_PROJECT)/
4749
cp -r $(HOST_DIR)/usr/include/$(JUCE_7_0_VERSION_PROJECT) $(STAGING_DIR)/usr/include/
4850
cp -r $(HOST_DIR)/usr/lib/cmake/$(JUCE_7_0_VERSION_PROJECT) $(STAGING_DIR)/usr/lib/cmake/
4951
ln -sf JUCEConfig.cmake $(STAGING_DIR)/usr/lib/cmake/$(JUCE_7_0_VERSION_PROJECT)/$(JUCE_7_0_VERSION_PROJECT)Config.cmake

plugins-dep/package/juce-7.0/toolchainfile.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ endif()
3232
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
3333
set(CROSSCOMPILING TRUE)
3434
set(CROSSCOMPILING_EMULATOR qemu-aarch64-static -L "${TARGET_DIR}")
35+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3536
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
3637
set(CROSSCOMPILING TRUE)
3738
set(CROSSCOMPILING_EMULATOR qemu-arm-static -L "${TARGET_DIR}")
39+
separate_arguments(CMAKE_CROSSCOMPILING_EMULATOR)
3840
endif()
41+
42+
set(JUCE_AUDIOPROCESSOR_NO_GUI TRUE)
43+
set(JUCE_MOD_BUILD TRUE)

0 commit comments

Comments
 (0)