Added pkgver() function plus PKGBUILD fixes

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf74e5a569b5..23b68a615e98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = distrho-vst-git
 	pkgdesc = DISTRHO VST audio plugins ports
 	pkgver = r337.75bbdc9
-	pkgrel = 2
+	pkgrel = 3
 	url = http://distrho.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = distrho-vst-git
 	conflicts = distrho-vst
 	conflicts = distrho-vst-git
 	conflicts = distrho-plugins-vst-git
-	source = distrho-vst-git::git://github.com/DISTRHO/DISTRHO-Ports
+	source = distrho-vst::git://github.com/DISTRHO/DISTRHO-Ports
 	md5sums = SKIP
 
 pkgname = distrho-vst-git
diff --git a/PKGBUILD b/PKGBUILD
index 2c3758e29ae8..48eedbbe669b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=distrho-vst-git
 pkgver=r337.75bbdc9
-pkgrel=2
+pkgrel=3
 pkgdesc="DISTRHO VST audio plugins ports"
 arch=('i686' 'x86_64')
 url="http://distrho.sourceforge.net/"
@@ -12,24 +12,29 @@ depends=('freetype2' 'alsa-lib' 'libxext')
 makedepends=('premake3' 'git' 'libxinerama' 'libxrender' 'libxcursor' 'steinberg-vst36')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}" "distrho-vst-git" "distrho-plugins-vst-git")
-source=("${pkgname}::git://github.com/DISTRHO/DISTRHO-Ports")
+source=("${pkgname%-*}::git://github.com/DISTRHO/DISTRHO-Ports")
 md5sums=('SKIP')
 
+pkgver() {
+  cd "${pkgname%-*}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 prepare() {
-	mkdir -p "$pkgname"/sdks/vstsdk2.4/public.sdk/source
-	ln -rsf /usr/include/vst36/ "$pkgname"/sdks/vstsdk2.4/public.sdk/source/vst2.x
-	ln -rsf /usr/include/vst36/pluginterfaces/ "$pkgname"/sdks/vstsdk2.4/pluginterfaces
+	mkdir -p "${pkgname%-*}"/sdks/vstsdk2.4/public.sdk/source
+	ln -rsf /usr/include/vst36/ "${pkgname%-*}"/sdks/vstsdk2.4/public.sdk/source/vst2.x
+	ln -rsf /usr/include/vst36/pluginterfaces/ "${pkgname%-*}"/sdks/vstsdk2.4/pluginterfaces
 }
 
 build() {
-	cd "$pkgname"
+	cd "${pkgname%-*}"
 	./scripts/premake-update.sh linux
 	make vst
 }
 
 package() {
-	cd "$pkgname"/bin/vst
+	cd "${pkgname%-*}"/bin/vst
 	for i in *; do
-		install -D "$i" ""$pkgdir"/usr/lib/vst/$i"
+		install -D "$i" "$pkgdir/usr/lib/vst/$i"
 	done
 }