Date: Friday, January 27, 2023 @ 20:15:06
  Author: dvzrv
Revision: 1388978

upgpkg: yabridge 5.0.3-1: Upgrade to 5.0.3.

Cherry-pick upstream commits to fix issues with wine version detection.
Cherry-pick upstream commit for newer clap support and remove version pinning.

Modified:
  yabridge/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-27 20:07:46 UTC (rev 1388977)
+++ PKGBUILD    2023-01-27 20:15:06 UTC (rev 1388978)
@@ -2,9 +2,9 @@
 
 pkgbase=yabridge
 pkgname=(yabridge yabridgectl)
-_commit=669b42b31bc40c1135431d8f4f64e7f3fde588d0  # refs/tags/5.0.2
-_vst3sdk_commit=ac1d0ea4b7b8540708d5f78d51bfecb7e75dddd9  # 
refs/tags/v3.7.5_build_44-patched-2
-pkgver=5.0.2
+_commit=0cf208dea87625dac9a04c111b228acd8e249158  # refs/tags/5.0.3
+_vst3sdk_commit=3ff02a8fb91f8e14f61c4e26130841b51d601575  # 
refs/tags/v3.7.7_build_19-patched
+pkgver=5.0.3
 pkgrel=1
 pkgdesc="A modern and transparent way to use Windows VST2 and VST3 plugins on 
Linux"
 arch=(x86_64)
@@ -12,7 +12,6 @@
 license=(GPL3)
 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=(!lto)
 source=(
   git+https://github.com/robbert-vdh/$pkgbase.git#tag=$_commit
@@ -45,8 +44,13 @@
 
   (
     cd $pkgbase
-    # support clap >= 1.1.3
-    git cherry-pick -n 5150332d20a50f6c9082ac6a9ae1873eb7ee5a9f
+    # fix issues with wine version detection
+    git cherry-pick -n 3d0cffea88625020465cb5a4c4cafa2ac632453e
+    git cherry-pick -n 29acd40a9add635e2cb40ecc54c88d65604a7a2a
+    # add support for clap >= 1.1.7
+    git cherry-pick -n d58c20417836b1969736aa0f7788eff516629f90
+    # remove version pinning
+    sed -e "s/'==/'>=/" -i meson.build
   )
   # remove all wraps as they are ignored anyways
   rm -rv $pkgname/subprojects/*
@@ -65,7 +69,7 @@
 
 build() {
   # NOTE: we need to add -mwindows to cpp_link_args as we are otherwise 
overriding it
-  local _options=(
+  local meson_options=(
     --cross-file=$pkgname/cross-wine.conf
     -Dbitbridge=true
     -Dsystem-asio=true
@@ -75,7 +79,7 @@
     -Dcpp_link_args="$LDFLAGS -mwindows"
   )
 
-  arch-meson $pkgbase build "${_options[@]}"
+  arch-meson $pkgbase build "${meson_options[@]}"
   ninja -C build
 
   cd $pkgname/tools/yabridgectl

Reply via email to