Merge pull request #365 from christofmuc/ubuntu24

Ubuntu24

.github/workflows/builds-ubuntu.yml

@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 
-name: Ubuntu KnobKraft Orm
+name: Ubuntu 22 KnobKraft Orm
 
 on: [push]
 
 jobs:
-  build-linux:
+  build-ubuntu-22:
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository with tags
@@ -36,6 +36,13 @@ jobs:
     - name: CMake build
       run: cmake --build builds --target package -- -j4
 
+    - name: Upload artifact for testing outside of a release
+      uses: actions/upload-artifact@v4
+      with:
+        name: ubuntu22-release
+        path: |
+          builds/KnobKraft_Orm-${{env.ORM_VERSION}}-Linux.tar.gz
+
     - name: Publish release
       uses: xresloader/upload-to-github-release@v1
       env:

.github/workflows/builds-ubuntu24.yml

@@ -0,0 +1,69 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: Ubuntu 24 KnobKraft Orm
+
+on: [push]
+
+jobs:
+  build-ubuntu-24:
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout repository with tags
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Additionally checkout submodules - don't use checkout action as it will overwrite refs
+      run: |
+        git submodule update --recursive --init --depth 1
+
+    - name: Install dependencies from apt-get
+      run: sudo apt-get -y update && sudo apt-get install -y libcurl4-openssl-dev pkg-config libtbb-dev libasound2-dev libboost-dev libgtk-3-dev libwebkit2gtk-4.1-dev libglew-dev libjack-dev libicu-dev
+
+    - name: Select proper Python version
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.12'
+        architecture: 'x64'
+
+    - name: CMake configure
+      env: # We get the SENTRY DSN from the repository's secret store
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      shell: bash
+      run: |
+        cmake -S . -B builds -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=off -DPYTHON_VERSION_TO_EMBED=3.12 -DSENTRY_CRASH_REPORTING=ON -DSENTRY_DSN=$SENTRY_DSN
+
+    - name: CMake build
+      run: |
+        cmake --build builds --target package -- -j4
+        mv builds/KnobKraft_Orm-${{env.ORM_VERSION}}-Linux.tar.gz builds/KnobKraft_Orm-${{env.ORM_VERSION}}-Ubuntu24.tar.gz
+
+    - name: Upload artifact for testing outside of a release
+      uses: actions/upload-artifact@v4
+      with:
+        name: ubuntu24-release
+        path: |
+          builds/KnobKraft_Orm-${{env.ORM_VERSION}}-Ubuntu24.tar.gz
+
+    - name: Publish release
+      uses: xresloader/upload-to-github-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        file: builds/KnobKraft_Orm-${{env.ORM_VERSION}}-Ubuntu24.tar.gz
+        tags: true
+        draft: false
+
+    - name: Setup Sentry CLI
+      uses: mathieu-bour/[email protected]
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        organization: knobkraft
+        project: knobkraft
+
+    - name: Upload PDB files to Sentry for stack unwinding when this is a tagged build
+      if: startsWith(github.ref, 'refs/tags/')
+      working-directory: builds
+      run: |
+        sentry-cli upload-dif . --log-level=debug

.gitignore

@@ -1,6 +1,7 @@
 builds/
 *__pycache__*
 .idea/
+.vscode/
 adaptations/CompiledAdaptions.h
 third_party/Tools.InnoSetup.6.0.5/
 builds6/

CMakeLists.txt

@@ -6,8 +6,9 @@
 
 cmake_minimum_required(VERSION 3.14)
 
-# Target a specific MacOS version (I have no idea which version I need, so let's try with Mavericks)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X version to target for deployment")
+# Target a specific MacOS version.
+# JUCE 8 refuses to build for anything older than 10.11, so let's try that.
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X version to target for deployment")
 
 # For old Apple < macOS 10.15 and Linux, do not allow C++ 17 because it won't work. With the newer nlohmann::json, we can specify the C++ version to use
 add_compile_definitions(JSON_HAS_CPP_14)
@@ -18,7 +19,8 @@ project(KnobKraft_Orm)
 option(ASAN "Use Address Sanitization for Debug version (Windows only for now)" OFF)
 
 # Since we also build MacOS, we need C++ 17. Which is not a bad thing.
-set(CMAKE_CXX_STANDARD 17)
+# Gin requests C++ 20.
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
 
@@ -116,15 +118,19 @@ ELSEIF(APPLE)
     # The JUCE font rendering is really fat on macOS, let us try to disable this flag
     add_definitions(-DJUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING)
 ELSEIF(UNIX)
-	# Include useful scripts for CMake
-	find_package(PkgConfig REQUIRED) 
-	find_package(OpenGL)
-
-	# These calls create special `PkgConfig::<MODULE>` variables
-	pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-	pkg_check_modules(GLEW REQUIRED IMPORTED_TARGET glew)
-	pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0)
-	find_package(ICU REQUIRED data uc)
+    # Include useful scripts for CMake
+    find_package(PkgConfig REQUIRED)
+    find_package(OpenGL)
+
+    # These calls create special `PkgConfig::<MODULE>` variables
+    pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+    pkg_check_modules(GLEW REQUIRED IMPORTED_TARGET glew)
+    pkg_check_modules(WEBKIT IMPORTED_TARGET webkit2gtk-4.1)
+    if (NOT WEBKIT_FOUND EQUAL 1)
+        # If 4.1 is not available, we need 4.0
+        pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0)
+    endif()
+    find_package(ICU REQUIRED data uc)
 ENDIF()
 
 # We need to put our own CMake helpers on the module path

The-Orm/PatchButtonPanel.cpp

@@ -336,8 +336,8 @@ void PatchButtonPanel::resized()
 		}
 	}
 	pageNumberBox.performLayout(pageNumberStrip);
-	auto width_label = buttonSendModeLabel_.getFont().getStringWidth(buttonSendModeLabel_.getText());
-	buttonSendModeLabel_.setBounds(pageNumberStrip.removeFromLeft(width_label));
+	float width_label = TextLayout::getStringWidth(buttonSendModeLabel_.getFont(), buttonSendModeLabel_.getText());
+	buttonSendModeLabel_.setBounds(pageNumberStrip.removeFromLeft((int) width_label));
 	buttonSendMode_.setBounds(pageNumberStrip.removeFromLeft(LAYOUT_BUTTON_WIDTH + LAYOUT_INSET_NORMAL).withTrimmedLeft(LAYOUT_INSET_NORMAL));
 	gridSizeSliderY_.setBounds(pageNumberStrip.removeFromRight(LAYOUT_BUTTON_WIDTH + LAYOUT_SMALL_ICON_WIDTH));
 	gridSizeSliderX_.setBounds(pageNumberStrip.withTrimmedRight(LAYOUT_SMALL_ICON_WIDTH).removeFromRight(LAYOUT_BUTTON_WIDTH + LAYOUT_SMALL_ICON_WIDTH));

The-Orm/PatchListTree.cpp

@@ -674,7 +674,7 @@ TreeViewNode* PatchListTree::newTreeViewItemForPatchList(midikraft::ListInfo lis
 				// Add all patches of the dragged list to the target ist
 				auto loaded_list = db_.getPatchList({ infos["list_id"], infos["list_name"] }, synths_);
 				if (AlertWindow::showOkCancelBox(AlertWindow::AlertIconType::QuestionIcon, "Add list to list?"
-					, fmt::format("This will add all {} patches of the list '{}' to the list '{}' at the given position. Continue?", loaded_list->patches().size(), infos["list_name"], list.name
+					, fmt::format("This will add all {} patches of the list '{}' to the list '{}' at the given position. Continue?", loaded_list->patches().size(), (std::string) infos["list_name"], list.name
 					))) {
 					for (auto& patch : loaded_list->patches()) {
 						db_.addPatchToList(list, patch, insertIndex++);

The-Orm/PatchTextBox.cpp

@@ -123,7 +123,7 @@ String PatchTextBox::makeHexDocument(std::shared_ptr<midikraft::PatchHolder> pat
 	do {
 		testLine += " 00";
 		testLineLength += 1;
-	} while (fontUsed.getStringWidth(testLine) < width - 22);
+	} while (TextLayout::getStringWidth(fontUsed, testLine) < width - 22);
 	testLineLength = std::max(testLineLength-1, 1);
 	lastLayoutedWidth_ = width;
 

synths/kawai-k3/KawaiK3_BCR2000.cpp

@@ -13,6 +13,7 @@
 #include "KawaiK3WaveParameter.h"
 
 #include <fmt/format.h>
+#include "SpdLogJuce.h"
 
 namespace midikraft {
 
@@ -140,7 +141,7 @@ namespace midikraft {
 					"  .showvalue on\n"
 					"  .resolution {} {} {} {}\n"
 				 , number_ , paramDef->name()
-					, (knobkraftChannel + 1) , paramDef->paramNo() , 0 , paramDef->maxValue()
+					, (knobkraftChannel + 1) , (int)paramDef->paramNo() , 0 , paramDef->maxValue()
 					//% (channel & 0x0f) % param_ 
 					//% paramDef->maxValue() 
 					, 0 , BCRdefinition::ledMode(ledMode_)