updpkgver

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7981fb2dbeab..5f1c1197fb0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = qtav-git
 	pkgdesc = A cross-platform multimedia playback framework based on Qt and FFmpeg
-	pkgver = v1.12.0.r149.g263f1b15
+	pkgver = v1.13.0.r10.gb12a99e9
 	pkgrel = 1
 	url = http://www.qtav.org/
 	arch = x86_64
 	license = LGPL
 	makedepends = git
+	makedepends = cmake
+	makedepends = make
 	depends = qt5-declarative
 	depends = ffmpeg
 	depends = libxv
diff --git a/PKGBUILD b/PKGBUILD
index bd55329078e0..3e8c25ca40c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Maintainer: Solomon Choina <shlomochoina@gmail.com>
 pkgname=qtav-git
-pkgver=v1.12.0.r149.g263f1b15
+pkgver=v1.13.0.r10.gb12a99e9
 pkgrel=1
 pkgdesc="A cross-platform multimedia playback framework based on Qt and FFmpeg"
 arch=('x86_64')
@@ -12,28 +12,33 @@ conflicts=('qtav')
 provides=('qtav')
 depends=('qt5-declarative' 'ffmpeg' 'libxv' 'openal' 'uchardet' 'desktop-file-utils'
          'qt5-quickcontrols' 'qt5-svg')
-makedepends=('git')
+makedepends=('git' 'cmake' 'make')
 source=("git+https://github.com/wang-bin/QtAV.git")
 sha512sums=('SKIP')
 
 pkgver(){
   cd "QtAV"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  ( set -o pipefail
+    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() {
+  mkdir build
   cd $srcdir/QtAV
   git submodule update --init --recursive
 }
 build() {
-  cd $srcdir/QtAV
-
-  qmake-qt5 "CONFIG+=no_rpath recheck"
+  cd build
+   cmake ../QtAV \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd $srcdir/QtAV
+  cd build
 
-  make INSTALL_ROOT="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 }