updated to 0.23.0

2 files changed, 40 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 935380b65273..7677226ee760 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = giada
 	pkgdesc = A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians
-	pkgver = 0.22.0
+	pkgver = 0.23.0
 	pkgrel = 1
 	url = https://www.giadamusic.com/
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = giada
 	makedepends = alsa-lib
 	makedepends = catch2
 	makedepends = cmake
-	makedepends = fltk
 	makedepends = imagemagick
 	makedepends = jack
 	makedepends = libpulse
@@ -33,10 +32,28 @@ pkgbase = giada
 	provides = giada
 	options = !buildflags
 	options = !makeflags
-	source = https://www.giadamusic.com/data/giada-v0.22.0-src.tar.gz
-	source = giada-patches.patch
+	source = giada-0.23.0::git+https://github.com/monocasual/giada/#tag=v0.23.0
+	source = git+https://github.com/juce-framework/JUCE.git
+	source = git+https://github.com/steinbergmedia/vst3sdk.git
+	source = git+https://github.com/monocasual/rtaudio.git
+	source = git+https://github.com/monocasual/geompp.git
+	source = git+https://github.com/monocasual/mcl-audio-buffer.git
+	source = git+https://github.com/monocasual/mcl-atomic-swapper.git
+	source = git+https://github.com/fltk/fltk.git
 	sha512sums = SKIP
 	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 40bf5728bb8a..46d18b5d2697 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # NOTE: can currently not be built using devtools:
 # https://github.com/monocasual/giada/issues/553
 pkgname=giada
-pkgver=0.22.0
+pkgver=0.23.0
 pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=(x86_64)
@@ -14,18 +14,27 @@ groups=(pro-audio)
 depends=(gcc-libs glibc hicolor-icon-theme libx11 libxcursor libxft libxinerama libxpm fmt)
 options=(!buildflags !makeflags)
 # upstream vendors a hacked rtaudio :(
-makedepends=(alsa-lib catch2 cmake fltk imagemagick jack libpulse libsamplerate libsndfile libxrandr nlohmann-json rtmidi sed)
+makedepends=(alsa-lib catch2 cmake imagemagick jack libpulse libsamplerate libsndfile libxrandr nlohmann-json rtmidi sed)
 checkdepends=(xorg-server-xvfb)
 provides=(vst3-host giada)
 source=(
-  "https://www.giadamusic.com/data/${pkgname}-v${pkgver}-src.tar.gz" "giada-patches.patch"
+"$pkgname-$pkgver::git+https://github.com/monocasual/giada/#tag=v$pkgver" "git+https://github.com/juce-framework/JUCE.git"
+"git+https://github.com/steinbergmedia/vst3sdk.git" "git+https://github.com/monocasual/rtaudio.git" "git+https://github.com/monocasual/geompp.git" "git+https://github.com/monocasual/mcl-audio-buffer.git" "git+https://github.com/monocasual/mcl-atomic-swapper.git" "git+https://github.com/fltk/fltk.git"
 )
-sha512sums=('SKIP' 'SKIP')
-b2sums=('SKIP' 'SKIP')
+sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 prepare() {
-  cd "$pkgname-$pkgver-src"
-  patch -p1 < ../giada-patches.patch
+  cd "$pkgname-$pkgver"
+  git submodule init
+  git config submodule.externals/vendor/JUCE.url "$srcdir/JUCE"
+  git config submodule.externals/vendor/mcl-audio-buffer.url "$srcdir/mcl-audio-buffer"
+  git config submodule.externals/vendor/mcl-atomic-swapper.url "$srcdir/mcl-atomic-swapper"
+  git config submodule.externals/vendor/rtaudio.url "$srcdir/rtaudio"
+  git config submodule.externals/vendor/vst3sdk.url "$srcdir/vst3sdk"
+  git config submodule.externals/vendor/geompp.url "$srcdir/geompp"
+  git config submodule.externals/vendor/fltk.url "$srcdir/fltk"
+  git submodule update
 }
 
 build() {
@@ -35,20 +44,10 @@ build() {
         -DWITH_SYSTEM_JSON=ON \
         -W no-dev \
         -B build \
-        -S "$pkgname-$pkgver-src"
-  #cmake -DCMAKE_INSTALL_PREFIX=/usr \
-  #      -DCMAKE_BUILD_TYPE='None' \
-  #      -DWITH_VST3=ON \
-  #      -DWITH_SYSTEM_JSON=ON \
-  #      -DWITH_TESTS=ON \
-  #      -W no-dev \
-  #      -B build-test \
-  #      -S "$pkgname-$pkgver-src"
-
+        -S "$pkgname-$pkgver"
   #fix for libdl.so version
   sed -i "s/libdl.so/libdl.so.2/g" "build/CMakeFiles/giada.dir/build.make"
   make VERBOSE=1 -C build
-  #make VERBOSE=1 -C build-test
 }
 
 #check(){
@@ -61,5 +60,6 @@ package() {
 
   make DESTDIR="$pkgdir/" install -C build
   # docs
-  install -vDm 644 "$pkgname-$pkgver-src/"{ChangeLog,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
+``cd "$pkgname-$pkgver/"
+  install -vDm 644 {ChangeLog,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }