Update to Carla Git bridges

2 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1091c4bc8025..14101a88dbf1 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = carla-bridges-win32
-	pkgdesc = Carla Windows VST 32-Bit Bridge (Stable)
-	pkgver = 2.5.8
+	pkgdesc = Carla Win32 Bridge
+	pkgver = 6939.66afe24a0
 	pkgrel = 1
 	url = http://kxstudio.sf.net/carla
+	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = gcc-multilib
 	makedepends = git
+	makedepends = gcc-multilib
+	makedepends = mingw-w64-crt
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
 	makedepends = mingw-w64-winpthreads
@@ -14,9 +16,7 @@ pkgbase = carla-bridges-win32
 	depends = carla
 	provides = carla-bridges-win32
 	conflicts = carla-bridges-win32
-	conflicts = carla-bridges-win
-	source = https://github.com/falkTX/Carla/archive/refs/tags/v2.5.8.tar.gz
-	sha512sums = 0f87ebe053d29a4a455532cc90e66ca7978f0f3678d0814bd5fb3343e852e2a28d0f5e170e67a71bf64fec1c9bd696dd7aa01627b02edd23cfe4994dc357b857
-	b2sums = 26adbf24abecab04810b82d550b7f598747c80a29c0a9d66e9799cee94aba2c384852e2aa31dee0ef949697c089c379575f9c1919646a8513313429d6c391c50
+	source = carla-bridges-win32::git+https://github.com/falkTX/Carla.git
+	md5sums = SKIP
 
 pkgname = carla-bridges-win32
diff --git a/PKGBUILD b/PKGBUILD
index c594e9d8abd8..7012964b2167 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,16 @@
 pkgname=carla-bridges-win32
-pkgver=2.5.8
+pkgver=6939.66afe24a0
 pkgrel=1
-pkgdesc="Carla Windows VST 32-Bit Bridge (Stable)"
-arch=('x86_64')
+pkgdesc="Carla Win32 Bridge"
+arch=('i686' 'x86_64')
 url="http://kxstudio.sf.net/carla"
 license=('GPL2')
-conflicts=('carla-bridges-win32' 'carla-bridges-win')
+conflicts=('carla-bridges-win32')
 provides=('carla-bridges-win32')
 depends=('wine' 'carla')
-makedepends=('gcc-multilib' 'git' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-winpthreads')
-source=("https://github.com/falkTX/Carla/archive/refs/tags/v${pkgver}.tar.gz")
-sha512sums=('0f87ebe053d29a4a455532cc90e66ca7978f0f3678d0814bd5fb3343e852e2a28d0f5e170e67a71bf64fec1c9bd696dd7aa01627b02edd23cfe4994dc357b857')
-b2sums=('26adbf24abecab04810b82d550b7f598747c80a29c0a9d66e9799cee94aba2c384852e2aa31dee0ef949697c089c379575f9c1919646a8513313429d6c391c50')
+makedepends=('git' 'gcc-multilib' 'mingw-w64-crt' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-winpthreads')
+source=("$pkgname"::'git+https://github.com/falkTX/Carla.git')
+md5sums=('SKIP')
 
   _path=$PATH
   _cflags=$CFLAGS
@@ -23,8 +22,13 @@ b2sums=('26adbf24abecab04810b82d550b7f598747c80a29c0a9d66e9799cee94aba2c384852e2
   _pkg_config_path=$PKG_CONFIG_PATH
   _win32=$WIN32
 
+pkgver() {
+  cd "$srcdir/$pkgname"
+  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 build() {
-  cd "$srcdir/Carla-${pkgver}"
+  cd "$srcdir/$pkgname"
   export PATH=/usr/i686-w64-mingw32/bin:$PATH
   export AR=i686-w64-mingw32-ar
   export CC=i686-w64-mingw32-gcc
@@ -35,7 +39,7 @@ build() {
   unset CXXFLAGS
   unset LDFLAGS
   export LDFLAGS="-static"
-  make -j$(proc) win32 HAVE_LIBLO=false
+  make -j$(nproc) win32 HAVE_LIBLO=false
   export PATH=$_path
   export AR=$_ar
   export CC=gcc 
@@ -46,11 +50,11 @@ build() {
   export LDFLAGS=$_ldflags
   export WIN32=$_win32
   export JACKBRIDGE_FLAGS="-D__WIDL_objidl_generated_name_0000000C="
-  make -j$(proc) wine32 TESTBUILD=false
+  make -j$(nproc) wine32 TESTBUILD=false
 }
 
 package() {
-  cd "$srcdir/Carla-${pkgver}"
+  cd "$srcdir/$pkgname"
   mkdir -p "$pkgdir/usr/lib/carla"
   cp bin/*.exe "$pkgdir/usr/lib/carla/"
   cp bin/*.dll "$pkgdir/usr/lib/carla/"