Update to 2.2.0.r38.g2945e2da

2 files changed, 15 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ac841b7c9ef..5bce4381173f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 17 01:38:23 UTC 2016
+# Sat Oct 28 17:44:13 UTC 2017
 pkgbase = cantata-git
 	pkgdesc = Qt5 graphical client for Music Player Daemon (MPD) - git version.
-	pkgver = 2.0.50.r6188.165fc53
+	pkgver = 2.2.0.r38.g2945e2da
 	pkgrel = 1
 	url = https://github.com/cdrummond/cantata
 	arch = i686
@@ -11,27 +11,21 @@ pkgbase = cantata-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = qt5-tools
-	makedepends = qt5-svg
-	depends = qt5-multimedia
+	makedepends = ffmpeg
 	depends = qt5-svg
+	depends = qt5-multimedia
 	depends = libmtp
-	depends = libcddb
 	depends = libmusicbrainz5
 	depends = mpg123
 	depends = taglib-extras
-	depends = hicolor-icon-theme
-	depends = cdparanoia
-	depends = speex
 	depends = media-player-info
+	depends = libcdio-paranoia
 	depends = udisks2
 	optdepends = perl-uri: dynamic playlist
 	optdepends = mpd: playback
 	optdepends = ffmpeg: ReplayGain support
 	provides = cantata
 	conflicts = cantata
-	conflicts = cantata-kde
-	conflicts = cantata-kde-svn
-	conflicts = cantata-kde-svn
 	source = cantata-git::git+https://github.com/CDrummond/cantata.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 19d179c1a5b5..bab5f22fd498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,28 @@
+# Maintainer: goetzc
 pkgname=cantata-git
-pkgver=2.0.50.r6188.165fc53
+pkgver=2.2.0.r38.g2945e2da
 pkgrel=1
 pkgdesc="Qt5 graphical client for Music Player Daemon (MPD) - git version."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="https://github.com/cdrummond/cantata"
-license=('GPL3')
-depends=('qt5-multimedia' 'qt5-svg' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123'
-         'taglib-extras' 'hicolor-icon-theme' 'cdparanoia' 'speex' 'media-player-info' 'udisks2')
+license=(GPL3)
+depends=(qt5-svg qt5-multimedia libmtp libmusicbrainz5 mpg123 taglib-extras media-player-info libcdio-paranoia udisks2)
 optdepends=('perl-uri: dynamic playlist'
             'mpd: playback'
             'ffmpeg: ReplayGain support')
-makedepends=('git' 'cmake' 'qt5-tools' 'qt5-svg')
-conflicts=('cantata' 'cantata-kde' 'cantata-kde-svn' 'cantata-kde-svn')
-provides=('cantata')
+makedepends=(git cmake qt5-tools ffmpeg)
+conflicts=(cantata)
+provides=(cantata)
 source=("$pkgname::git+https://github.com/CDrummond/cantata.git")
 sha1sums=('SKIP')
 
 pkgver() {
     cd "${pkgname}"
-
-    _ver="$(cat CMakeLists.txt | grep -m3 -e CPACK_PACKAGE_VERSION_MAJOR -e CPACK_PACKAGE_VERSION_MINOR \
-         -e CPACK_PACKAGE_VERSION_PATCH | grep -o "[[:digit:]]*" | paste -sd'.')"
-    printf "%s.r%s.%s" "$_ver" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    if [[ -d build ]]
-    then
+    if [[ -d build ]]; then
         rm -rf build
     fi
         mkdir build