Sync to community package, add missing submodules

4 files changed, 85 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38d260fc303a..d6b0fd7aba7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = giada-git
 	pkgdesc = A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians
-	pkgver = v0.17.1.r2.g2b95a81b
+	pkgver = v0.18.0.1.r0.g61c8d6ef
 	pkgrel = 1
 	url = https://www.giadamusic.com/
 	arch = x86_64
 	groups = pro-audio
 	license = GPL3
-	checkdepends = catch2
 	checkdepends = xorg-server-xvfb
 	makedepends = alsa-lib
+	makedepends = catch2
 	makedepends = cmake
 	makedepends = fltk
 	makedepends = gendesk
@@ -27,20 +27,21 @@ pkgbase = giada-git
 	depends = glibc
 	depends = libx11
 	depends = libxpm
+	provides = vst3-host
 	conflicts = giada
 	conflicts = giada-vst
 	source = giada-git::git+https://github.com/monocasual/giada.git
-	source = giada-git-rtmidi_cppflags.patch
 	source = giada-git-devendor_nlohmann_json.patch
-	source = JUCE-6.0.4.tar.gz::https://github.com/WeAreROLI/JUCE/archive/6.0.4.tar.gz
+	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/monocasual/rtaudio.git
+	source = git+https://github.com/monocasual/geompp.git
 	sha512sums = SKIP
-	sha512sums = ae222bb63b0388ef1b02ff2cda0e589545c80fae26cbf06c04e0963a661e32b4d6746eea424359a44bb20e7568dbb5335359c5226c36d9c8b86d10130e83fedc
-	sha512sums = 5b4b6c6c421851f4da72b6fb4ff457156d3332c5c7a795edffe05386d48864830e7b3afb4011996a8cd5284d2fdbc2e0da3d590108e04d00227d25bc3127f506
-	sha512sums = 94bfb122bad5f47be018f66b118a024eb56d537aecaedc440fd1648cbecb08375a2c375e6b1e12b39621bf8c272356fab98872b6a8cab506706cdc18f215096c
+	sha512sums = b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce
+	sha512sums = fe17273de00e34012b08e8355a04796b5e04020afb53c1473e6d891d5307e66470c8c113029a0f3270f6a103a781a7ddf81dcf7684e1ce31eb2cae7bddae840f
 	sha512sums = a3bdd5dc53097584bf2bbe19f296b1726b9fa751905bae22990dc9eb17015e49e1911956b1e29dbaacbe6c285100a653179c191f223b6e612be633505347c34c
 	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = giada-git
 	depends = gcc-libs
@@ -49,6 +50,7 @@ pkgname = giada-git
 	depends = libxpm
 	depends = libasound.so
 	depends = libfltk.so
+	depends = libfreetype.so
 	depends = libjack.so
 	depends = libpulse.so
 	depends = libpulse-simple.so
diff --git a/PKGBUILD b/PKGBUILD
index ce0f0f78b100..fdb075c812c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Térence Clastres <t.clastres@gmail.com>
 
 pkgname=giada-git
-pkgver=v0.17.1.r2.g2b95a81b
+pkgver=v0.18.0.1.r0.g61c8d6ef
 pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=('x86_64')
@@ -10,21 +10,25 @@ license=('GPL3')
 groups=('pro-audio')
 depends=('gcc-libs' 'glibc' 'libx11' 'libxpm')
 # upstream vendors a hacked rtaudio :(
-makedepends=('alsa-lib' 'cmake' 'fltk' 'gendesk' 'git' 'imagemagick' 'jack'
+makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'git' 'imagemagick' 'jack'
 'libpulse' 'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi' 'vst3sdk' 'steinberg-vst')
-checkdepends=('catch2' 'xorg-server-xvfb')
+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-rtmidi_cppflags.patch"
         "$pkgname-devendor_nlohmann_json.patch"
-        "JUCE-6.0.4.tar.gz::https://github.com/WeAreROLI/JUCE/archive/6.0.4.tar.gz"
+        "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/monocasual/rtaudio.git")
+      	"git+https://github.com/monocasual/rtaudio.git"
+      	"git+https://github.com/monocasual/geompp.git")
 sha512sums=('SKIP'
-            'ae222bb63b0388ef1b02ff2cda0e589545c80fae26cbf06c04e0963a661e32b4d6746eea424359a44bb20e7568dbb5335359c5226c36d9c8b86d10130e83fedc'
-            '5b4b6c6c421851f4da72b6fb4ff457156d3332c5c7a795edffe05386d48864830e7b3afb4011996a8cd5284d2fdbc2e0da3d590108e04d00227d25bc3127f506'
-            '94bfb122bad5f47be018f66b118a024eb56d537aecaedc440fd1648cbecb08375a2c375e6b1e12b39621bf8c272356fab98872b6a8cab506706cdc18f215096c'
+            'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce'
+            'fe17273de00e34012b08e8355a04796b5e04020afb53c1473e6d891d5307e66470c8c113029a0f3270f6a103a781a7ddf81dcf7684e1ce31eb2cae7bddae840f'
             'a3bdd5dc53097584bf2bbe19f296b1726b9fa751905bae22990dc9eb17015e49e1911956b1e29dbaacbe6c285100a653179c191f223b6e612be633505347c34c'
+            'SKIP'
             'SKIP')
 
 pkgver() {
@@ -35,7 +39,7 @@ pkgver() {
 prepare() {
   cd "$pkgname"
 
-  cp -r ../JUCE-6.0.4/modules/ src/deps/juce/
+  cp -r ../JUCE-6.0.7/modules/ src/deps/juce/
   #vst3 support headers
   cp -r /usr/include/vst3sdk/* src/deps/vst3sdk/
   #vst2 support headers
@@ -48,54 +52,51 @@ prepare() {
           --name Giada \
           --categories "AudioVideo;Audio;Midi;Sequencer"
 
-  # remove targets for missing files:
-  # https://github.com/monocasual/giada/issues/431
-  sed -e '/baseButton/d' -i Makefile.am
-
-  # add rtmidi cppflags:
-  # https://github.com/monocasual/giada/issues/417
-  patch -Np1 -i ../"$pkgname-rtmidi_cppflags.patch"
-
   # 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
 }
 
 build() {
   cd "$pkgname"
 
-  cmake -B build  \
-	-DWITH_VST2=on \
-	-DWITH_VST3=on \
-	-DWITH_TESTS=on \
-	-DWITH_SYSTEM_CATCH=on \
-  -DCMAKE_BUILD_TYPE='None' \
-  -Wno-dev
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE='None' \
+      -DWITH_VST2=on \
+      -DWITH_VST3=ON \
+      -DWITH_TESTS=ON \
+      -W no-dev \
+      -B build \
+      -S .
 
-  make -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
+  make VERBOSE=1 -C build
 }
 
-check(){
-  cd "$pkgname"
-  # move binary to expected directory:
-  # https://github.com/monocasual/giada/issues/432
-  mkdir -vp build
-  cp -av "${pkgname}" build/
-  xvfb-run -a make -k check
-}
+# # unclear how to run tests: https://github.com/monocasual/giada/issues/463
+# check(){
+#   cd "$pkgname-$pkgver"
+#   make check VERBOSE=1 -C build
+# }
 
 package() {
-  depends+=('libasound.so' 'libfltk.so' 'libjack.so' 'libpulse.so'
-  'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so' 'libsndfile.so')
+  depends+=('libasound.so' 'libfltk.so' 'libfreetype.so' 'libjack.so'
+  'libpulse.so' 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so'
+  'libsndfile.so')
   cd "$pkgname"
-  install -vD "build/${pkgname/-git}" -t "${pkgdir}/usr/bin/"
+  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" \
diff --git a/giada-git-devendor_nlohmann_json.patch b/giada-git-devendor_nlohmann_json.patch
index 3cc1c1248a2a..45ea07e5fa05 100644
--- a/giada-git-devendor_nlohmann_json.patch
+++ b/giada-git-devendor_nlohmann_json.patch
@@ -1,55 +1,55 @@
 diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
---- a/src/core/conf.cpp	2020-11-15 21:26:40.000000000 +0100
-+++ b/src/core/conf.cpp	2020-11-20 17:28:36.176616521 +0100
-@@ -29,7 +29,7 @@
- #include <cassert>
- #include <string>
- #include <FL/Fl.H>
+--- 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 "core/const.h"
+ #include <FL/Fl.H>
 @@ -315,4 +315,4 @@
-     ofs << j;
+ 	ofs << j;
  	return true;
  }
--}}} // giada::m::conf::
+-} // namespace giada::m::conf
 \ No newline at end of file
-+}}} // giada::m::conf::
++} // namespace giada::m::conf
 diff -ruN a/src/core/init.cpp b/src/core/init.cpp
---- a/src/core/init.cpp	2020-11-15 21:26:40.000000000 +0100
-+++ b/src/core/init.cpp	2020-11-20 17:29:53.759248660 +0100
-@@ -35,7 +35,7 @@
- 	#include <X11/Xlib.h> // For XInitThreads
- #endif
- #include <FL/Fl.H>
+--- 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 "gui/updater.h"
- #include "utils/log.h"
- #include "utils/fs.h"
+ #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	2020-11-15 21:26:40.000000000 +0100
-+++ b/src/core/midiMapConf.cpp	2020-11-20 17:28:01.216937457 +0100
-@@ -30,7 +30,7 @@
- #include <string>
- #include <cstring>
- #include <filesystem>
+--- 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/string.h"
- #include "utils/log.h"
  #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	2020-11-15 21:26:40.000000000 +0100
-+++ b/src/core/patch.cpp	2020-11-20 17:30:12.475748254 +0100
+--- 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 <fstream>
+ #include "patch.h"
+ #include "core/mixer.h"
 -#include "deps/json/single_include/nlohmann/json.hpp"
 +#include <nlohmann/json.hpp>
- #include "utils/math.h"
  #include "utils/log.h"
- #include "core/mixer.h"
+ #include "utils/math.h"
+ #include <fstream>
diff --git a/giada-git-rtmidi_cppflags.patch b/giada-git-rtmidi_cppflags.patch
deleted file mode 100644
index cdd70ea3c7a2..000000000000
--- a/giada-git-rtmidi_cppflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN a/Makefile.am b/Makefile.am
---- a/Makefile.am	2020-11-15 21:26:40.000000000 +0100
-+++ b/Makefile.am	2020-11-20 18:53:06.031868664 +0100
-@@ -402,7 +402,7 @@
- if LINUX
- 
- # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
--cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
-+cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ $(RTMIDI_CFLAGS)
- 
- ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
- 	-lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi \
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2020-11-15 21:26:40.000000000 +0100
-+++ b/configure.ac	2020-11-20 18:52:11.715602516 +0100
-@@ -138,6 +138,7 @@
- 		[],
- 		[AC_MSG_ERROR([library 'rtMidi' not found!])]
- 	)
-+	PKG_CHECK_MODULES([RTMIDI], [rtmidi])
- 	AC_LANG_POP
- fi
-