From 18daabe06e24a286c2e2685a1a8a77943779de12 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 29 Dec 2023 00:49:20 +0100 Subject: [PATCH] Rework juce packaging, split 6.0, 6.1 and 7.0 variants Signed-off-by: falkTX --- .../libs/distrho-juce-6.0/debian/changelog | 5 + .../debian/control | 12 +- .../debian/distrho-juce-6.0-bin.install} | 0 .../debian/distrho-juce-6.0-dev.install} | 2 +- .../debian/distrho-juce-6.0-dev.links | 1 + .../debian/patches/01_kxstudio-build.patch | 0 .../patches/02_skip-alsa-dependency.patch | 0 .../patches/03_versioned-juceaide.patch | 84 ++++++++++++++ .../debian/patches/04_copy-to-destdir.patch | 2 +- .../debian/patches/05_disable-xinerama.patch} | 0 .../distrho-juce-6.0/debian/patches/series | 5 + .../debian/rules | 6 +- .../distrho-juce-6.0/debian/source/format | 1 + .../libs/distrho-juce-6.1/debian/changelog | 5 + sources/libs/distrho-juce-6.1/debian/control | 47 ++++++++ .../debian/distrho-juce-6.1-bin.install | 1 + .../debian/distrho-juce-6.1-dev.install | 3 + .../debian/distrho-juce-6.1-dev.links | 1 + .../debian/patches/01_kxstudio-build.patch | 2 +- .../patches/02_skip-alsa-dependency.patch | 21 ++++ .../patches/03_versioned-juceaide.patch | 54 ++++----- .../debian/patches/04_copy-to-destdir.patch | 17 +++ .../debian/patches/05_disable-xinerama.patch | 13 +++ .../debian/patches/series | 0 sources/libs/distrho-juce-6.1/debian/rules | 19 +++ .../distrho-juce-6.1/debian/source/format | 1 + .../libs/distrho-juce-7.0/debian/changelog | 5 + .../debian/control | 12 +- .../debian/distrho-juce-7.0-bin.install | 1 + .../debian/distrho-juce-7.0-dev.install} | 0 .../debian/distrho-juce-7.0-dev.links | 1 + .../debian/patches/01_kxstudio-build.patch | 13 +++ .../patches/02_skip-alsa-dependency.patch | 0 .../patches/03_versioned-juceaide.patch | 84 ++++++++++++++ .../debian/patches/04_copy-to-destdir.patch | 4 +- .../debian/patches/05_projucer-setup.patch | 51 ++++---- .../debian/patches/06_disable-xinerama.patch | 13 +++ .../debian/patches/series | 0 .../debian/rules | 14 ++- .../distrho-juce-7.0/debian/source/format | 1 + sources/libs/distrho-juce6/debian/changelog | 5 - .../debian/distrho-juce6-dev.links | 1 - .../libs/distrho-juce6/debian/source/format | 1 - sources/libs/distrho-juce7/debian/changelog | 5 - .../debian/distrho-juce7-dev.links | 1 - .../patches/03_versioned-juceaide.patch | 109 ------------------ .../libs/distrho-juce7/debian/source/format | 1 - 47 files changed, 428 insertions(+), 196 deletions(-) create mode 100644 sources/libs/distrho-juce-6.0/debian/changelog rename sources/libs/{distrho-juce6 => distrho-juce-6.0}/debian/control (90%) rename sources/libs/{distrho-juce7/debian/distrho-juce7-bin.install => distrho-juce-6.0/debian/distrho-juce-6.0-bin.install} (100%) rename sources/libs/{distrho-juce6/debian/distrho-juce6-dev.install => distrho-juce-6.0/debian/distrho-juce-6.0-dev.install} (90%) create mode 100644 sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.links rename sources/libs/{distrho-juce6 => distrho-juce-6.0}/debian/patches/01_kxstudio-build.patch (100%) rename sources/libs/{distrho-juce6 => distrho-juce-6.0}/debian/patches/02_skip-alsa-dependency.patch (100%) create mode 100644 sources/libs/distrho-juce-6.0/debian/patches/03_versioned-juceaide.patch rename sources/libs/{distrho-juce6 => distrho-juce-6.0}/debian/patches/04_copy-to-destdir.patch (96%) rename sources/libs/{distrho-juce7/debian/patches/06_disable-xinerama.patch => distrho-juce-6.0/debian/patches/05_disable-xinerama.patch} (100%) create mode 100644 sources/libs/distrho-juce-6.0/debian/patches/series rename sources/libs/{distrho-juce6 => distrho-juce-6.0}/debian/rules (68%) create mode 100644 sources/libs/distrho-juce-6.0/debian/source/format create mode 100644 sources/libs/distrho-juce-6.1/debian/changelog create mode 100644 sources/libs/distrho-juce-6.1/debian/control create mode 100644 sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-bin.install create mode 100644 sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.install create mode 100644 sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.links rename sources/libs/{distrho-juce7 => distrho-juce-6.1}/debian/patches/01_kxstudio-build.patch (95%) create mode 100644 sources/libs/distrho-juce-6.1/debian/patches/02_skip-alsa-dependency.patch rename sources/libs/{distrho-juce6 => distrho-juce-6.1}/debian/patches/03_versioned-juceaide.patch (61%) create mode 100644 sources/libs/distrho-juce-6.1/debian/patches/04_copy-to-destdir.patch create mode 100644 sources/libs/distrho-juce-6.1/debian/patches/05_disable-xinerama.patch rename sources/libs/{distrho-juce6 => distrho-juce-6.1}/debian/patches/series (100%) create mode 100755 sources/libs/distrho-juce-6.1/debian/rules create mode 100644 sources/libs/distrho-juce-6.1/debian/source/format create mode 100644 sources/libs/distrho-juce-7.0/debian/changelog rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/control (89%) create mode 100644 sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-bin.install rename sources/libs/{distrho-juce7/debian/distrho-juce7-dev.install => distrho-juce-7.0/debian/distrho-juce-7.0-dev.install} (100%) create mode 100644 sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.links create mode 100644 sources/libs/distrho-juce-7.0/debian/patches/01_kxstudio-build.patch rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/patches/02_skip-alsa-dependency.patch (100%) create mode 100644 sources/libs/distrho-juce-7.0/debian/patches/03_versioned-juceaide.patch rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/patches/04_copy-to-destdir.patch (92%) rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/patches/05_projucer-setup.patch (53%) create mode 100644 sources/libs/distrho-juce-7.0/debian/patches/06_disable-xinerama.patch rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/patches/series (100%) rename sources/libs/{distrho-juce7 => distrho-juce-7.0}/debian/rules (60%) create mode 100644 sources/libs/distrho-juce-7.0/debian/source/format delete mode 100644 sources/libs/distrho-juce6/debian/changelog delete mode 100644 sources/libs/distrho-juce6/debian/distrho-juce6-dev.links delete mode 100644 sources/libs/distrho-juce6/debian/source/format delete mode 100644 sources/libs/distrho-juce7/debian/changelog delete mode 100644 sources/libs/distrho-juce7/debian/distrho-juce7-dev.links delete mode 100644 sources/libs/distrho-juce7/debian/patches/03_versioned-juceaide.patch delete mode 100644 sources/libs/distrho-juce7/debian/source/format diff --git a/sources/libs/distrho-juce-6.0/debian/changelog b/sources/libs/distrho-juce-6.0/debian/changelog new file mode 100644 index 0000000..077501e --- /dev/null +++ b/sources/libs/distrho-juce-6.0/debian/changelog @@ -0,0 +1,5 @@ +distrho-juce-6.0 (6:6.0.8+git2023-12-25-1kxstudio3) focal; urgency=medium + + * Initial package + + -- falkTX Mon, 25 Dec 2023 14:29:55 +0100 diff --git a/sources/libs/distrho-juce6/debian/control b/sources/libs/distrho-juce-6.0/debian/control similarity index 90% rename from sources/libs/distrho-juce6/debian/control rename to sources/libs/distrho-juce-6.0/debian/control index f896b1e..77d6a68 100644 --- a/sources/libs/distrho-juce6/debian/control +++ b/sources/libs/distrho-juce-6.0/debian/control @@ -1,4 +1,4 @@ -Source: distrho-juce6 +Source: distrho-juce-6.0 Section: devel Priority: optional Maintainer: falkTX @@ -17,7 +17,7 @@ Standards-Version: 4.5.0 Homepage: https://github.com/DISTRHO/JUCE/ Rules-Requires-Root: no -Package: distrho-juce6-bin +Package: distrho-juce-6.0-bin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} 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, 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 -Depends: ${misc:Depends}, distrho-juce6-bin, +Depends: ${misc:Depends}, distrho-juce-6.0-bin, cmake, pkg-config, libfreetype6-dev, @@ -44,4 +44,4 @@ Description: cross-platform C++ framework with DISTRHO/KXStudio changes 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. + This package provides the DISTRHO/KXStudio fork of JUCE, version 6.0. diff --git a/sources/libs/distrho-juce7/debian/distrho-juce7-bin.install b/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-bin.install similarity index 100% rename from sources/libs/distrho-juce7/debian/distrho-juce7-bin.install rename to sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-bin.install diff --git a/sources/libs/distrho-juce6/debian/distrho-juce6-dev.install b/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.install similarity index 90% rename from sources/libs/distrho-juce6/debian/distrho-juce6-dev.install rename to sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.install index 0b42fc2..d386fb4 100644 --- a/sources/libs/distrho-juce6/debian/distrho-juce6-dev.install +++ b/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.install @@ -1,3 +1,3 @@ /opt/kxstudio/include /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/ diff --git a/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.links b/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.links new file mode 100644 index 0000000..980e404 --- /dev/null +++ b/sources/libs/distrho-juce-6.0/debian/distrho-juce-6.0-dev.links @@ -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 diff --git a/sources/libs/distrho-juce6/debian/patches/01_kxstudio-build.patch b/sources/libs/distrho-juce-6.0/debian/patches/01_kxstudio-build.patch similarity index 100% rename from sources/libs/distrho-juce6/debian/patches/01_kxstudio-build.patch rename to sources/libs/distrho-juce-6.0/debian/patches/01_kxstudio-build.patch diff --git a/sources/libs/distrho-juce6/debian/patches/02_skip-alsa-dependency.patch b/sources/libs/distrho-juce-6.0/debian/patches/02_skip-alsa-dependency.patch similarity index 100% rename from sources/libs/distrho-juce6/debian/patches/02_skip-alsa-dependency.patch rename to sources/libs/distrho-juce-6.0/debian/patches/02_skip-alsa-dependency.patch diff --git a/sources/libs/distrho-juce-6.0/debian/patches/03_versioned-juceaide.patch b/sources/libs/distrho-juce-6.0/debian/patches/03_versioned-juceaide.patch new file mode 100644 index 0000000..23c7b2e --- /dev/null +++ b/sources/libs/distrho-juce-6.0/debian/patches/03_versioned-juceaide.patch @@ -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 "$") +@@ -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) + diff --git a/sources/libs/distrho-juce6/debian/patches/04_copy-to-destdir.patch b/sources/libs/distrho-juce-6.0/debian/patches/04_copy-to-destdir.patch similarity index 96% rename from sources/libs/distrho-juce6/debian/patches/04_copy-to-destdir.patch rename to sources/libs/distrho-juce-6.0/debian/patches/04_copy-to-destdir.patch index cdf0d4f..7ad010e 100644 --- a/sources/libs/distrho-juce6/debian/patches/04_copy-to-destdir.patch +++ b/sources/libs/distrho-juce-6.0/debian/patches/04_copy-to-destdir.patch @@ -1,5 +1,5 @@ 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 +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -182,9 +182,9 @@ function(_juce_set_default_properties) diff --git a/sources/libs/distrho-juce7/debian/patches/06_disable-xinerama.patch b/sources/libs/distrho-juce-6.0/debian/patches/05_disable-xinerama.patch similarity index 100% rename from sources/libs/distrho-juce7/debian/patches/06_disable-xinerama.patch rename to sources/libs/distrho-juce-6.0/debian/patches/05_disable-xinerama.patch diff --git a/sources/libs/distrho-juce-6.0/debian/patches/series b/sources/libs/distrho-juce-6.0/debian/patches/series new file mode 100644 index 0000000..9118c29 --- /dev/null +++ b/sources/libs/distrho-juce-6.0/debian/patches/series @@ -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 diff --git a/sources/libs/distrho-juce6/debian/rules b/sources/libs/distrho-juce-6.0/debian/rules similarity index 68% rename from sources/libs/distrho-juce6/debian/rules rename to sources/libs/distrho-juce-6.0/debian/rules index 10c7220..64a723d 100755 --- a/sources/libs/distrho-juce6/debian/rules +++ b/sources/libs/distrho-juce-6.0/debian/rules @@ -7,13 +7,13 @@ override_dh_auto_configure: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ -DJUCE_BUILD_HELPER_TOOLS=ON \ - -DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE6 + -DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE-6.0.8 override_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 \ - $(CURDIR)/debian/distrho-juce6-bin/opt/kxstudio/bin/juceaide6 + $(CURDIR)/debian/tmp/opt/kxstudio/bin/juceaide60 %: dh $@ -Scmake diff --git a/sources/libs/distrho-juce-6.0/debian/source/format b/sources/libs/distrho-juce-6.0/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/sources/libs/distrho-juce-6.0/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/sources/libs/distrho-juce-6.1/debian/changelog b/sources/libs/distrho-juce-6.1/debian/changelog new file mode 100644 index 0000000..9cac0d6 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/changelog @@ -0,0 +1,5 @@ +distrho-juce-6.1 (6:6.1.6+git2023-12-25-1kxstudio2) focal; urgency=medium + + * Initial package + + -- falkTX Mon, 25 Dec 2023 14:29:55 +0100 diff --git a/sources/libs/distrho-juce-6.1/debian/control b/sources/libs/distrho-juce-6.1/debian/control new file mode 100644 index 0000000..a7ee3e6 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/control @@ -0,0 +1,47 @@ +Source: distrho-juce-6.1 +Section: devel +Priority: optional +Maintainer: falkTX +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. diff --git a/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-bin.install b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-bin.install new file mode 100644 index 0000000..059fef0 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-bin.install @@ -0,0 +1 @@ +/opt/kxstudio/bin diff --git a/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.install b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.install new file mode 100644 index 0000000..8575343 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.install @@ -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/ diff --git a/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.links b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.links new file mode 100644 index 0000000..7c11858 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/distrho-juce-6.1-dev.links @@ -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 diff --git a/sources/libs/distrho-juce7/debian/patches/01_kxstudio-build.patch b/sources/libs/distrho-juce-6.1/debian/patches/01_kxstudio-build.patch similarity index 95% rename from sources/libs/distrho-juce7/debian/patches/01_kxstudio-build.patch rename to sources/libs/distrho-juce-6.1/debian/patches/01_kxstudio-build.patch index daca111..e12a382 100644 --- a/sources/libs/distrho-juce7/debian/patches/01_kxstudio-build.patch +++ b/sources/libs/distrho-juce-6.1/debian/patches/01_kxstudio-build.patch @@ -1,5 +1,5 @@ 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 +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -84,7 +84,7 @@ define_property(TARGET PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD INHERITED diff --git a/sources/libs/distrho-juce-6.1/debian/patches/02_skip-alsa-dependency.patch b/sources/libs/distrho-juce-6.1/debian/patches/02_skip-alsa-dependency.patch new file mode 100644 index 0000000..7fa95d7 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/patches/02_skip-alsa-dependency.patch @@ -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 diff --git a/sources/libs/distrho-juce6/debian/patches/03_versioned-juceaide.patch b/sources/libs/distrho-juce-6.1/debian/patches/03_versioned-juceaide.patch similarity index 61% rename from sources/libs/distrho-juce6/debian/patches/03_versioned-juceaide.patch rename to sources/libs/distrho-juce-6.1/debian/patches/03_versioned-juceaide.patch index ed25e7e..070e09c 100644 --- a/sources/libs/distrho-juce6/debian/patches/03_versioned-juceaide.patch +++ b/sources/libs/distrho-juce-6.1/debian/patches/03_versioned-juceaide.patch @@ -1,5 +1,5 @@ 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 +++ b/extras/Build/CMake/JUCEConfig.cmake.in @@ -20,10 +20,12 @@ @@ -12,87 +12,87 @@ index 3e5c97de5..5609fa7bd 100644 - IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@") +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() check_required_components("@PROJECT_NAME@") 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 +++ 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 # resource compiler. add_custom_command(OUTPUT "${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}" 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} - 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} - 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) add_custom_command(OUTPUT "${juce_header}" - 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}" VERBATIM) endfunction() -@@ -966,20 +966,20 @@ endfunction() +@@ -501,20 +501,20 @@ endfunction() # ================================================================================================== function(_juce_execute_juceaide) - if(NOT TARGET juce::juceaide) - 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() - 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}") - 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() - 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) - message(FATAL_ERROR "Running juceaide failed") -+ message(FATAL_ERROR "Running juceaide6 failed") ++ message(FATAL_ERROR "Running juceaide61 failed") endif() 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}") add_custom_command(OUTPUT "${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) set(output_folder "$") -@@ -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") add_custom_command(OUTPUT "${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} VERBATIM) diff --git a/sources/libs/distrho-juce-6.1/debian/patches/04_copy-to-destdir.patch b/sources/libs/distrho-juce-6.1/debian/patches/04_copy-to-destdir.patch new file mode 100644 index 0000000..918b9d7 --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/patches/04_copy-to-destdir.patch @@ -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() + diff --git a/sources/libs/distrho-juce-6.1/debian/patches/05_disable-xinerama.patch b/sources/libs/distrho-juce-6.1/debian/patches/05_disable-xinerama.patch new file mode 100644 index 0000000..ec38d9e --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/patches/05_disable-xinerama.patch @@ -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 diff --git a/sources/libs/distrho-juce6/debian/patches/series b/sources/libs/distrho-juce-6.1/debian/patches/series similarity index 100% rename from sources/libs/distrho-juce6/debian/patches/series rename to sources/libs/distrho-juce-6.1/debian/patches/series diff --git a/sources/libs/distrho-juce-6.1/debian/rules b/sources/libs/distrho-juce-6.1/debian/rules new file mode 100755 index 0000000..b72f13c --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/rules @@ -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 diff --git a/sources/libs/distrho-juce-6.1/debian/source/format b/sources/libs/distrho-juce-6.1/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/sources/libs/distrho-juce-6.1/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/sources/libs/distrho-juce-7.0/debian/changelog b/sources/libs/distrho-juce-7.0/debian/changelog new file mode 100644 index 0000000..aed22e5 --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/changelog @@ -0,0 +1,5 @@ +distrho-juce-7.0 (6:7.0.9+git2023-12-25-1kxstudio2) focal; urgency=medium + + * Initial package + + -- falkTX Mon, 25 Dec 2023 14:29:55 +0100 diff --git a/sources/libs/distrho-juce7/debian/control b/sources/libs/distrho-juce-7.0/debian/control similarity index 89% rename from sources/libs/distrho-juce7/debian/control rename to sources/libs/distrho-juce-7.0/debian/control index 2c7bac2..7eed540 100644 --- a/sources/libs/distrho-juce7/debian/control +++ b/sources/libs/distrho-juce-7.0/debian/control @@ -1,4 +1,4 @@ -Source: distrho-juce7 +Source: distrho-juce-7.0 Section: devel Priority: optional Maintainer: falkTX @@ -17,7 +17,7 @@ Standards-Version: 4.5.0 Homepage: https://github.com/DISTRHO/JUCE/ Rules-Requires-Root: no -Package: distrho-juce7-bin +Package: distrho-juce-7.0-bin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} 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, 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 -Depends: ${misc:Depends}, distrho-juce7-bin, +Depends: ${misc:Depends}, distrho-juce-7.0-bin, cmake, pkg-config, 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, 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. diff --git a/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-bin.install b/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-bin.install new file mode 100644 index 0000000..059fef0 --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-bin.install @@ -0,0 +1 @@ +/opt/kxstudio/bin diff --git a/sources/libs/distrho-juce7/debian/distrho-juce7-dev.install b/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.install similarity index 100% rename from sources/libs/distrho-juce7/debian/distrho-juce7-dev.install rename to sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.install diff --git a/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.links b/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.links new file mode 100644 index 0000000..63aed4a --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/distrho-juce-7.0-dev.links @@ -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 diff --git a/sources/libs/distrho-juce-7.0/debian/patches/01_kxstudio-build.patch b/sources/libs/distrho-juce-7.0/debian/patches/01_kxstudio-build.patch new file mode 100644 index 0000000..245729a --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/patches/01_kxstudio-build.patch @@ -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() diff --git a/sources/libs/distrho-juce7/debian/patches/02_skip-alsa-dependency.patch b/sources/libs/distrho-juce-7.0/debian/patches/02_skip-alsa-dependency.patch similarity index 100% rename from sources/libs/distrho-juce7/debian/patches/02_skip-alsa-dependency.patch rename to sources/libs/distrho-juce-7.0/debian/patches/02_skip-alsa-dependency.patch diff --git a/sources/libs/distrho-juce-7.0/debian/patches/03_versioned-juceaide.patch b/sources/libs/distrho-juce-7.0/debian/patches/03_versioned-juceaide.patch new file mode 100644 index 0000000..ccefd2a --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/patches/03_versioned-juceaide.patch @@ -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 "$") +@@ -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) + diff --git a/sources/libs/distrho-juce7/debian/patches/04_copy-to-destdir.patch b/sources/libs/distrho-juce-7.0/debian/patches/04_copy-to-destdir.patch similarity index 92% rename from sources/libs/distrho-juce7/debian/patches/04_copy-to-destdir.patch rename to sources/libs/distrho-juce-7.0/debian/patches/04_copy-to-destdir.patch index 1bbfa03..2f74822 100644 --- a/sources/libs/distrho-juce7/debian/patches/04_copy-to-destdir.patch +++ b/sources/libs/distrho-juce-7.0/debian/patches/04_copy-to-destdir.patch @@ -1,8 +1,8 @@ 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 +++ 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_UNITY_COPY_DIR "$ENV{APPDATA}/Unity") elseif((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) diff --git a/sources/libs/distrho-juce7/debian/patches/05_projucer-setup.patch b/sources/libs/distrho-juce-7.0/debian/patches/05_projucer-setup.patch similarity index 53% rename from sources/libs/distrho-juce7/debian/patches/05_projucer-setup.patch rename to sources/libs/distrho-juce-7.0/debian/patches/05_projucer-setup.patch index 3eb8eeb..fc25cd6 100644 --- a/sources/libs/distrho-juce7/debian/patches/05_projucer-setup.patch +++ b/sources/libs/distrho-juce-7.0/debian/patches/05_projucer-setup.patch @@ -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 -index b84d91da6..0ae17c508 100644 +index d258d34..fbd3c88 100644 --- a/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 getJuceSourceHFilename() { return "JuceHeader.h"; } static String getJuceLV2DefinesFilename() { return "JuceLV2Defines.h"; } - 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 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 +++ 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) { - 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) { - 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) { +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 + diff --git a/sources/libs/distrho-juce-7.0/debian/patches/06_disable-xinerama.patch b/sources/libs/distrho-juce-7.0/debian/patches/06_disable-xinerama.patch new file mode 100644 index 0000000..ec38d9e --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/patches/06_disable-xinerama.patch @@ -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 diff --git a/sources/libs/distrho-juce7/debian/patches/series b/sources/libs/distrho-juce-7.0/debian/patches/series similarity index 100% rename from sources/libs/distrho-juce7/debian/patches/series rename to sources/libs/distrho-juce-7.0/debian/patches/series diff --git a/sources/libs/distrho-juce7/debian/rules b/sources/libs/distrho-juce-7.0/debian/rules similarity index 60% rename from sources/libs/distrho-juce7/debian/rules rename to sources/libs/distrho-juce-7.0/debian/rules index ecc564d..110dc4a 100755 --- a/sources/libs/distrho-juce7/debian/rules +++ b/sources/libs/distrho-juce-7.0/debian/rules @@ -9,7 +9,7 @@ override_dh_auto_configure: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/opt/kxstudio \ -DJUCE_BUILD_HELPER_TOOLS=ON \ - -DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE7 + -DJUCE_INSTALL_DESTINATION=lib/cmake/JUCE-7.0.9 override_dh_auto_build: dh_auto_build @@ -23,12 +23,14 @@ override_dh_auto_install: dh_auto_install install -d $(CURDIR)/debian/tmp/opt/kxstudio/bin 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 \ - $(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 diff --git a/sources/libs/distrho-juce-7.0/debian/source/format b/sources/libs/distrho-juce-7.0/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/sources/libs/distrho-juce-7.0/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/sources/libs/distrho-juce6/debian/changelog b/sources/libs/distrho-juce6/debian/changelog deleted file mode 100644 index 6a9ec7e..0000000 --- a/sources/libs/distrho-juce6/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -distrho-juce6 (6:6.0.7+git2022-06-22-62658da8-1kxstudio2) focal; urgency=medium - - * Initial package - - -- falkTX Sun, 17 Apr 2022 15:05:47 +0100 diff --git a/sources/libs/distrho-juce6/debian/distrho-juce6-dev.links b/sources/libs/distrho-juce6/debian/distrho-juce6-dev.links deleted file mode 100644 index 1a09bea..0000000 --- a/sources/libs/distrho-juce6/debian/distrho-juce6-dev.links +++ /dev/null @@ -1 +0,0 @@ -/opt/kxstudio/lib/cmake/JUCE6/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE6/JUCE6Config.cmake diff --git a/sources/libs/distrho-juce6/debian/source/format b/sources/libs/distrho-juce6/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/sources/libs/distrho-juce6/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/sources/libs/distrho-juce7/debian/changelog b/sources/libs/distrho-juce7/debian/changelog deleted file mode 100644 index 3d11733..0000000 --- a/sources/libs/distrho-juce7/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -distrho-juce7 (6:7.0.0~git2022-06-22-16255740-1kxstudio3) focal; urgency=medium - - * Initial package - - -- falkTX Sun, 17 Apr 2022 15:05:47 +0100 diff --git a/sources/libs/distrho-juce7/debian/distrho-juce7-dev.links b/sources/libs/distrho-juce7/debian/distrho-juce7-dev.links deleted file mode 100644 index 40ab015..0000000 --- a/sources/libs/distrho-juce7/debian/distrho-juce7-dev.links +++ /dev/null @@ -1 +0,0 @@ -/opt/kxstudio/lib/cmake/JUCE7/JUCEConfig.cmake /opt/kxstudio/lib/cmake/JUCE7/JUCE7Config.cmake diff --git a/sources/libs/distrho-juce7/debian/patches/03_versioned-juceaide.patch b/sources/libs/distrho-juce7/debian/patches/03_versioned-juceaide.patch deleted file mode 100644 index ceda8cf..0000000 --- a/sources/libs/distrho-juce7/debian/patches/03_versioned-juceaide.patch +++ /dev/null @@ -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 "$") -@@ -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 "$" -+ COMMAND juce7_lv2_helper "$" - VERBATIM) - - _juce_set_copy_properties(${shared_code_target} ${target_name} "${output_path}" JUCE_LV2_COPY_DIR) diff --git a/sources/libs/distrho-juce7/debian/source/format b/sources/libs/distrho-juce7/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/sources/libs/distrho-juce7/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt)