Update to 2.5.4

Added:
- .gitignore
- proaudio group
- missing depends and makedepends packages

Changed:
- Based and depending on official package, using Git for tag commit signing
- Indentation to 2 spaces (as official package)
- Capitalized Windows OS name

Removed:
- win32/64 conflicts and provides: see PKGBUILD manual example

3 files changed, 99 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69edab275595..4b7ede9c5e2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 pkgbase = carla-bridges-win
-	pkgdesc = Carla windows bridges
-	pkgver = 2.2.0
+	pkgdesc = Carla Windows bridges
+	pkgver = 2.5.4
 	pkgrel = 1
 	url = https://kx.studio/Applications:Carla
 	arch = i686
 	arch = x86_64
+	groups = proaudio
 	license = GPL2
+	makedepends = git
+	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-pkg-config
+	depends = carla
+	depends = mingw-w64-crt
+	depends = mingw-w64-winpthreads
 	depends = wine
-	depends = carla-git
-	provides = carla-bridges-win
-	conflicts = carla-bridges-win32
-	conflicts = carla-bridges-win64
-	source = carla-bridges-win-2.2.0-source::https://github.com/falkTX/Carla/releases/download/v2.2.0/Carla_2.2.0-linux64.tar.xz
-	sha256sums = f04f8355f7c9f90c668873180c366737cf4214ad77cc1dde4549e5623c726c97
+	source = carla-bridges-win-2.5.4::git+https://github.com/falkTX/Carla#tag=4a6dc504be5d547a97079bf3400a85f9080177db?signed
+	validpgpkeys = 62B11043D2F6EB6672D93103CDBAA37ABC74FBA0
+	sha512sums = SKIP
+	b2sums = SKIP
 
 pkgname = carla-bridges-win
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..43caa657d641
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg
+/src
+carla-bridges-win*
+*.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 9f64b32da00e..a236acaa9788 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,93 @@
 # Maintainer: Joermungand <joermungand at gmail dot com>
+# Maintainer: redtide <redtid3 at gmail dot com>
+
+_commit=4a6dc504be5d547a97079bf3400a85f9080177db  # refs/tags/v2.5.4
 pkgname=carla-bridges-win
-pkgver=2.2.0
+pkgver=2.5.4
 pkgrel=1
-pkgdesc="Carla windows bridges"
-arch=('i686' 'x86_64')
+pkgdesc="Carla Windows bridges"
+arch=(i686 x86_64)
 url="https://kx.studio/Applications:Carla"
-license=('GPL2')
-conflicts=('carla-bridges-win32' 'carla-bridges-win64')
-provides=('carla-bridges-win')
-depends=('wine' 'carla-git')
-if [[ $CARCH == 'i686' ]]; then
-   source+=("${pkgname}-${pkgver}-source::https://github.com/falkTX/Carla/releases/download/v2.2.0/Carla_2.2.0-linux32.tar.xz")
-   sha256sums+=('2d552221afe0a44216ad10f010c8edf8ad98249b25737637df64ec0175fd1018')
-elif [[ $CARCH == 'x86_64' ]]; then
-   source+=("${pkgname}-${pkgver}-source::https://github.com/falkTX/Carla/releases/download/v2.2.0/Carla_2.2.0-linux64.tar.xz")
-   sha256sums+=('f04f8355f7c9f90c668873180c366737cf4214ad77cc1dde4549e5623c726c97')
-fi
+license=(GPL2)
+groups=(proaudio)
+depends=(
+  carla
+  mingw-w64-crt
+  mingw-w64-winpthreads
+  wine
+)
+makedepends=(
+  git
+  mingw-w64-gcc
+  mingw-w64-pkg-config
+)
+# see https://github.com/archlinux/svntogit-community/blob/packages/carla/trunk/PKGBUILD
+source=($pkgname-$pkgver::git+https://github.com/falkTX/Carla#tag=$_commit?signed)
+sha512sums=('SKIP')
+b2sums=('SKIP')
+validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx@falktx.com>
+
+_path=$PATH
+_cflags=$CFLAGS
+_cxxflags=$CXXFLAGS
+_ldflags=$LDFLAGS
+_ar=$AR
+_cc=$CC
+_cxx=$CXX
+_pkg_config_path=$PKG_CONFIG_PATH
+_win32=$WIN32
+_win64=$WIN64
 
 prepare() {
-cd "$srcdir"
-  mv Carla* "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  # fix issues with python-pyqt5
+  git cherry-pick -n 4151e160f1e9e03412c112fec54b5f1cde4c45de
+}
+
+build() {
+  cd $pkgname-$pkgver
+  for _arch in i686-w64-mingw32 x86_64-w64-mingw32; do
+    if [[ $CARCH == i686 && $_arch == i686-w64-mingw32 ]]; then continue; fi
+    if [[ $_arch == i686-w64-mingw32 ]]; then _bits=32; else _bits=64; fi
+    export AR=$_arch-ar
+    export CC=$_arch-gcc
+    export CXX=$_arch-g++
+    export LDFLAGS=-static
+    export PATH=/usr/$_arch/bin:$PATH
+    export PKG_CONFIG_PATH=/usr/$_arch/lib/pkgconfig
+    export WIN32=true
+    if [[ $_bits == 64 ]]; then export WIN64=true; fi
+    unset CFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    make win$_bits HAVE_LIBLO=false
+
+    export PATH=$_path
+    export AR=$_ar
+    export CC=gcc
+    export CXX=$_cxx
+    export PKG_CONFIG_PATH=$_pkg_config_path
+    export CFLAGS=$_cflags
+    export CXXFLAGS=$_cxxflags
+    export LDFLAGS=$_ldflags
+    export WIN32=$_win32
+    export WIN64=$_win64
+    export JACKBRIDGE_FLAGS="-D__WIDL_objidl_generated_name_0000000C="
+    make wine$_bits
+  done
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/carla.lv2"
+  cd $pkgname-$pkgver
   mkdir -p "$pkgdir/usr/lib/carla"
-  cp *.exe "$pkgdir/usr/lib/carla/"
-  cp *.dll "$pkgdir/usr/lib/carla/"
+  mkdir -p "$pkgdir/usr/lib/lv2/carla.lv2"
+  mkdir -p "$pkgdir/usr/lib/vst/carla.vst"
+  cp bin/*.exe "$pkgdir/usr/lib/carla/"
+  cp bin/*.dll "$pkgdir/usr/lib/carla/"
+  cd "$pkgdir/usr/lib/carla"
+  ln -sr *.exe ../lv2/carla.lv2/
+  ln -sr *.exe ../vst/carla.vst/
+  ln -sr *.dll ../lv2/carla.lv2/
+  ln -sr *.dll ../vst/carla.vst/
 }
-
+# vim:set ts=2 sw=2 et: