Upgrade to 0.126.0

PKGBUILD:
Upgrade to 0.126.0 and consolidate with aur/jack.

.gitignore:
Add .sig files.

3 files changed, 51 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec90e186354c..2270f469b65d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,36 @@
 pkgbase = lib32-jack
 	pkgdesc = A low-latency audio server (32-bit)
-	pkgver = 0.125.0
-	pkgrel = 4
+	pkgver = 0.126.0
+	pkgrel = 1
 	url = http://jackaudio.org/
 	arch = x86_64
 	license = GPL
 	license = LGPL
-	makedepends = gcc-multilib
 	makedepends = git
 	makedepends = lib32-libsamplerate
 	makedepends = lib32-readline
-	depends = jack
+	depends = jack=0.126.0
+	depends = lib32-alsa-lib
 	depends = lib32-db
+	depends = lib32-celt
+	depends = lib32-gcc-libs
 	depends = lib32-glibc
-	provides = lib32-jack2
 	provides = libjack.so
+	provides = libjackserver.so
 	conflicts = lib32-jack2
-	replaces = lib32-jack2
-	source = lib32-jack-0.125.0::git+https://github.com/jackaudio/jack1.git#tag=0.125.0
-	source = git+https://github.com/jackaudio/example-clients
+	source = jack::git+https://github.com/jackaudio/jack1.git#tag=0.126.0?signed
 	source = git+https://github.com/jackaudio/headers
-	source = git+https://github.com/jackaudio/tools
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	validpgpkeys = 62B11043D2F6EB6672D93103CDBAA37ABC74FBA0
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = lib32-jack
+	depends = jack=0.126.0
+	depends = lib32-alsa-lib
+	depends = lib32-db
+	depends = lib32-celt
+	depends = lib32-gcc-libs
+	depends = lib32-glibc
+	depends = libasound.so
+	depends = libcelt0.so
+	depends = libsamplerate.so
diff --git a/.gitignore b/.gitignore
index 94d0d3df213e..14fcd722ad17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 */
-*.zst
 *.log
+*.sig
+*.zst
diff --git a/PKGBUILD b/PKGBUILD
index 2458a0030929..7d0f65047604 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,50 +3,53 @@
 # Contributor: Ray Rashif <schivmeister@gmail.com>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
+_name=jack
 pkgname=lib32-jack
-pkgver=0.125.0
-pkgrel=4
+pkgver=0.126.0
+pkgrel=1
 pkgdesc="A low-latency audio server (32-bit)"
-arch=('x86_64')
+arch=(x86_64)
 url="http://jackaudio.org/"
-license=('GPL' 'LGPL')
-depends=('jack' 'lib32-db' 'lib32-glibc')
-makedepends=('gcc-multilib' 'git' 'lib32-libsamplerate' 'lib32-readline')
-conflicts=('lib32-jack2')
-provides=('lib32-jack2' 'libjack.so')
-replaces=('lib32-jack2')
-source=("${pkgname}-${pkgver}::git+https://github.com/jackaudio/${pkgname#lib32-}1.git#tag=${pkgver}"
-        "git+https://github.com/jackaudio/example-clients"
-        "git+https://github.com/jackaudio/headers"
-        "git+https://github.com/jackaudio/tools")
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+license=(GPL LGPL)
+depends=(jack=$pkgver lib32-alsa-lib lib32-db lib32-celt lib32-gcc-libs lib32-glibc)
+makedepends=(git lib32-libsamplerate lib32-readline)
+conflicts=(lib32-jack2)
+provides=(libjack.so libjackserver.so)
+source=(
+  $_name::git+https://github.com/jackaudio/${_name}1.git#tag=$pkgver?signed
+  git+https://github.com/jackaudio/headers
+)
+sha512sums=('SKIP'
+            'SKIP')
+validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx@falktx.com>
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
+  cd $_name
   git submodule init
-  git config submodule.example-clients.url "${srcdir}/example-clients"
   git config submodule.jack.url "${srcdir}/headers"
-  git config submodule.tools.url "${srcdir}/tools"
   git submodule update
-  autoreconf -vfi
+
+  autoreconf -fiv
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd $_name
+
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
   ./configure --prefix=/usr --libdir=/usr/lib32
-  make -C libjack
+  # prevent excessive overlinking due to libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C libjack DESTDIR="${pkgdir}" install
+  depends+=(libasound.so libcelt0.so libsamplerate.so)
+  make DESTDIR="$pkgdir" install-pkgconfigDATA -C $_name
+  make DESTDIR="$pkgdir" install -C $_name
+  rm -frv "$pkgdir/usr/"{bin,include,share}
 }
 
 # vim:set ts=2 sw=2 et: