Resolve issues where incorrect version info could be displayed.

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d0e1e739f22..6731c1c583a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vsxu-git
 	pkgdesc = A free to use program that lets you create and perform real-time audio visual presets.
-	pkgver = 0.4.0.1.r238.gbcc7e75
-	pkgrel = 3
+	pkgver = v0.5.1.r1.gbcc7e75
+	pkgrel = 1
 	url = http://www.vsxu.com/
 	install = vsxu-git.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 6394cf193fef..f5d0f0061c9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=vsxu-git
-pkgver=0.4.0.1.r238.gbcc7e75
-pkgrel=3
+pkgver=v0.5.1.r1.gbcc7e75
+pkgrel=1
 pkgdesc="A free to use program that lets you create and perform real-time audio visual presets."
 arch=('i686' 'x86_64')
 url="http://www.vsxu.com/"
@@ -11,22 +11,23 @@ license=('GPL' 'custom')
 depends=('pulseaudio' 'glew' 'glfw' 'glfw2' 'opencv' 'libpng12' 'desktop-file-utils' 'xdg-utils')
 makedepends=('git' 'cmake')
 optdepends=( 'jack: alternate audio source')
-provides=('vsxu')
-conflicts=('vsxu')
+provides=("${pkgname%-*}")
+conflicts=("${pkgname%-*}")
 install=${pkgname}.install
 source=("${pkgname}::git+https://github.com/vovoid/vsxu.git")
 sha512sums=('SKIP')
+_branch=master
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
+  git checkout ${_branch} --quiet
   ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   )
 }
 
 prepare() {
-  _branch=master
   cd "${srcdir}/${pkgname}"
   git checkout ${_branch}
 }
@@ -38,7 +39,6 @@ build() {
               -DGLFW_LIBRARY=/usr/lib/libglfw2.so \
               -DPNG_LIBRARY=/usr/lib/libpng12.so \
               -DPNG_PNG_INCLUDE_DIR=/usr/include/libpng12
-
   make
 }