giada: upgrade 0.18.2 -> 0.22.0 / mark license as commercial for juce
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,11 +1,17 @@
|
|||||||
SUMMARY = "Your Hardcore Loop Machine"
|
SUMMARY = "Your Hardcore Loop Machine"
|
||||||
LICENSE = "GPL-3.0-only"
|
LICENSE = "GPL-3.0-only"
|
||||||
|
# for juce
|
||||||
|
LICENSE_FLAGS = "commercial"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
|
|
||||||
SRC_URI = "gitsm://github.com/monocasual/giada.git;protocol=https;branch=master"
|
SRC_URI = " \
|
||||||
SRCREV = "2b54a58da249de233e9dfaafa81e596d17658293"
|
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"
|
S = "${WORKDIR}/git"
|
||||||
PV = "0.18.2"
|
PV = "0.22.0"
|
||||||
|
|
||||||
inherit cmake pkgconfig features_check gtk-icon-cache
|
inherit cmake pkgconfig features_check gtk-icon-cache
|
||||||
|
|
||||||
@@ -13,6 +19,7 @@ REQUIRED_DISTRO_FEATURES ?= "x11"
|
|||||||
|
|
||||||
DEPENDS += " \
|
DEPENDS += " \
|
||||||
fltk fltk-native \
|
fltk fltk-native \
|
||||||
|
freetype-native \
|
||||||
libxinerama \
|
libxinerama \
|
||||||
libxpm \
|
libxpm \
|
||||||
alsa-lib \
|
alsa-lib \
|
||||||
@@ -21,6 +28,8 @@ DEPENDS += " \
|
|||||||
libsndfile1 \
|
libsndfile1 \
|
||||||
libsamplerate0 \
|
libsamplerate0 \
|
||||||
rtmidi \
|
rtmidi \
|
||||||
|
fmt \
|
||||||
|
nlohmann-json \
|
||||||
"
|
"
|
||||||
# vst2 headers are missing (no GPL??)
|
# vst2 headers are missing (no GPL??)
|
||||||
EXTRA_OECMAKE = " \
|
EXTRA_OECMAKE = " \
|
||||||
@@ -30,9 +39,18 @@ EXTRA_OECMAKE = " \
|
|||||||
-DWITH_VST2=OFF \
|
-DWITH_VST2=OFF \
|
||||||
-DWITH_VST3=ON \
|
-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?)
|
# For src/utils/log.h: print (revisit?)
|
||||||
SECURITY_STRINGFORMAT = ""
|
SECURITY_STRINGFORMAT = ""
|
||||||
|
|
||||||
|
|
||||||
FILES:${PN}:append = " \
|
FILES:${PN}:append = " \
|
||||||
${datadir}/metainfo \
|
${datadir}/metainfo \
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
From aeb41046eb55d77c017998966799269c99767783 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
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 <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
From 4d1bddceceaafc16f0f275d25c5e6786749ea865 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
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 <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
Reference in New Issue
Block a user