Date: Saturday, October 15, 2022 @ 17:52:53
  Author: dvzrv
Revision: 1329207

upgpkg: cardinal 22.10-1: Upgrade to 22.10.

Run tests in check() against most lv2 plugins.
Simplify depends and optdepends of the split packages by relying on common sets 
and reusing them.
Add xdg-desktop-portal-impl to optdepends for file browser.
Add patch to properly install the new clap plugins in the install target.
Add cardinal-clap split package.

Modified:
  cardinal/trunk/PKGBUILD

----------+
 PKGBUILD |  114 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-15 17:43:41 UTC (rev 1329206)
+++ PKGBUILD    2022-10-15 17:52:53 UTC (rev 1329207)
@@ -1,8 +1,8 @@
 # Maintainer: David Runge <[email protected]>
 
 pkgbase=cardinal
-pkgname=(cardinal cardinal-data cardinal-jack cardinal-lv2 cardinal-vst 
cardinal-vst3)
-pkgver=22.09
+pkgname=(cardinal cardinal-clap cardinal-data cardinal-jack cardinal-lv2 
cardinal-vst cardinal-vst3)
+pkgver=22.10
 pkgrel=1
 pkgdesc="Virtual modular synthesizer"
 arch=(x86_64)
@@ -10,19 +10,43 @@
 license=(GPL3)
 makedepends=(dbus file gcc-libs gendesk git glibc jansson libarchive libglvnd
 liblo libsndfile libsamplerate libx11 libxext libxrandr mold python speexdsp)
-# lv2lint needs the additional lv2-extensions from mod-sdk:
-# https://github.com/moddevices/mod-sdk/blob/master/mod.lv2/mod.ttl#L174
-# checkdepends=(kxstudio-lv2-extensions lv2 lv2lint xorg-server-xvfb)
+checkdepends=(kxstudio-lv2-extensions mod-lv2-extensions lv2 lv2lint 
xorg-server-xvfb)
 options=(debug)
 source=(
   
https://github.com/DISTRHO/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.xz
   
$pkgbase-$pkgver.svg::https://raw.githubusercontent.com/DISTRHO/Cardinal/eb95b5990cf734c10f2caab1a246eac893f0266d/plugins/Cardinal/orig/distrho.svg
+  
$pkgbase-22.10-clap_install_target.patch::https://github.com/DISTRHO/Cardinal/commit/373ff58766f1f72e60284b260b241a08f7eb2249.patch
 )
-sha512sums=('2ae44e4f8529e231a86b56d6246bb29a6c52e4326fc4e470bb1d90ec6832e1660e6d60edf3612ad5b9861ca4489eb0eb3812cd648b08e0e5e5a32507815a381f'
-            
'31a7d1e548285af0ead1bc844fbb1d35b50f6284159047cb401a829d4068992fa328770e42c377c08d013f6787e55ac12b94eba4d5af4b90373b157971fc8835')
-b2sums=('f9cbfd3d24279f48aa06b055188ea7b78452f8a4d821804a00a8eb2c0347694a0b59d80e36124427c1c483f9c7cee67627a5cc5d0e752e6c4369ca19000dc535'
-        
'd82fefe15234c1ed3a4d487c6082a2e3ac73b60f11041314e99c5a5de5b3ea141efbd5afd18851510bd4f801fd71f7cd89d54d86258d1ba750bbfd762aa37a8d')
+sha512sums=('e4ef72e31d30ecb67c01bfa7df9b3e81c8c48d1e2af2d320a335c37d263a5b84f9e63779337ccbdcbb1ef8810fc2b2af275c52c7f2e73400f6f6a9dfdb5df5cd'
+            
'31a7d1e548285af0ead1bc844fbb1d35b50f6284159047cb401a829d4068992fa328770e42c377c08d013f6787e55ac12b94eba4d5af4b90373b157971fc8835'
+            
'c69c6301e9364f3c9747eaaa0352d002eab2f4241f884a263f0a2068baed46df9189c937e24d6df6e41173f5694326af294df01d9936b54920cd2675736341dc')
+b2sums=('3afb75dea4733108d34557fa3585049b36869ed6662d72598269ffaa75bf17306f4b46c581c784bdc6baf977dae19e6695c4234453db92e52be8acc9c2e7e1f8'
+        
'd82fefe15234c1ed3a4d487c6082a2e3ac73b60f11041314e99c5a5de5b3ea141efbd5afd18851510bd4f801fd71f7cd89d54d86258d1ba750bbfd762aa37a8d'
+        
'74f366b9b377961817af860e25153ede6be0578b31705cb18914183899e0307ac5f4eac7afe5a734e6e53ab2e21bad8d8e880e0fc25b43ded188787951fcaada')
 
+_common_depends=(
+  cardinal-data
+  dbus libdbus-1.so
+  file libmagic.so
+  gcc-libs
+  glibc
+  jansson
+  libarchive libarchive.so
+  libglvnd libGL.so
+  liblo liblo.so
+  libsamplerate libsamplerate.so
+  libsndfile libsndfile.so
+  libx11
+  libxext
+  libxrandr
+  speexdsp libspeexdsp.so
+)
+_common_optdepends=(
+  'carla: for carla module and ildaeil plugin host'
+  'mpv: for experimental video support'
+  'xdg-desktop-portal-impl: for file browser'
+)
+
 _pick() {
   local p="$1" f d; shift
   for f; do
@@ -34,6 +58,9 @@
 }
 
 prepare() {
+  # add clap plugin to install target
+  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-22.10-clap_install_target.patch
+
   gendesk -n \
           --exec Cardinal \
           --name Cardinal \
@@ -49,18 +76,19 @@
   make PREFIX=/usr SYSDEPS=true WITH_LTO=true -C $pkgname-$pkgver
 }
 
