fix: build errors and dependencies in pkg string-machine (#314)

3 files changed, 59 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a722e937a22f..2f5a46315201 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,33 @@
 pkgbase = string-machine
 	pkgdesc = A virtual-analog string ensemble synthesizer LV2 and VST2 plugin
 	pkgver = 0.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/jpcima/string-machine
 	arch = x86_64
 	arch = aarch64
-	groups = pro-audio
 	groups = lv2-plugins
+	groups = pro-audio
 	groups = vst-plugins
 	license = Boost
 	checkdepends = kxstudio-lv2-extensions
 	checkdepends = lv2lint
 	makedepends = boost
-	makedepends = mesa
+	makedepends = cairo
+	makedepends = libglvnd
+	depends = glibc
 	depends = gcc-libs
 	depends = libx11
-	depends = cairo
+	optdepends = lv2-host: for loading the LV2 format plugins
+	optdepends = vst-host: for loading the VST2 format plugins
 	source = https://github.com/jpcima/string-machine/releases/download/v0.1.0/string-machine-0.1.0.tar.gz
 	source = string-machine-Makefile.base.mk::https://raw.githubusercontent.com/DISTRHO/DPF/05d91f5852f4bccfd2bce1d4d2e2b3036e29db03/Makefile.base.mk
+	source = fix-missing-stdint-include.patch
 	sha256sums = 5b0d2eb2185199c1de6c7c35700a2caafbc6ba564529a2e7614c15c3aceacc6f
 	sha256sums = ef890c65422c8c73ffea7687a45317689378ff2b0f3ccadd497ca1cdc77e08a4
+	sha256sums = 9c2d6ba762b64c395cb4eb35393eaaaca560692bf48513d34bf6c81fbe350cf5
 
 pkgname = string-machine
+	depends = glibc
+	depends = gcc-libs
+	depends = libx11
+	depends = libcairo.so
diff --git a/PKGBUILD b/PKGBUILD
index d4c28c34dc1b..ec0dbc49cbc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,32 @@
 pkgname=string-machine
 _plugin_uri="http://jpcima.sdf1.org/lv2/$pkgname"
 pkgver=0.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='A virtual-analog string ensemble synthesizer LV2 and VST2 plugin'
 arch=(x86_64 aarch64)
 url='https://github.com/jpcima/string-machine'
 license=(Boost)
-depends=(gcc-libs libx11 cairo)
-makedepends=(boost mesa)
+depends=(glibc gcc-libs libx11)
+makedepends=(boost cairo libglvnd)
 checkdepends=(kxstudio-lv2-extensions lv2lint)
-groups=(pro-audio lv2-plugins vst-plugins)
+optdepends=(
+  'lv2-host: for loading the LV2 format plugins'
+  'vst-host: for loading the VST2 format plugins'
+)
+groups=(lv2-plugins pro-audio vst-plugins)
 _dpf_commit='05d91f5852f4bccfd2bce1d4d2e2b3036e29db03'
 source=("https://github.com/jpcima/string-machine/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
-        "${pkgname}-Makefile.base.mk::https://raw.githubusercontent.com/DISTRHO/DPF/$_dpf_commit/Makefile.base.mk")
+        "$pkgname-Makefile.base.mk::https://raw.githubusercontent.com/DISTRHO/DPF/$_dpf_commit/Makefile.base.mk"
+        'fix-missing-stdint-include.patch')
 sha256sums=('5b0d2eb2185199c1de6c7c35700a2caafbc6ba564529a2e7614c15c3aceacc6f'
-            'ef890c65422c8c73ffea7687a45317689378ff2b0f3ccadd497ca1cdc77e08a4')
+            'ef890c65422c8c73ffea7687a45317689378ff2b0f3ccadd497ca1cdc77e08a4'
+            '9c2d6ba762b64c395cb4eb35393eaaaca560692bf48513d34bf6c81fbe350cf5')
 
 prepare() {
   cd $pkgname-$pkgver
   # Update DPF base makefile to fix arm64 build
   cp -f "$srcdir"/$pkgname-Makefile.base.mk dpf/Makefile.base.mk
+  patch -p1 -N -r - -i "$srcdir"/fix-missing-stdint-include.patch
 }
 
 build() {
@@ -39,6 +46,7 @@ check() {
 }
 
 package() {
+  depends+=(libcairo.so)
   cd $pkgname-$pkgver
   # LV2 bundle
   install -Dm755 bin/$pkgname.lv2/*.so -t \
diff --git a/fix-missing-stdint-include.patch b/fix-missing-stdint-include.patch
new file mode 100644
index 000000000000..408d333eca26
--- /dev/null
+++ b/fix-missing-stdint-include.patch
@@ -0,0 +1,32 @@
+diff --git a/sources/ui/Cairo++.h b/sources/ui/Cairo++.h
+index 50e0b3c..ccab778 100644
+--- a/sources/ui/Cairo++.h
++++ b/sources/ui/Cairo++.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ #include "Geometry.h"
+ #include "Color.h"
++#include <stdint.h>
+ #include <cairo/cairo.h>
+ #include <type_traits>
+ #include <memory>
+diff --git a/sources/ui/Color.h b/sources/ui/Color.h
+index 5c27804..2cf2a28 100644
+--- a/sources/ui/Color.h
++++ b/sources/ui/Color.h
+@@ -1,4 +1,5 @@
+ #pragma once
++#include <stdint.h>
+ 
+ struct ColorRGBA8 {
+     uint8_t r, g, b, a;
+diff --git a/sources/ui/components/KnobSkin.hpp b/sources/ui/components/KnobSkin.hpp
+index c124817..ef99e91 100644
+--- a/sources/ui/components/KnobSkin.hpp
++++ b/sources/ui/components/KnobSkin.hpp
+@@ -1,4 +1,5 @@
+ #pragma once
++#include <stdint.h>
+ #include "ui/Cairo++.h"
+ 
+ class KnobSkin {