Update from giada package

3 files changed, 45 insertions, 113 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b0fd7aba7c..3a6a497e9777 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = giada-git
 	pkgdesc = A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians
-	pkgver = v0.18.0.1.r0.g61c8d6ef
+	pkgver = 0.26.0.r0.g40540356
 	pkgrel = 1
 	url = https://www.giadamusic.com/
 	arch = x86_64
@@ -31,15 +31,21 @@ pkgbase = giada-git
 	conflicts = giada
 	conflicts = giada-vst
 	source = giada-git::git+https://github.com/monocasual/giada.git
-	source = giada-git-devendor_nlohmann_json.patch
-	source = JUCE-6.0.7.tar.gz::https://github.com/WeAreROLI/JUCE/archive/6.0.7.tar.gz
-	source = https://raw.githubusercontent.com/nlohmann/json/db78ac1d7716f56fc9f1b030b715f872f93964e4/single_include/nlohmann/json.hpp
+	source = git+https://github.com/steinbergmedia/vst3sdk.git
+	source = git+https://github.com/juce-framework/JUCE.git#tag=7.0.5
 	source = git+https://github.com/monocasual/rtaudio.git
 	source = git+https://github.com/monocasual/geompp.git
+	source = git+https://github.com/monocasual/mcl-atomic-swapper.git
+	source = git+https://github.com/monocasual/mcl-audio-buffer.git
+	source = git+https://github.com/fltk/fltk.git
+	source = git+https://github.com/cameron314/concurrentqueue.git
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce
-	sha512sums = fe17273de00e34012b08e8355a04796b5e04020afb53c1473e6d891d5307e66470c8c113029a0f3270f6a103a781a7ddf81dcf7684e1ce31eb2cae7bddae840f
-	sha512sums = a3bdd5dc53097584bf2bbe19f296b1726b9fa751905bae22990dc9eb17015e49e1911956b1e29dbaacbe6c285100a653179c191f223b6e612be633505347c34c
 	sha512sums = SKIP
 	sha512sums = SKIP
 
@@ -49,7 +55,6 @@ pkgname = giada-git
 	depends = libx11
 	depends = libxpm
 	depends = libasound.so
-	depends = libfltk.so
 	depends = libfreetype.so
 	depends = libjack.so
 	depends = libpulse.so
@@ -57,4 +62,3 @@ pkgname = giada-git
 	depends = librtmidi.so
 	depends = libsamplerate.so
 	depends = libsndfile.so
-
diff --git a/PKGBUILD b/PKGBUILD
index fdb075c812c9..a5e6f5c9b36f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Térence Clastres <t.clastres@gmail.com>
 
 pkgname=giada-git
-pkgver=v0.18.0.1.r0.g61c8d6ef
+pkgver=0.26.0.r0.g40540356
 pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=('x86_64')
@@ -15,19 +15,24 @@ makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'git' 'imagemagick' 'j
 checkdepends=('xorg-server-xvfb')
 provides=('vst3-host')
 conflicts=('giada' 'giada-vst')
-_last_good_commit=a935f95f41a75055cdae4133fa860e3234621294
-bad=6559aa56ac95cc7760d399b5a624505c5f6a4df1
 
 source=("giada-git::git+https://github.com/monocasual/giada.git"
-        "$pkgname-devendor_nlohmann_json.patch"
-        "JUCE-6.0.7.tar.gz::https://github.com/WeAreROLI/JUCE/archive/6.0.7.tar.gz"
-      	"https://raw.githubusercontent.com/nlohmann/json/db78ac1d7716f56fc9f1b030b715f872f93964e4/single_include/nlohmann/json.hpp"
+	"git+https://github.com/steinbergmedia/vst3sdk.git"
+	"git+https://github.com/juce-framework/JUCE.git#tag=7.0.5"
       	"git+https://github.com/monocasual/rtaudio.git"
-      	"git+https://github.com/monocasual/geompp.git")
+      	"git+https://github.com/monocasual/geompp.git"
+      	"git+https://github.com/monocasual/mcl-atomic-swapper.git"
+      	"git+https://github.com/monocasual/mcl-audio-buffer.git"
+	"git+https://github.com/fltk/fltk.git"
+	"git+https://github.com/cameron314/concurrentqueue.git"
+)
 sha512sums=('SKIP'
-            'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce'
-            'fe17273de00e34012b08e8355a04796b5e04020afb53c1473e6d891d5307e66470c8c113029a0f3270f6a103a781a7ddf81dcf7684e1ce31eb2cae7bddae840f'
-            'a3bdd5dc53097584bf2bbe19f296b1726b9fa751905bae22990dc9eb17015e49e1911956b1e29dbaacbe6c285100a653179c191f223b6e612be633505347c34c'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             'SKIP'
             'SKIP')
 
@@ -39,29 +44,16 @@ pkgver() {
 prepare() {
   cd "$pkgname"
 
-  cp -r ../JUCE-6.0.7/modules/ src/deps/juce/
-  #vst3 support headers
-  cp -r /usr/include/vst3sdk/* src/deps/vst3sdk/
-  #vst2 support headers
-  cp -r /usr/include/vst36/pluginterfaces/vst2.x/ src/deps/vst3sdk/pluginterfaces/
-
-  # XDG desktop file
-  gendesk -n -f \
-          --pkgname ${pkgname/-git} \
-          --pkgdesc "${pkgdesc}" \
-          --name Giada \
-          --categories "AudioVideo;Audio;Midi;Sequencer"
-
-  # devendor nlohmann-json
-  patch -Np1 -i ../"$pkgname-devendor_nlohmann_json.patch"
-
-  # rtaudio
-  git config submodule.src/deps/rtaudio.url $srcdir/rtaudio
-  git submodule update src/deps/rtaudio
-
-  # geompp
-  git config submodule.src/deps/geompp.url $srcdir/geompp
-  git submodule update src/deps/geompp
+  git submodule init
+  git config submodule.src/deps/juce.url "$srcdir/JUCE"
+  git config submodule.src/deps/mcl-audio-buffer.url "$srcdir/mcl-audio-buffer"
+  git config submodule.src/deps/mcl-atomic-swapper.url "$srcdir/mcl-atomic-swapper"
+  git config submodule.src/deps/rtaudio.url "$srcdir/rtaudio"
+  git config submodule.src/deps/vst3sdk.url "$srcdir/vst3sdk"
+  git config submodule.src/deps/geompp.url "$srcdir/geompp"
+  git config submodule.src/deps/fltk.url "$srcdir/fltk"
+  git config submodule.src/deps/concurrentqueue.url "$srcdir/concurrentqueue"
+  git -c protocol.file.allow=always submodule update
 }
 
 build() {
@@ -69,8 +61,9 @@ build() {
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE='None' \
-      -DWITH_VST2=on \
+      -DWITH_VST2=OFF \
       -DWITH_VST3=ON \
+      -DWITH_SYSTEM_JSON=ON \
       -DWITH_TESTS=ON \
       -W no-dev \
       -B build \
@@ -79,28 +72,18 @@ build() {
   make VERBOSE=1 -C build
 }
 
-# # unclear how to run tests: https://github.com/monocasual/giada/issues/463
-# check(){
-#   cd "$pkgname-$pkgver"
-#   make check VERBOSE=1 -C build
-# }
+check(){
+  cd "$pkgname"
+  xvfb-run ./build-test/giada --run-tests
+}
 
 package() {
-  depends+=('libasound.so' 'libfltk.so' 'libfreetype.so' 'libjack.so'
+  depends+=('libasound.so' 'libfreetype.so' 'libjack.so'
   'libpulse.so' 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so'
   'libsndfile.so')
   cd "$pkgname"
   make DESTDIR="$pkgdir/" install -C build
 
-
-  # Hack to allow (re)building package without --cleanbuild
-  # This is because I'm copying files to those submodules instead of updating them
-  git submodule deinit --all -f
-
-  # XDG integration
-  install -vDm 644 "${pkgname/-git}.desktop" -t "${pkgdir}/usr/share/applications"
-  install -vDm 644 "extras/${pkgname/-git}-logo.svg" \
-    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname/-git}.svg"
   # docs
   install -vDm 644 {ChangeLog,README.md} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
diff --git a/giada-git-devendor_nlohmann_json.patch b/giada-git-devendor_nlohmann_json.patch
deleted file mode 100644
index 45ea07e5fa05..000000000000
--- a/giada-git-devendor_nlohmann_json.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
---- a/src/core/conf.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/conf.cpp	2021-04-24 16:18:22.530287443 +0200
-@@ -27,7 +27,7 @@
- #include "conf.h"
- #include "core/const.h"
- #include "core/types.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include <FL/Fl.H>
-@@ -315,4 +315,4 @@
- 	ofs << j;
- 	return true;
- }
--} // namespace giada::m::conf
-\ No newline at end of file
-+} // namespace giada::m::conf
-diff -ruN a/src/core/init.cpp b/src/core/init.cpp
---- a/src/core/init.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/init.cpp	2021-04-24 16:19:01.257069455 +0200
-@@ -54,7 +54,7 @@
- #include "core/sequencer.h"
- #include "core/wave.h"
- #include "core/waveManager.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "glue/main.h"
- #include "gui/dialogs/mainWindow.h"
- #include "gui/dialogs/warnings.h"
-diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
---- a/src/core/midiMapConf.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/midiMapConf.cpp	2021-04-24 16:17:56.890211073 +0200
-@@ -26,7 +26,7 @@
- 
- #include "midiMapConf.h"
- #include "const.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include "utils/string.h"
-diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
---- a/src/core/patch.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/patch.cpp	2021-04-24 16:19:23.867136797 +0200
-@@ -26,7 +26,7 @@
- 
- #include "patch.h"
- #include "core/mixer.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/log.h"
- #include "utils/math.h"
- #include <fstream>