-# check() {
-#   declare -A _links=(
-#     ["Cardinal"]="https://distrho.kx.studio/plugins/cardinal";
-#     ["CardinalFX"]="https://distrho.kx.studio/plugins/cardinal#fx";
-#     ["CardinalSynth"]="https://distrho.kx.studio/plugins/cardinal#synth";
-#   )
-# 
-#   for _name in Cardinal{,FX,Synth}; do
-#     xvfb-run lv2lint -s "lv2_generate_ttl" -Mpack -I 
$pkgname-$pkgver/bin/$_name.lv2 "${_links[$_name]}"
-#   done
-# }
+check() {
+  declare -A _links=(
+    ["Cardinal"]="https://distrho.kx.studio/plugins/cardinal";
+    ["CardinalFX"]="https://distrho.kx.studio/plugins/cardinal#fx";
+    ["CardinalSynth"]="https://distrho.kx.studio/plugins/cardinal#synth";
+  )
 
+  # NOTE: lvlint fails on Cardinal, as it makes use of non-standard Port 
Class, which it does not support yet
+  for _name in Cardinal{FX,Synth}; do
+    xvfb-run lv2lint -s "lv2_generate_ttl" -Mpack -I 
$pkgname-$pkgver/bin/$_name.lv2 "${_links[$_name]}"
+  done
+}
+
 package_cardinal() {
   depends=(cardinal-jack cardinal-lv2 cardinal-vst cardinal-vst3)
 
@@ -68,6 +96,7 @@
 
   (
     cd "$pkgdir"
+    _pick $pkgbase-clap usr/lib/clap/
     _pick $pkgbase-data usr/share/$pkgbase
     _pick $pkgbase-data usr/share/doc
     _pick $pkgbase-jack usr/bin/
@@ -77,6 +106,15 @@
   )
 }
 
+package_cardinal-clap() {
+  pkgdesc+=" - CLAP plugin"
+  groups=(clap-plugins pro-audio)
+  depends=("${_common_depends[@]}" clap-host)
+  optdepends=("${_common_optdepends[@]}")
+
+  mv -v $pkgbase-clap/* "$pkgdir"
+}
+
 package_cardinal-data() {
   pkgdesc+=" - data"
 
@@ -86,13 +124,8 @@
 package_cardinal-jack() {
   pkgdesc+=" - JACK standalone"
   groups=(pro-audio)
-  depends=(cardinal-data gcc-libs glibc jack jansson libglvnd libx11 libxext
-  libxrandr speexdsp libdbus-1.so libarchive.so liblo.so libmagic.so
-  libsndfile.so libsamplerate.so)
-  optdepends=(
-    'carla: for carla module and ildaeil plugin host'
-    'mpv: for experimental video support'
-  )
+  depends=("${_common_depends[@]}" hicolor-icon-theme jack)
+  optdepends=("${_common_optdepends[@]}")
 
   mv -v $pkgbase-jack/* "$pkgdir"
   install -vDm 644 *.desktop -t "$pkgdir/usr/share/applications"
@@ -102,13 +135,8 @@
 package_cardinal-lv2() {
   pkgdesc+=" - LV2 plugin"
   groups=(lv2-plugins pro-audio)
-  depends=(cardinal-data gcc-libs glibc jansson libglvnd libx11 libxext
-  libxrandr lv2-host speexdsp libdbus-1.so libarchive.so liblo.so libmagic.so
-  libsndfile.so libsamplerate.so)
-  optdepends=(
-    'carla: for carla module and ildaeil plugin host'
-    'mpv: for experimental video support'
-  )
+  depends=("${_common_depends[@]}" lv2-host)
+  optdepends=("${_common_optdepends[@]}")
 
   mv -v $pkgbase-lv2/* "$pkgdir"
 }
@@ -116,13 +144,8 @@
 package_cardinal-vst() {
   pkgdesc+=" - VST2 plugin"
   groups=(pro-audio vst-plugins)
-  depends=(cardinal-data gcc-libs glibc jansson libglvnd libx11 libxext
-  libxrandr speexdsp vst-host libdbus-1.so libarchive.so liblo.so libmagic.so
-  libsndfile.so libsamplerate.so)
-  optdepends=(
-    'carla: for carla module and ildaeil plugin host'
-    'mpv: for experimental video support'
-  )
+  depends=("${_common_depends[@]}" vst-host)
+  optdepends=("${_common_optdepends[@]}")
 
   mv -v $pkgbase-vst/* "$pkgdir"
 }
@@ -130,13 +153,8 @@
 package_cardinal-vst3() {
   pkgdesc+=" - VST3 plugin"
   groups=(pro-audio vst3-plugins)
-  depends=(cardinal-data gcc-libs glibc jansson libglvnd libx11 libxext
-  libxrandr speexdsp vst3-host libdbus-1.so libarchive.so liblo.so libmagic.so
-  libsndfile.so libsamplerate.so)
-  optdepends=(
-    'carla: for carla module and ildaeil plugin host'
-    'mpv: for experimental video support'
-  )
+  depends=("${_common_depends[@]}" vst3-host)
+  optdepends=("${_common_optdepends[@]}")
 
   mv -v $pkgbase-vst3/* "$pkgdir"
 }

Reply via email to