From 7a8fe88d858b4f37fe68bcba3ed8234d4f2193a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 23 Oct 2022 15:33:59 +0200 Subject: [PATCH] Remove giada for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Current version does not work after fltk's cmake files were 'fixed' * Later version ships own fltk but that fails to build here Signed-off-by: Andreas Müller --- recipes-musicians/giada/giada.bb | 56 ------------------- ...-Hack-juceaide-build-to-native-paths.patch | 46 --------------- .../0002-Do-not-log-API-not-available.patch | 32 ----------- .../packagegroups/musicians-world.bb | 1 - 4 files changed, 135 deletions(-) delete mode 100644 recipes-musicians/giada/giada.bb delete mode 100644 recipes-musicians/giada/giada/0001-Hack-juceaide-build-to-native-paths.patch delete mode 100644 recipes-musicians/giada/giada/0002-Do-not-log-API-not-available.patch diff --git a/recipes-musicians/giada/giada.bb b/recipes-musicians/giada/giada.bb deleted file mode 100644 index 504e216..0000000 --- a/recipes-musicians/giada/giada.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Your Hardcore Loop Machine" -LICENSE = "GPL-3.0-only" -# for juce -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = " \ - gitsm://github.com/monocasual/giada.git;protocol=https;branch=master \ - file://0001-Hack-juceaide-build-to-native-paths.patch \ - file://0002-Do-not-log-API-not-available.patch \ -" -SRCREV = "a4aca0d1c42ae1fb60b3e8854a558c3e0e5d2720" -S = "${WORKDIR}/git" -PV = "0.22.0" - -inherit cmake pkgconfig features_check gtk-icon-cache - -REQUIRED_DISTRO_FEATURES ?= "x11" - -DEPENDS += " \ - fltk fltk-native \ - freetype-native \ - libxinerama \ - libxpm \ - alsa-lib \ - jack \ - pulseaudio \ - libsndfile1 \ - libsamplerate0 \ - rtmidi \ - fmt \ - nlohmann-json \ -" -# vst2 headers are missing (no GPL??) -EXTRA_OECMAKE = " \ - -DWITH_ALSA=ON \ - -DWITH_PULSE=ON \ - -DWITH_JACK=ON \ - -DWITH_VST2=OFF \ - -DWITH_VST3=ON \ -" - -do_install:append() { - rm -rf ${D}${bindir}/JUCE-* - rm -rf ${D}${includedir}/JUCE-* - rm -rf ${D}${libdir}/cmake - rmdir --ignore-fail-on-non-empty ${D}${libdir} -} - -# For src/utils/log.h: print (revisit?) -SECURITY_STRINGFORMAT = "" - - -FILES:${PN}:append = " \ - ${datadir}/metainfo \ -" diff --git a/recipes-musicians/giada/giada/0001-Hack-juceaide-build-to-native-paths.patch b/recipes-musicians/giada/giada/0001-Hack-juceaide-build-to-native-paths.patch deleted file mode 100644 index 7cd88bc..0000000 --- a/recipes-musicians/giada/giada/0001-Hack-juceaide-build-to-native-paths.patch +++ /dev/null @@ -1,46 +0,0 @@ -From aeb41046eb55d77c017998966799269c99767783 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 1 Sep 2022 22:50:28 +0200 -Subject: [PATCH] Hack juceaide build to native paths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - src/deps/juce/extras/Build/juceaide/CMakeLists.txt | 9 +++++++++ - hack-oe-native-paths | 2 ++ - 2 files changed, 11 insertions(+) - create mode 100755 hack-oe-native-paths - -diff --git a/src/deps/juce/extras/Build/juceaide/CMakeLists.txt b/src/deps/juce/extras/Build/juceaide/CMakeLists.txt -index 34f1a7f5ff..76b19c952f 100644 ---- a/src/deps/juce/extras/Build/juceaide/CMakeLists.txt -+++ b/src/deps/juce/extras/Build/juceaide/CMakeLists.txt -@@ -88,6 +88,15 @@ else() - message(FATAL_ERROR "Failed to configure juceaide\n${command_output}") - endif() - -+ message(STATUS "Adjust juceaide paths to OE-native") -+ execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/hack-oe-native-paths ${JUCE_BINARY_DIR}/tools/build.ninja -+ OUTPUT_VARIABLE command_output -+ ERROR_VARIABLE command_output -+ RESULT_VARIABLE result_variable) -+ if(result_variable) -+ message(FATAL_ERROR "Failed to adjust juceaide paths\n${command_output}") -+ endif() -+ - message(STATUS "Building juceaide") - - execute_process(COMMAND "${CMAKE_COMMAND}" -diff --git a/src/deps/juce/extras/Build/juceaide/hack-oe-native-paths b/src/deps/juce/extras/Build/juceaide/hack-oe-native-paths -new file mode 100755 -index 0000000000..726ebd2503 ---- /dev/null -+++ b/src/deps/juce/extras/Build/juceaide/hack-oe-native-paths -@@ -0,0 +1,2 @@ -+#!/bin/sh -+sed -i 's:recipe-sysroot/:recipe-sysroot-native/:g' $1 --- -2.35.3 - diff --git a/recipes-musicians/giada/giada/0002-Do-not-log-API-not-available.patch b/recipes-musicians/giada/giada/0002-Do-not-log-API-not-available.patch deleted file mode 100644 index d1a84fd..0000000 --- a/recipes-musicians/giada/giada/0002-Do-not-log-API-not-available.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4d1bddceceaafc16f0f275d25c5e6786749ea865 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 2 Sep 2022 00:19:30 +0200 -Subject: [PATCH] Do not log API not available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/core/kernelMidi.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/core/kernelMidi.cpp b/src/core/kernelMidi.cpp -index 9d2b119d..0d71f906 100644 ---- a/src/core/kernelMidi.cpp -+++ b/src/core/kernelMidi.cpp -@@ -276,9 +276,6 @@ void KernelMidi::logCompiledAPIs() - case RtMidi::Api::RTMIDI_DUMMY: - u::log::print(" Dummy\n"); - break; -- case RtMidi::Api::WEB_MIDI_API: -- u::log::print(" Web MIDI API\n"); -- break; - default: - u::log::print(" (unknown)\n"); - break; --- -2.35.3 - diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb index 90e2b31..18d34b4 100644 --- a/recipes-support/packagegroups/musicians-world.bb +++ b/recipes-support/packagegroups/musicians-world.bb @@ -53,7 +53,6 @@ RDEPENDS:${PN} += " \ dssi \ dssi-vst \ geonkick \ - giada \ gmidimonitor \ helm-standalone helm-lv2 helm-vst \ \