Date: Friday, December 23, 2022 @ 22:15:19
  Author: dvzrv
Revision: 1365345

upgpkg: yabridge 5.0.2-1: Upgrade to 5.0.2.

Use upstream's version of vst3sdk because ours doesn't work.
Add upstream patch to make clap >= 1.1.3 work.

Modified:
  yabridge/trunk/PKGBUILD

----------+
 PKGBUILD |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-12-23 20:50:32 UTC (rev 1365344)
+++ PKGBUILD    2022-12-23 22:15:19 UTC (rev 1365345)
@@ -2,35 +2,63 @@
 
 pkgbase=yabridge
 pkgname=(yabridge yabridgectl)
-_commit=f30e6200785ed8ae37fd7f017a6cb75865f2b4bc  # 4.0.2^{}
-pkgver=4.0.2
+_commit=669b42b31bc40c1135431d8f4f64e7f3fde588d0  # refs/tags/5.0.2
+_vst3sdk_commit=ac1d0ea4b7b8540708d5f78d51bfecb7e75dddd9  # 
refs/tags/v3.7.5_build_44-patched-2
+pkgver=5.0.2
 pkgrel=1
 pkgdesc="A modern and transparent way to use Windows VST2 and VST3 plugins on 
Linux"
 arch=(x86_64)
 url="https://github.com/robbert-vdh/yabridge";
 license=(GPL3)
-makedepends=(asio bitsery cmake function2 ghc-filesystem git lib32-libxcb 
libxcb meson rust tomlplusplus vst3sdk wine)
+makedepends=(asio bitsery clap cmake function2 ghc-filesystem git lib32-libxcb 
libxcb meson rust tomlplusplus vst3sdk wine)
 # if LTO is enabled the cmake detection will explode because of wine
 # NOTE: debug package includes garbage because of rust
 options=(debug !lto)
 source=(
-  git+https://github.com/robbert-vdh/$pkgbase.git#commit=$_commit
-  
$pkgbase-4.0.0-vst3sdk_meson.build::https://raw.githubusercontent.com/robbert-vdh/vst3sdk/7a30caa588ff48eabae5f4f8cdac2c7c053800fa/meson.build
+  git+https://github.com/robbert-vdh/$pkgbase.git#tag=$_commit
+  
$pkgbase-vst3sdk::git+https://github.com/robbert-vdh/vst3sdk.git#commit=$_vst3sdk_commit
+  $pkgbase-vst3_base::git+https://github.com/steinbergmedia/vst3_base.git
+  
$pkgbase-vst3_pluginterfaces::git+https://github.com/steinbergmedia/vst3_pluginterfaces.git
+  
$pkgbase-vst3_public_sdk::git+https://github.com/steinbergmedia/vst3_public_sdk.git
 )
 sha512sums=('SKIP'
-            
'0b59cd5929434cadfcf3a2ad2cddbc1ad82f38a1d778040619b825439d6acb4f1fafa17512ad2eb5fc1c5b3ba45656f12e77e57834d85ee7f23e5754a9b8cb13')
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 b2sums=('SKIP'
-        
'4bf8b6c2390db5657026539869cada55accd38aee8d514d84a34c5c4b56bdc5e1ea3d1d4b2e323ed304b9f28eb767f29d316622a73dc2af9f5587da8e75c85f8')
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP')
 
 prepare() {
+  # NOTE: use upstream's specific version of vst3sdk to get around compilation 
errors
+  (
+    cd $pkgbase-vst3sdk
+    git submodule init
+    git config submodule.base.url "$srcdir/$pkgbase-vst3_base"
+    git config submodule.pluginterfaces.url 
"$srcdir/$pkgbase-vst3_pluginterfaces"
+    git config submodule.publik.sdk.url "$srcdir/$pkgbase-vst3_public_sdk"
+    git -c protocol.file.allow=always submodule update
+  )
+
+  (
+    cd $pkgbase
+    # support clap >= 1.1.3
+    git cherry-pick -n 5150332d20a50f6c9082ac6a9ae1873eb7ee5a9f
+  )
   # remove all wraps as they are ignored anyways
   rm -rv $pkgname/subprojects/*
 
+  mkdir -vp $pkgname/subprojects/vst3
   # put system-installed vst3sdk in place and add upstream meson.build file 
from https://github.com/robbert-vdh/vst3sdk/
-  mkdir -vp $pkgname/subprojects/vst3
-  cp -av /usr/include/vst3sdk/* $pkgname/subprojects/vst3/
-  cp -v $pkgbase-*-vst3sdk_meson.build $pkgname/subprojects/vst3/meson.build
+  # NOTE: vst3sdk > 3.7.5 currently not compatible
+  # cp -av /usr/share/vst3sdk/* $pkgname/subprojects/vst3/
+  # cp -v $pkgbase-*-vst3sdk_meson.build $pkgname/subprojects/vst3/meson.build
 
+  cp -av $pkgbase-vst3sdk/* $pkgname/subprojects/vst3/
+
   cd $pkgname/tools/yabridgectl
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }

Reply via email to