1.3.0-rc1, added signature verification back, added jack support

2 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ce3db24ae93..855a4477c10f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mumble-snapshot
 	pkgdesc = A high quality voice chat program.
-	pkgver = 1.3.0_2942_g755c290
+	pkgver = 1.3.0_rc1
 	pkgrel = 1
 	url = https://www.mumble.info/
 	arch = i686
@@ -18,13 +18,15 @@ pkgbase = mumble-snapshot
 	depends = hicolor-icon-theme
 	depends = libspeechd
 	depends = libpulse
+	depends = jack
 	optdepends = espeak: speech synthesizer
 	provides = mumble
 	conflicts = mumble
-	source = https://dl.mumble.info/mumble-1.3.0~2942~g755c290~snapshot.tar.gz
-	source = https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch
-	sha256sums = 209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2
-	sha256sums = af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3
+	source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz
+	source = https://dl.mumble.info/mumble-1.3.0-rc1.tar.gz.sig
+	validpgpkeys = 56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B
+	sha256sums = 6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59
+	sha256sums = SKIP
 
 pkgname = mumble-snapshot
 
diff --git a/PKGBUILD b/PKGBUILD
index e4fbc8d70e0a..cb7f812fb2b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,36 @@
 # Contributor: synapse84 <synapse84 at gmail dot com>
 
 pkgname=mumble-snapshot
-pkgver=1.3.0_2942_g755c290
+pkgver=1.3.0_rc1
+_dirname=1.3.0
 pkgrel=1
 pkgdesc="A high quality voice chat program."
 arch=('i686' 'x86_64')
 url="https://www.mumble.info/"
 license=('BSD')
-depends=('qt5-svg' 'opus' 'speex' 'protobuf' 'hicolor-icon-theme' 'libspeechd' 'libpulse')
+depends=('qt5-svg' 'opus' 'speex' 'protobuf' 'hicolor-icon-theme' 'libspeechd' 'libpulse' 'jack')
 makedepends=('boost' 'qt5-tools' 'python' 'libsndfile' 'speech-dispatcher')
 optdepends=('espeak: speech synthesizer')
 provides=('mumble')
 conflicts=('mumble')
-source=("https://dl.mumble.info/mumble-${pkgver//_/\~}~snapshot.tar.gz"
-        "https://github.com/mumble-voip/mumble/commit/ce0ecff200dd6e57a13c67b189406318595b52fb.patch")
-# Disable signature verification for now, since public key is not available
-#validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E')
-sha256sums=('209cc0680fcf90adc8d374a0f73a932c3a3dfa71611d2a78a3036121e67f78a2'
-            'af078c71af9a2892254c7104b1f6a73d98b2df03927b74c08f64f6f6d6826cc3')
-
-prepare() {
-    cd $srcdir/mumble-${pkgver//_/\~}~snapshot
-    patch --forward --strip=1 --input="${srcdir}/ce0ecff200dd6e57a13c67b189406318595b52fb.patch"
-}
+#source=("https://dl.mumble.info/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} # git snapshots
+source=("https://dl.mumble.info/mumble-${pkgver//_/-}.tar.gz"{,.sig}) # release canidate
+validpgpkeys=('56D0B23AE00B1EE9A8BAAC0F5B8CF87BB893449B')
+sha256sums=('6f447745e164cc9ddef33f85ba0a3fc52d235eae3bfca588f387c699fe9eca59'
+            'SKIP')
 
 build() {
-    cd $srcdir/mumble-${pkgver//_/\~}~snapshot
+    cd $srcdir/mumble-${_dirname}
 
     qmake-qt5 main.pro \
-      CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-g15 no-xevie no-server no-embed-qt-translations no-update" \
+      CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-g15 no-server no-embed-qt-translations no-update" \
       DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
 
     make release
 }
 
 package() {
-    cd $srcdir/mumble-${pkgver//_/\~}~snapshot
+    cd $srcdir/mumble-${_dirname}
 
     # binaries
     install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble