digikam-git: use standardised pkgver(); bump epoch

2 files changed, 35 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5e854fa12f2..61f4bbb21463 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = digikam-git
 	pkgdesc = An advanced digital photo management application
-	pkgver = 8.0.0.r3363.9223eb7bec
+	pkgver = 8.1.0.r46.a12baf6dcb
 	pkgrel = 1
+	epoch = 1
 	url = https://www.digikam.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 68bea908538e..f3eb188df49c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,43 @@
 
 _pkgname=digikam
 pkgname="$_pkgname-git"
-pkgver=8.0.0.r3363.9223eb7bec
+pkgver=8.1.0.r46.a12baf6dcb
 pkgrel=1
+epoch=1
 pkgdesc='An advanced digital photo management application'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='https://www.digikam.org/'
-depends=('akonadi-contacts' 'exiv2' 'glu' 'imagemagick' 'jasper' 'kcalendarcore'
-         'kfilemetadata' 'kio' 'knotifyconfig' 'lensfun' 'libass' 'libgphoto2'
-         'libksane' 'marble-common' 'opencv' 'perl-image-exiftool'
-         'qt5-networkauth' 'qt5-webengine' 'qt5-xmlpatterns' 'threadweaver')
-makedepends=('boost' 'doxygen' 'eigen' 'extra-cmake-modules' 'git' 'kdoctools')
+depends=(
+	akonadi-contacts
+	exiv2
+	glu
+	imagemagick
+	jasper
+	kcalendarcore
+	kfilemetadata
+	kio
+	knotifyconfig
+	lensfun
+	libass
+	libgphoto2
+	libksane
+	marble-common
+	opencv
+	perl-image-exiftool
+	qt5-networkauth
+	qt5-webengine
+	qt5-xmlpatterns
+	threadweaver
+)
+makedepends=(
+	boost
+	doxygen
+	eigen
+	extra-cmake-modules
+	git
+	kdoctools
+)
 optdepends=('darktable: RAW import'
             'hugin: panorama tool'
             'perl: for digitaglinktree'
@@ -26,21 +52,7 @@ source=("git+https://invent.kde.org/graphics/$_pkgname.git")
 sha256sums=('SKIP')
 
 pkgver() {
-	cd $_pkgname
-	printf "%s.%s" $(git blame -s -L/DIGIKAM_MAJOR_VERSION/,+3 CMakeLists.txt | awk 'BEGIN { ORS = "."; }
-	{
-		gsub("[\")]", "");
-		"git rev-list --count "$1"..HEAD" | getline x;
-		if (NR==1 || min>x) {
-			min = x;
-			min_hash = $1;
-		}
-		print $4;
-	}
-	END {
-		ORS="";
-		print "r"min;
-	}') $(git rev-parse --short HEAD)
+	git -C $_pkgname describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
 build() {