Signed-off-by: falkTX <falktx@falktx.com>master
@@ -0,0 +1,5 @@ | |||||
distrho-juce-6.0 (6:6.0.8+git2023-12-25-1kxstudio3) focal; urgency=medium | |||||
* Initial package | |||||
-- falkTX <falktx@falktx.com> Mon, 25 Dec 2023 14:29:55 +0100 |
@@ -1,4 +1,4 @@ | |||||
Source: distrho-juce6 | |||||
Source: distrho-juce-6.0 | |||||
Section: devel | Section: devel | ||||
Priority: optional | Priority: optional | ||||
Maintainer: falkTX <falktx@falktx.com> | Maintainer: falkTX <falktx@falktx.com> | ||||
@@ -17,7 +17,7 @@ Standards-Version: 4.5.0 | |||||
Homepage: https://github.com/DISTRHO/JUCE/ | Homepage: https://github.com/DISTRHO/JUCE/ | ||||
Rules-Requires-Root: no | Rules-Requires-Root: no | ||||
Package: distrho-juce6-bin | |||||
Package: distrho-juce-6.0-bin | |||||
Architecture: any | Architecture: any | ||||
Depends: ${shlibs:Depends}, ${misc:Depends} | Depends: ${shlibs:Depends}, ${misc:Depends} | ||||
Description: cross-platform C++ framework with DISTRHO/KXStudio changes | Description: cross-platform C++ framework with DISTRHO/KXStudio changes | ||||
@@ -25,11 +25,11 @@ Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
rapidly developing high quality desktop and mobile applications, | rapidly developing high quality desktop and mobile applications, | ||||
including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | ||||
. | . | ||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6.0. | |||||
Package: distrho-juce6-dev | |||||
Package: distrho-juce-6.0-dev | |||||
Architecture: all | Architecture: all | ||||
Depends: ${misc:Depends}, distrho-juce6-bin, | |||||
Depends: ${misc:Depends}, distrho-juce-6.0-bin, | |||||
cmake, | cmake, | ||||
pkg-config, | pkg-config, | ||||
libfreetype6-dev, | libfreetype6-dev, | ||||
@@ -44,4 +44,4 @@ Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
rapidly developing high quality desktop and mobile applications, | rapidly developing high quality desktop and mobile applications, | ||||
including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | ||||
. | . | ||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6.0. |
@@ -1,3 +1,3 @@ | |||||
/opt/kxstudio/include | /opt/kxstudio/include | ||||
/opt/kxstudio/lib | /opt/kxstudio/lib | ||||
extras/Build/CMake/lv2_ttl_generator.c /opt/kxstudio/lib/cmake/JUCE6/ | |||||
extras/Build/CMake/lv2_ttl_generator.c /opt/kxstudio/lib/cmake/JUCE-6.0.8/ |
@@ -0,0 +1 @@ | |||||
/opt/kxstudio/lib/cmake/JUCE-6.0.8/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE-6.0.8/JUCE-6.0.8Config.cmake |
@@ -0,0 +1,84 @@ | |||||
diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
index 3e5c97d..f2af3a8 100644 | |||||
--- a/extras/Build/CMake/JUCEConfig.cmake.in | |||||
+++ b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
@@ -20,10 +20,12 @@ | |||||
@PACKAGE_INIT@ | |||||
-if(NOT TARGET juce::juceaide) | |||||
- add_executable(juce::juceaide IMPORTED) | |||||
- set_target_properties(juce::juceaide PROPERTIES | |||||
- IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") | |||||
+set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") | |||||
+ | |||||
+if(NOT TARGET juceaide60) | |||||
+ add_executable(juceaide60 IMPORTED) | |||||
+ set_target_properties(juceaide60 PROPERTIES | |||||
+ IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide60") | |||||
endif() | |||||
check_required_components("@PROJECT_NAME@") | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | |||||
index 23b56c4..0d8fd93 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | |||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | |||||
@@ -414,7 +414,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) | |||||
# In the end, it's simplest to generate a special single-purpose appconfig just for the | |||||
# resource compiler. | |||||
add_custom_command(OUTPUT "${secret_au_plugindefines}" | |||||
- COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
+ COMMAND juceaide60 auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
DEPENDS "${defs_file}" | |||||
VERBATIM) | |||||
@@ -856,7 +856,7 @@ function(juce_add_binary_data target) | |||||
list(APPEND binary_file_names "${juce_binary_data_folder}/${JUCE_ARG_HEADER_NAME}") | |||||
add_custom_command(OUTPUT ${binary_file_names} | |||||
- COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
+ COMMAND juceaide60 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
${juce_binary_data_folder} ${JUCE_ARG_SOURCES} | |||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | |||||
DEPENDS ${JUCE_ARG_SOURCES} | |||||
@@ -953,7 +953,7 @@ function(juce_generate_juce_header target) | |||||
set(extra_args) | |||||
add_custom_command(OUTPUT "${juce_header}" | |||||
- COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args} | |||||
+ COMMAND juceaide60 header "${defs_file}" "${juce_header}" ${extra_args} | |||||
DEPENDS "${defs_file}" | |||||
VERBATIM) | |||||
endfunction() | |||||
@@ -961,11 +961,11 @@ endfunction() | |||||
# ================================================================================================== | |||||
function(_juce_execute_juceaide) | |||||
- if(NOT TARGET juce::juceaide) | |||||
+ if(NOT TARGET juceaide60) | |||||
message(FATAL_ERROR "The juceaide target does not exist") | |||||
endif() | |||||
- get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION) | |||||
+ get_target_property(juceaide_location juceaide60 IMPORTED_LOCATION) | |||||
if(NOT EXISTS "${juceaide_location}") | |||||
message(FATAL_ERROR "juceaide was imported, but it doesn't exist!") | |||||
@@ -1095,7 +1095,7 @@ function(_juce_configure_bundle source_target dest_target) | |||||
MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}") | |||||
add_custom_command(OUTPUT "${this_output_pkginfo}" | |||||
- COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
+ COMMAND juceaide60 pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
VERBATIM) | |||||
set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>") | |||||
@@ -1187,7 +1187,7 @@ function(_juce_add_resources_rc source_target dest_target) | |||||
set(resource_rc_file "${juce_library_code}/resources.rc") | |||||
add_custom_command(OUTPUT "${resource_rc_file}" | |||||
- COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}" | |||||
+ COMMAND juceaide60 rcfile "${input_info_file}" "${resource_rc_file}" | |||||
${dependency} | |||||
VERBATIM) | |||||
@@ -1,5 +1,5 @@ | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | ||||
index 1d8408ebc..060ed45e3 100644 | |||||
index 768dc8a..052d9b3 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | --- a/extras/Build/CMake/JUCEUtils.cmake | ||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | +++ b/extras/Build/CMake/JUCEUtils.cmake | ||||
@@ -182,9 +182,9 @@ function(_juce_set_default_properties) | @@ -182,9 +182,9 @@ function(_juce_set_default_properties) |
@@ -0,0 +1,5 @@ | |||||
01_kxstudio-build.patch | |||||
02_skip-alsa-dependency.patch | |||||
03_versioned-juceaide.patch | |||||
04_copy-to-destdir.patch | |||||
05_disable-xinerama.patch |
@@ -7,13 +7,13 @@ override_dh_auto_configure: | |||||
-DCMAKE_BUILD_TYPE=Release \ | -DCMAKE_BUILD_TYPE=Release \ | ||||
-DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ | -DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ | ||||
-DJUCE_BUILD_HELPER_TOOLS=ON \ | -DJUCE_BUILD_HELPER_TOOLS=ON \ | ||||
-DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE6 | |||||
-DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE-6.0.8 | |||||
override_dh_auto_install: | override_dh_auto_install: | ||||
dh_auto_install | dh_auto_install | ||||
install -d $(CURDIR)/debian/distrho-juce6-bin/opt/kxstudio/bin | |||||
install -d $(CURDIR)/debian/tmp/opt/kxstudio/bin | |||||
install -m 755 $(CURDIR)/obj-*/extras/Build/juceaide/juceaide_artefacts/Release/juceaide \ | install -m 755 $(CURDIR)/obj-*/extras/Build/juceaide/juceaide_artefacts/Release/juceaide \ | ||||
$(CURDIR)/debian/distrho-juce6-bin/opt/kxstudio/bin/juceaide6 | |||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/juceaide60 | |||||
%: | %: | ||||
dh $@ -Scmake | dh $@ -Scmake |
@@ -0,0 +1 @@ | |||||
3.0 (native) |
@@ -0,0 +1,5 @@ | |||||
distrho-juce-6.1 (6:6.1.6+git2023-12-25-1kxstudio2) focal; urgency=medium | |||||
* Initial package | |||||
-- falkTX <falktx@falktx.com> Mon, 25 Dec 2023 14:29:55 +0100 |
@@ -0,0 +1,47 @@ | |||||
Source: distrho-juce-6.1 | |||||
Section: devel | |||||
Priority: optional | |||||
Maintainer: falkTX <falktx@falktx.com> | |||||
Build-Depends: debhelper-compat (= 13), | |||||
kxstudio-build-scripts, | |||||
cmake, | |||||
pkg-config, | |||||
libfreetype6-dev, | |||||
libgl1-mesa-dev | libglvnd-dev, | |||||
libx11-dev, | |||||
libxcomposite-dev, | |||||
libxcursor-dev, | |||||
libxrandr-dev, | |||||
libxrender-dev | |||||
Standards-Version: 4.5.0 | |||||
Homepage: https://github.com/DISTRHO/JUCE/ | |||||
Rules-Requires-Root: no | |||||
Package: distrho-juce-6.1-bin | |||||
Architecture: any | |||||
Depends: ${shlibs:Depends}, ${misc:Depends} | |||||
Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
JUCE is an open-source cross-platform C++ application framework used for | |||||
rapidly developing high quality desktop and mobile applications, | |||||
including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | |||||
. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6.1. | |||||
Package: distrho-juce-6.1-dev | |||||
Architecture: all | |||||
Depends: ${misc:Depends}, distrho-juce-6.1-bin, | |||||
cmake, | |||||
pkg-config, | |||||
libfreetype6-dev, | |||||
libgl1-mesa-dev | libglvnd-dev, | |||||
libx11-dev, | |||||
libxcomposite-dev, | |||||
libxcursor-dev, | |||||
libxrandr-dev, | |||||
libxrender-dev | |||||
Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
JUCE is an open-source cross-platform C++ application framework used for | |||||
rapidly developing high quality desktop and mobile applications, | |||||
including LV2, VST, AU (and AUv3), RTAS and AAX audio plug-ins. | |||||
. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 6.1. |
@@ -0,0 +1 @@ | |||||
/opt/kxstudio/bin |
@@ -0,0 +1,3 @@ | |||||
/opt/kxstudio/include | |||||
/opt/kxstudio/lib | |||||
extras/Build/CMake/lv2_ttl_generator.c /opt/kxstudio/lib/cmake/JUCE-6.1.6/ |
@@ -0,0 +1 @@ | |||||
/opt/kxstudio/lib/cmake/JUCE-6.1.6/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE-6.1.6/JUCE-6.1.6Config.cmake |
@@ -1,5 +1,5 @@ | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | ||||
index 58e65087c..cb13f9fee 100644 | |||||
index 3f59bea..786fc3a 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | --- a/extras/Build/CMake/JUCEUtils.cmake | ||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | +++ b/extras/Build/CMake/JUCEUtils.cmake | ||||
@@ -84,7 +84,7 @@ define_property(TARGET PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD INHERITED | @@ -84,7 +84,7 @@ define_property(TARGET PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD INHERITED |
@@ -0,0 +1,21 @@ | |||||
diff --git a/modules/juce_audio_devices/juce_audio_devices.h b/modules/juce_audio_devices/juce_audio_devices.h | |||||
index 0cc0a4496..f0eb557e5 100644 | |||||
--- a/modules/juce_audio_devices/juce_audio_devices.h | |||||
+++ b/modules/juce_audio_devices/juce_audio_devices.h | |||||
@@ -41,7 +41,6 @@ | |||||
dependencies: juce_audio_basics, juce_events | |||||
OSXFrameworks: CoreAudio CoreMIDI AudioToolbox | |||||
iOSFrameworks: CoreAudio CoreMIDI AudioToolbox AVFoundation | |||||
- linuxPackages: alsa | |||||
mingwLibs: winmm | |||||
END_JUCE_MODULE_DECLARATION | |||||
@@ -105,7 +104,7 @@ | |||||
Enables ALSA audio devices (Linux only). | |||||
*/ | |||||
#ifndef JUCE_ALSA | |||||
- #define JUCE_ALSA 1 | |||||
+ #define JUCE_ALSA 0 | |||||
#endif | |||||
/** Config: JUCE_JACK |
@@ -1,5 +1,5 @@ | |||||
diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in | diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in | ||||
index 3e5c97de5..5609fa7bd 100644 | |||||
index 782c732..9f29061 100644 | |||||
--- a/extras/Build/CMake/JUCEConfig.cmake.in | --- a/extras/Build/CMake/JUCEConfig.cmake.in | ||||
+++ b/extras/Build/CMake/JUCEConfig.cmake.in | +++ b/extras/Build/CMake/JUCEConfig.cmake.in | ||||
@@ -20,10 +20,12 @@ | @@ -20,10 +20,12 @@ | ||||
@@ -12,87 +12,87 @@ index 3e5c97de5..5609fa7bd 100644 | |||||
- IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") | - IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") | ||||
+set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") | +set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") | ||||
+ | + | ||||
+if(NOT TARGET juceaide6) | |||||
+ add_executable(juceaide6 IMPORTED) | |||||
+ set_target_properties(juceaide6 PROPERTIES | |||||
+ IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide6") | |||||
+if(NOT TARGET juceaide61) | |||||
+ add_executable(juceaide61 IMPORTED) | |||||
+ set_target_properties(juceaide61 PROPERTIES | |||||
+ IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide61") | |||||
endif() | endif() | ||||
check_required_components("@PROJECT_NAME@") | check_required_components("@PROJECT_NAME@") | ||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | ||||
index 1d8408ebc..8c6a253fe 100644 | |||||
index 786fc3a..86af138 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | --- a/extras/Build/CMake/JUCEUtils.cmake | ||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | +++ b/extras/Build/CMake/JUCEUtils.cmake | ||||
@@ -419,7 +419,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) | |||||
@@ -187,7 +187,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) | |||||
# In the end, it's simplest to generate a special single-purpose appconfig just for the | # In the end, it's simplest to generate a special single-purpose appconfig just for the | ||||
# resource compiler. | # resource compiler. | ||||
add_custom_command(OUTPUT "${secret_au_plugindefines}" | add_custom_command(OUTPUT "${secret_au_plugindefines}" | ||||
- COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}" | - COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}" | ||||
+ COMMAND juceaide6 auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
+ COMMAND juceaide61 auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
DEPENDS "${defs_file}" | DEPENDS "${defs_file}" | ||||
VERBATIM) | VERBATIM) | ||||
@@ -861,7 +861,7 @@ function(juce_add_binary_data target) | |||||
list(APPEND binary_file_names "${juce_binary_data_folder}/${JUCE_ARG_HEADER_NAME}") | |||||
@@ -409,7 +409,7 @@ function(juce_add_binary_data target) | |||||
file(WRITE "${input_file_list}" "${newline_delimited_input}") | |||||
add_custom_command(OUTPUT ${binary_file_names} | add_custom_command(OUTPUT ${binary_file_names} | ||||
- COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | - COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | ||||
+ COMMAND juceaide6 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
${juce_binary_data_folder} ${JUCE_ARG_SOURCES} | |||||
+ COMMAND juceaide61 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
${juce_binary_data_folder} "${input_file_list}" | |||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | ||||
DEPENDS ${JUCE_ARG_SOURCES} | |||||
@@ -958,7 +958,7 @@ function(juce_generate_juce_header target) | |||||
DEPENDS "${input_file_list}" | |||||
@@ -493,7 +493,7 @@ function(juce_generate_juce_header target) | |||||
set(extra_args) | set(extra_args) | ||||
add_custom_command(OUTPUT "${juce_header}" | add_custom_command(OUTPUT "${juce_header}" | ||||
- COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args} | - COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args} | ||||
+ COMMAND juceaide6 header "${defs_file}" "${juce_header}" ${extra_args} | |||||
+ COMMAND juceaide61 header "${defs_file}" "${juce_header}" ${extra_args} | |||||
DEPENDS "${defs_file}" | DEPENDS "${defs_file}" | ||||
VERBATIM) | VERBATIM) | ||||
endfunction() | endfunction() | ||||
@@ -966,20 +966,20 @@ endfunction() | |||||
@@ -501,20 +501,20 @@ endfunction() | |||||
# ================================================================================================== | # ================================================================================================== | ||||
function(_juce_execute_juceaide) | function(_juce_execute_juceaide) | ||||
- if(NOT TARGET juce::juceaide) | - if(NOT TARGET juce::juceaide) | ||||
- message(FATAL_ERROR "The juceaide target does not exist") | - message(FATAL_ERROR "The juceaide target does not exist") | ||||
+ if(NOT TARGET juceaide6) | |||||
+ message(FATAL_ERROR "The juceaide6 target does not exist") | |||||
+ if(NOT TARGET juceaide61) | |||||
+ message(FATAL_ERROR "The juceaide61 target does not exist") | |||||
endif() | endif() | ||||
- get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION) | - get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION) | ||||
+ get_target_property(juceaide6_location juceaide6 IMPORTED_LOCATION) | |||||
+ get_target_property(juceaide61_location juceaide61 IMPORTED_LOCATION) | |||||
- if(NOT EXISTS "${juceaide_location}") | - if(NOT EXISTS "${juceaide_location}") | ||||
- message(FATAL_ERROR "juceaide was imported, but it doesn't exist!") | - message(FATAL_ERROR "juceaide was imported, but it doesn't exist!") | ||||
+ if(NOT EXISTS "${juceaide6_location}") | |||||
+ message(FATAL_ERROR "juceaide6 was imported, but it doesn't exist!") | |||||
+ if(NOT EXISTS "${juceaide61_location}") | |||||
+ message(FATAL_ERROR "juceaide61 was imported, but it doesn't exist!") | |||||
endif() | endif() | ||||
- execute_process(COMMAND "${juceaide_location}" ${ARGN} RESULT_VARIABLE result_variable) | - execute_process(COMMAND "${juceaide_location}" ${ARGN} RESULT_VARIABLE result_variable) | ||||
+ execute_process(COMMAND "${juceaide6_location}" ${ARGN} RESULT_VARIABLE result_variable) | |||||
+ execute_process(COMMAND "${juceaide61_location}" ${ARGN} RESULT_VARIABLE result_variable) | |||||
if(result_variable) | if(result_variable) | ||||
- message(FATAL_ERROR "Running juceaide failed") | - message(FATAL_ERROR "Running juceaide failed") | ||||
+ message(FATAL_ERROR "Running juceaide6 failed") | |||||
+ message(FATAL_ERROR "Running juceaide61 failed") | |||||
endif() | endif() | ||||
endfunction() | endfunction() | ||||
@@ -1100,7 +1100,7 @@ function(_juce_configure_bundle source_target dest_target) | |||||
@@ -651,7 +651,7 @@ function(_juce_configure_bundle source_target dest_target) | |||||
MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}") | MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}") | ||||
add_custom_command(OUTPUT "${this_output_pkginfo}" | add_custom_command(OUTPUT "${this_output_pkginfo}" | ||||
- COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | - COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | ||||
+ COMMAND juceaide6 pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
+ COMMAND juceaide61 pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
VERBATIM) | VERBATIM) | ||||
set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>") | set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>") | ||||
@@ -1192,7 +1192,7 @@ function(_juce_add_resources_rc source_target dest_target) | |||||
@@ -743,7 +743,7 @@ function(_juce_add_resources_rc source_target dest_target) | |||||
set(resource_rc_file "${juce_library_code}/resources.rc") | set(resource_rc_file "${juce_library_code}/resources.rc") | ||||
add_custom_command(OUTPUT "${resource_rc_file}" | add_custom_command(OUTPUT "${resource_rc_file}" | ||||
- COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}" | - COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}" | ||||
+ COMMAND juceaide6 rcfile "${input_info_file}" "${resource_rc_file}" | |||||
+ COMMAND juceaide61 rcfile "${input_info_file}" "${resource_rc_file}" | |||||
${dependency} | ${dependency} | ||||
VERBATIM) | VERBATIM) | ||||
@@ -0,0 +1,17 @@ | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | |||||
index 86af138..07c279c 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | |||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | |||||
@@ -117,9 +117,9 @@ function(_juce_set_default_properties) | |||||
set_property(GLOBAL PROPERTY JUCE_VST3_COPY_DIR "${prefix}/VST3") | |||||
set_property(GLOBAL PROPERTY JUCE_AAX_COPY_DIR "${prefix}/Avid/Audio/Plug-Ins") | |||||
elseif((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) | |||||
- set_property(GLOBAL PROPERTY JUCE_VST_COPY_DIR "$ENV{HOME}/.vst") | |||||
- set_property(GLOBAL PROPERTY JUCE_VST3_COPY_DIR "$ENV{HOME}/.vst3") | |||||
- set_property(GLOBAL PROPERTY JUCE_LV2_COPY_DIR "$ENV{HOME}/.lv2") | |||||
+ set_property(GLOBAL PROPERTY JUCE_VST_COPY_DIR "$ENV{DESTDIR}/usr/lib/vst") | |||||
+ set_property(GLOBAL PROPERTY JUCE_VST3_COPY_DIR "$ENV{DESTDIR}/usr/lib/vst3") | |||||
+ set_property(GLOBAL PROPERTY JUCE_LV2_COPY_DIR "$ENV{DESTDIR}/usr/lib/lv2") | |||||
endif() | |||||
endfunction() | |||||
@@ -0,0 +1,13 @@ | |||||
diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h | |||||
index 28097d128..fe635da32 100644 | |||||
--- a/modules/juce_gui_basics/juce_gui_basics.h | |||||
+++ b/modules/juce_gui_basics/juce_gui_basics.h | |||||
@@ -88,7 +88,7 @@ | |||||
the availability of Xinerama is queried during runtime. | |||||
*/ | |||||
#ifndef JUCE_USE_XINERAMA | |||||
- #define JUCE_USE_XINERAMA 1 | |||||
+ #define JUCE_USE_XINERAMA 0 | |||||
#endif | |||||
/** Config: JUCE_USE_XSHM |
@@ -0,0 +1,19 @@ | |||||
#!/usr/bin/make -f | |||||
include /usr/share/dpkg/kxstudio.mk | |||||
override_dh_auto_configure: | |||||
dh_auto_configure -- \ | |||||
-DCMAKE_BUILD_TYPE=Release \ | |||||
-DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ | |||||
-DJUCE_BUILD_HELPER_TOOLS=ON \ | |||||
-DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE-6.1.6 | |||||
override_dh_auto_install: | |||||
dh_auto_install | |||||
install -d $(CURDIR)/debian/tmp/opt/kxstudio/bin | |||||
install -m 755 $(CURDIR)/obj-*/extras/Build/juceaide/juceaide_artefacts/Release/juceaide \ | |||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/juceaide61 | |||||
%: | |||||
dh $@ -Scmake |
@@ -0,0 +1 @@ | |||||
3.0 (native) |
@@ -0,0 +1,5 @@ | |||||
distrho-juce-7.0 (6:7.0.9+git2023-12-25-1kxstudio2) focal; urgency=medium | |||||
* Initial package | |||||
-- falkTX <falktx@falktx.com> Mon, 25 Dec 2023 14:29:55 +0100 |
@@ -1,4 +1,4 @@ | |||||
Source: distrho-juce7 | |||||
Source: distrho-juce-7.0 | |||||
Section: devel | Section: devel | ||||
Priority: optional | Priority: optional | ||||
Maintainer: falkTX <falktx@falktx.com> | Maintainer: falkTX <falktx@falktx.com> | ||||
@@ -17,7 +17,7 @@ Standards-Version: 4.5.0 | |||||
Homepage: https://github.com/DISTRHO/JUCE/ | Homepage: https://github.com/DISTRHO/JUCE/ | ||||
Rules-Requires-Root: no | Rules-Requires-Root: no | ||||
Package: distrho-juce7-bin | |||||
Package: distrho-juce-7.0-bin | |||||
Architecture: any | Architecture: any | ||||
Depends: ${shlibs:Depends}, ${misc:Depends} | Depends: ${shlibs:Depends}, ${misc:Depends} | ||||
Description: cross-platform C++ framework with DISTRHO/KXStudio changes | Description: cross-platform C++ framework with DISTRHO/KXStudio changes | ||||
@@ -25,11 +25,11 @@ Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
high quality desktop and mobile applications, including LV2, VST2, VST3, AU, | high quality desktop and mobile applications, including LV2, VST2, VST3, AU, | ||||
AUv3 and AAX audio plug-ins. | AUv3 and AAX audio plug-ins. | ||||
. | . | ||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 7. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 7.0. | |||||
Package: distrho-juce7-dev | |||||
Package: distrho-juce-7.0-dev | |||||
Architecture: all | Architecture: all | ||||
Depends: ${misc:Depends}, distrho-juce7-bin, | |||||
Depends: ${misc:Depends}, distrho-juce-7.0-bin, | |||||
cmake, | cmake, | ||||
pkg-config, | pkg-config, | ||||
libfreetype6-dev, | libfreetype6-dev, | ||||
@@ -44,4 +44,4 @@ Description: cross-platform C++ framework with DISTRHO/KXStudio changes | |||||
high quality desktop and mobile applications, including LV2, VST2, VST3, AU, | high quality desktop and mobile applications, including LV2, VST2, VST3, AU, | ||||
AUv3 and AAX audio plug-ins. | AUv3 and AAX audio plug-ins. | ||||
. | . | ||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 7. | |||||
This package provides the DISTRHO/KXStudio fork of JUCE, version 7.0. |
@@ -0,0 +1 @@ | |||||
/opt/kxstudio/bin |
@@ -0,0 +1 @@ | |||||
/opt/kxstudio/lib/cmake/JUCE-7.0.9/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE-7.0.9/JUCE-7.0.9Config.cmake |
@@ -0,0 +1,13 @@ | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | |||||
index 58e65087c..cb13f9fee 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | |||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | |||||
@@ -84,7 +84,7 @@ define_property(TARGET PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD INHERITED | |||||
FULL_DOCS "Whether or not plugins should be copied after building") | |||||
set_property(GLOBAL PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD FALSE) | |||||
-if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) | |||||
+if((CMAKE_SYSTEM_NAME STREQUAL "LinuxIgnoredForKXStudio") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) | |||||
_juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl) | |||||
_juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0) | |||||
endif() |
@@ -0,0 +1,84 @@ | |||||
diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
index 6a96e24..500528d 100644 | |||||
--- a/extras/Build/CMake/JUCEConfig.cmake.in | |||||
+++ b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
@@ -22,10 +22,12 @@ | |||||
include("${CMAKE_CURRENT_LIST_DIR}/LV2_HELPER.cmake") | |||||
-if(NOT TARGET juce::juceaide) | |||||
- add_executable(juce::juceaide IMPORTED) | |||||
- set_target_properties(juce::juceaide PROPERTIES | |||||
- IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") | |||||
+set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") | |||||
+ | |||||
+if(NOT TARGET juceaide70) | |||||
+ add_executable(juceaide70 IMPORTED) | |||||
+ set_target_properties(juceaide70 PROPERTIES | |||||
+ IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide70") | |||||
endif() | |||||
check_required_components("@PROJECT_NAME@") | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | |||||
index d775ab8..a61b3f4 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | |||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | |||||
@@ -202,7 +202,7 @@ function(_juce_create_embedded_linux_subprocess_target output_target_name target | |||||
OUTPUT | |||||
${binary_header_file} | |||||
${binary_source_file} | |||||
- COMMAND juce::juceaide binarydata "LinuxSubprocessHelperBinaryData" "${binary_header_file}" | |||||
+ COMMAND juceaide70 binarydata "LinuxSubprocessHelperBinaryData" "${binary_header_file}" | |||||
${juce_linux_subprocess_helper_binary_dir} "${juceaide_input_file}" | |||||
COMMAND | |||||
${CMAKE_COMMAND} -E rename "${juce_linux_subprocess_helper_binary_dir}/BinaryData1.cpp" "${binary_source_file}" | |||||
@@ -436,7 +436,7 @@ function(juce_add_binary_data target) | |||||
file(WRITE "${input_file_list}" "${newline_delimited_input}") | |||||
add_custom_command(OUTPUT ${binary_file_names} | |||||
- COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
+ COMMAND juceaide70 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
${juce_binary_data_folder} "${input_file_list}" | |||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | |||||
DEPENDS "${input_file_list}" ${JUCE_ARG_SOURCES} | |||||
@@ -520,7 +520,7 @@ function(juce_generate_juce_header target) | |||||
set(extra_args) | |||||
add_custom_command(OUTPUT "${juce_header}" | |||||
- COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args} | |||||
+ COMMAND juceaide70 header "${defs_file}" "${juce_header}" ${extra_args} | |||||
DEPENDS "${defs_file}" | |||||
VERBATIM) | |||||
endfunction() | |||||
@@ -528,11 +528,11 @@ endfunction() | |||||
# ================================================================================================== | |||||
function(_juce_execute_juceaide) | |||||
- if(NOT TARGET juce::juceaide) | |||||
+ if(NOT TARGET juceaide70) | |||||
message(FATAL_ERROR "The juceaide target does not exist") | |||||
endif() | |||||
- get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION) | |||||
+ get_target_property(juceaide_location juceaide70 IMPORTED_LOCATION) | |||||
if(NOT EXISTS "${juceaide_location}") | |||||
message(FATAL_ERROR "juceaide was imported, but it doesn't exist!") | |||||
@@ -681,7 +681,7 @@ function(_juce_configure_bundle source_target dest_target) | |||||
MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}") | |||||
add_custom_command(OUTPUT "${this_output_pkginfo}" | |||||
- COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
+ COMMAND juceaide70 pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
VERBATIM) | |||||
set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>") | |||||
@@ -769,7 +769,7 @@ function(_juce_add_resources_rc source_target dest_target) | |||||
set(resource_rc_file "${juce_library_code}/${source_target}_resources.rc") | |||||
add_custom_command(OUTPUT "${resource_rc_file}" | |||||
- COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}" | |||||
+ COMMAND juceaide70 rcfile "${input_info_file}" "${resource_rc_file}" | |||||
${dependency} | |||||
VERBATIM) | |||||
@@ -1,8 +1,8 @@ | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | ||||
index 58e65087c..6fe706eec 100644 | |||||
index a61b3f4..c6b8357 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | --- a/extras/Build/CMake/JUCEUtils.cmake | ||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | +++ b/extras/Build/CMake/JUCEUtils.cmake | ||||
@@ -121,10 +121,10 @@ function(_juce_set_default_properties) | |||||
@@ -115,10 +115,10 @@ function(_juce_set_default_properties) | |||||
set_property(GLOBAL PROPERTY JUCE_LV2_COPY_DIR "$ENV{APPDATA}/LV2") | set_property(GLOBAL PROPERTY JUCE_LV2_COPY_DIR "$ENV{APPDATA}/LV2") | ||||
set_property(GLOBAL PROPERTY JUCE_UNITY_COPY_DIR "$ENV{APPDATA}/Unity") | set_property(GLOBAL PROPERTY JUCE_UNITY_COPY_DIR "$ENV{APPDATA}/Unity") | ||||
elseif((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) | elseif((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) |
@@ -1,44 +1,55 @@ | |||||
diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
index 96ff38d2e..91729d424 100644 | |||||
--- a/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
@@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) | |||||
TARGET_ARCH := | |||||
endif | |||||
- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=0" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" | |||||
JUCE_TARGET_APP := Projucer | |||||
diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h | diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h | ||||
index b84d91da6..0ae17c508 100644 | |||||
index d258d34..fbd3c88 100644 | |||||
--- a/extras/Projucer/Source/Project/jucer_Project.h | --- a/extras/Projucer/Source/Project/jucer_Project.h | ||||
+++ b/extras/Projucer/Source/Project/jucer_Project.h | +++ b/extras/Projucer/Source/Project/jucer_Project.h | ||||
@@ -161,7 +161,7 @@ public: | |||||
@@ -221,8 +221,8 @@ public: | |||||
static String getPluginDefinesFilename() { return "JucePluginDefines.h"; } | static String getPluginDefinesFilename() { return "JucePluginDefines.h"; } | ||||
static String getJuceSourceHFilename() { return "JuceHeader.h"; } | static String getJuceSourceHFilename() { return "JuceHeader.h"; } | ||||
static String getJuceLV2DefinesFilename() { return "JuceLV2Defines.h"; } | static String getJuceLV2DefinesFilename() { return "JuceLV2Defines.h"; } | ||||
- static String getLV2FileWriterName() { return "juce_lv2_helper"; } | - static String getLV2FileWriterName() { return "juce_lv2_helper"; } | ||||
+ static String getLV2FileWriterName() { return "juce7_lv2_helper"; } | |||||
- static String getVST3FileWriterName() { return "juce_vst3_helper"; } | |||||
+ static String getLV2FileWriterName() { return "juce70_lv2_helper"; } | |||||
+ static String getVST3FileWriterName() { return "juce70_vst3_helper"; } | |||||
//============================================================================== | //============================================================================== | ||||
template <class FileType> | template <class FileType> | ||||
diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | ||||
index b5608a7..8e77343 100644 | |||||
index ba1a2ab..4a32d20 100644 | |||||
--- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | --- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | ||||
+++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | +++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | ||||
@@ -358,11 +358,11 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) | |||||
@@ -348,11 +348,11 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) | |||||
{ | { | ||||
if (key == Ids::jucePath) | if (key == Ids::jucePath) | ||||
{ | { | ||||
- return (os == TargetOS::windows ? "C:\\JUCE" : "~/JUCE"); | - return (os == TargetOS::windows ? "C:\\JUCE" : "~/JUCE"); | ||||
+ return (os == TargetOS::windows ? "C:\\JUCE" : "/opt/kxstudio/include/JUCE-6.1.6"); | |||||
+ return (os == TargetOS::windows ? "C:\\JUCE" : "/opt/kxstudio/include/JUCE-7.0.9"); | |||||
} | } | ||||
else if (key == Ids::defaultJuceModulePath) | else if (key == Ids::defaultJuceModulePath) | ||||
{ | { | ||||
- return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules"); | - return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules"); | ||||
+ return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/opt/kxstudio/include/JUCE-6.1.6/modules"); | |||||
+ return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/opt/kxstudio/include/JUCE-7.0.9/modules"); | |||||
} | } | ||||
else if (key == Ids::defaultUserModulePath) | else if (key == Ids::defaultUserModulePath) | ||||
{ | { | ||||
diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
index 2dbf595..8f2444e 100644 | |||||
--- a/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile | |||||
@@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) | |||||
TARGET_ARCH := | |||||
endif | |||||
- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=0" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" | |||||
JUCE_TARGET_APP := Projucer | |||||
@@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) | |||||
TARGET_ARCH := | |||||
endif | |||||
- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=0" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) | |||||
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" | |||||
JUCE_TARGET_APP := Projucer | |||||
@@ -0,0 +1,13 @@ | |||||
diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h | |||||
index 28097d128..fe635da32 100644 | |||||
--- a/modules/juce_gui_basics/juce_gui_basics.h | |||||
+++ b/modules/juce_gui_basics/juce_gui_basics.h | |||||
@@ -88,7 +88,7 @@ | |||||
the availability of Xinerama is queried during runtime. | |||||
*/ | |||||
#ifndef JUCE_USE_XINERAMA | |||||
- #define JUCE_USE_XINERAMA 1 | |||||
+ #define JUCE_USE_XINERAMA 0 | |||||
#endif | |||||
/** Config: JUCE_USE_XSHM |
@@ -9,7 +9,7 @@ override_dh_auto_configure: | |||||
-DCMAKE_BUILD_TYPE=Release \ | -DCMAKE_BUILD_TYPE=Release \ | ||||
-DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ | -DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ | ||||
-DJUCE_BUILD_HELPER_TOOLS=ON \ | -DJUCE_BUILD_HELPER_TOOLS=ON \ | ||||
-DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE7 | |||||
-DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE-7.0.9 | |||||
override_dh_auto_build: | override_dh_auto_build: | ||||
dh_auto_build | dh_auto_build | ||||
@@ -23,12 +23,14 @@ override_dh_auto_install: | |||||
dh_auto_install | dh_auto_install | ||||
install -d $(CURDIR)/debian/tmp/opt/kxstudio/bin | install -d $(CURDIR)/debian/tmp/opt/kxstudio/bin | ||||
install -m 755 $(CURDIR)/extras/Projucer/Builds/LinuxMakefile/build/Projucer \ | install -m 755 $(CURDIR)/extras/Projucer/Builds/LinuxMakefile/build/Projucer \ | ||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/Projucer7 | |||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/Projucer70 | |||||
install -m 755 $(CURDIR)/obj-*/extras/Build/juceaide/juceaide_artefacts/Release/juceaide \ | install -m 755 $(CURDIR)/obj-*/extras/Build/juceaide/juceaide_artefacts/Release/juceaide \ | ||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/juceaide7 | |||||
mv $(CURDIR)/debian/tmp/opt/kxstudio/bin/JUCE-6.1.6/juce_lv2_helper \ | |||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/juce7_lv2_helper | |||||
rmdir $(CURDIR)/debian/tmp/opt/kxstudio/bin/JUCE-6.1.6 | |||||
$(CURDIR)/debian/tmp/opt/kxstudio/bin/juceaide70 | |||||
# mv $(CURDIR)/debian/tmp/opt/kxstudio/bin/JUCE-7.0.9/juce_lv2_helper \ | |||||
# $(CURDIR)/debian/tmp/opt/kxstudio/bin/juce70_lv2_helper | |||||
# mv $(CURDIR)/debian/tmp/opt/kxstudio/bin/JUCE-7.0.9/juce_vst3_helper \ | |||||
# $(CURDIR)/debian/tmp/opt/kxstudio/bin/juce70_vst3_helper | |||||
# rmdir $(CURDIR)/debian/tmp/opt/kxstudio/bin/JUCE-7.0.9 | |||||
%: | %: | ||||
dh $@ -Scmake | dh $@ -Scmake |
@@ -0,0 +1 @@ | |||||
3.0 (native) |
@@ -1,5 +0,0 @@ | |||||
distrho-juce6 (6:6.0.7+git2022-06-22-62658da8-1kxstudio2) focal; urgency=medium | |||||
* Initial package | |||||
-- falkTX <falktx@falktx.com> Sun, 17 Apr 2022 15:05:47 +0100 |
@@ -1 +0,0 @@ | |||||
/opt/kxstudio/lib/cmake/JUCE6/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE6/JUCE6Config.cmake |
@@ -1 +0,0 @@ | |||||
3.0 (quilt) |
@@ -1,5 +0,0 @@ | |||||
distrho-juce7 (6:7.0.0~git2022-06-22-16255740-1kxstudio3) focal; urgency=medium | |||||
* Initial package | |||||
-- falkTX <falktx@falktx.com> Sun, 17 Apr 2022 15:05:47 +0100 |
@@ -1 +0,0 @@ | |||||
/opt/kxstudio/lib/cmake/JUCE7/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE7/JUCE7Config.cmake |
@@ -1,109 +0,0 @@ | |||||
diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
index 6a96e24e5..17b0911f4 100644 | |||||
--- a/extras/Build/CMake/JUCEConfig.cmake.in | |||||
+++ b/extras/Build/CMake/JUCEConfig.cmake.in | |||||
@@ -22,10 +22,12 @@ | |||||
include("${CMAKE_CURRENT_LIST_DIR}/LV2_HELPER.cmake") | |||||
-if(NOT TARGET juce::juceaide) | |||||
- add_executable(juce::juceaide IMPORTED) | |||||
- set_target_properties(juce::juceaide PROPERTIES | |||||
- IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") | |||||
+set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") | |||||
+ | |||||
+if(NOT TARGET juceaide7) | |||||
+ add_executable(juceaide7 IMPORTED) | |||||
+ set_target_properties(juceaide7 PROPERTIES | |||||
+ IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide7") | |||||
endif() | |||||
check_required_components("@PROJECT_NAME@") | |||||
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake | |||||
index 58e65087c..33f90f750 100644 | |||||
--- a/extras/Build/CMake/JUCEUtils.cmake | |||||
+++ b/extras/Build/CMake/JUCEUtils.cmake | |||||
@@ -192,7 +192,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) | |||||
# In the end, it's simplest to generate a special single-purpose appconfig just for the | |||||
# resource compiler. | |||||
add_custom_command(OUTPUT "${secret_au_plugindefines}" | |||||
- COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
+ COMMAND juceaide7 auplugindefines "${defs_file}" "${secret_au_plugindefines}" | |||||
DEPENDS "${defs_file}" | |||||
VERBATIM) | |||||
@@ -414,7 +414,7 @@ function(juce_add_binary_data target) | |||||
file(WRITE "${input_file_list}" "${newline_delimited_input}") | |||||
add_custom_command(OUTPUT ${binary_file_names} | |||||
- COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
+ COMMAND juceaide7 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}" | |||||
${juce_binary_data_folder} "${input_file_list}" | |||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | |||||
DEPENDS "${input_file_list}" | |||||
@@ -498,7 +498,7 @@ function(juce_generate_juce_header target) | |||||
set(extra_args) | |||||
add_custom_command(OUTPUT "${juce_header}" | |||||
- COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args} | |||||
+ COMMAND juceaide7 header "${defs_file}" "${juce_header}" ${extra_args} | |||||
DEPENDS "${defs_file}" | |||||
VERBATIM) | |||||
endfunction() | |||||
@@ -506,23 +506,23 @@ endfunction() | |||||
# ================================================================================================== | |||||
function(_juce_execute_juceaide) | |||||
- if(NOT TARGET juce::juceaide) | |||||
+ if(NOT TARGET juceaide7) | |||||
message(FATAL_ERROR "The juceaide target does not exist") | |||||
endif() | |||||
- get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION) | |||||
+ get_target_property(juceaide7_location juceaide7 IMPORTED_LOCATION) | |||||
- if(NOT EXISTS "${juceaide_location}") | |||||
- message(FATAL_ERROR "juceaide was imported, but it doesn't exist!") | |||||
+ if(NOT EXISTS "${juceaide7_location}") | |||||
+ message(FATAL_ERROR "juceaide7 was imported, but it doesn't exist!") | |||||
endif() | |||||
- execute_process(COMMAND "${juceaide_location}" ${ARGN} | |||||
+ execute_process(COMMAND "${juceaide7_location}" ${ARGN} | |||||
RESULT_VARIABLE result_variable | |||||
OUTPUT_VARIABLE output | |||||
ERROR_VARIABLE output) | |||||
if(result_variable) | |||||
- message(FATAL_ERROR "Running juceaide failed:\n${output}") | |||||
+ message(FATAL_ERROR "Running juceaide7 failed:\n${output}") | |||||
endif() | |||||
endfunction() | |||||
@@ -659,7 +659,7 @@ function(_juce_configure_bundle source_target dest_target) | |||||
MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}") | |||||
add_custom_command(OUTPUT "${this_output_pkginfo}" | |||||
- COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
+ COMMAND juceaide7 pkginfo "${juce_kind_string}" "${this_output_pkginfo}" | |||||
VERBATIM) | |||||
set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>") | |||||
@@ -751,7 +751,7 @@ function(_juce_add_resources_rc source_target dest_target) | |||||
set(resource_rc_file "${juce_library_code}/resources.rc") | |||||
add_custom_command(OUTPUT "${resource_rc_file}" | |||||
- COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}" | |||||
+ COMMAND juceaide7 rcfile "${input_info_file}" "${resource_rc_file}" | |||||
${dependency} | |||||
VERBATIM) | |||||
@@ -1024,7 +1024,7 @@ function(_juce_set_plugin_target_properties shared_code_target kind) | |||||
set_target_properties(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${output_path}") | |||||
add_custom_command(TARGET ${target_name} POST_BUILD | |||||
- COMMAND juce::juce_lv2_helper "$<TARGET_FILE:${target_name}>" | |||||
+ COMMAND juce7_lv2_helper "$<TARGET_FILE:${target_name}>" | |||||
VERBATIM) | |||||
_juce_set_copy_properties(${shared_code_target} ${target_name} "${output_path}" JUCE_LV2_COPY_DIR) |
@@ -1 +0,0 @@ | |||||
3.0 (quilt) |