Fixes

2 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbd868f31a03..9f73105b5e0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mpv-full-git
 	pkgdesc = A free, open source, and cross-platform media player (git version with all possible libs)
-	pkgver = 0.28.2.r566.g1b19ba6c57
+	pkgver = 0.29.1.r77.gba2dee38fb
 	pkgrel = 1
 	url = http://mpv.io/
 	arch = i686
@@ -47,8 +47,8 @@ pkgbase = mpv-full-git
 	optdepends = youtube-dl: for video-sharing websites playback
 	optdepends = nvidia-utils: for hardware accelerated video decoding with CUDA
 	provides = mpv
+	provides = mpv-git
 	conflicts = mpv
-	conflicts = mpv-git
 	options = !emptydirs
 	source = mpv-full-git::git+https://github.com/mpv-player/mpv.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 921887fb37f1..fbe165b261a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
 pkgname=mpv-full-git
-pkgver=0.28.2.r566.g1b19ba6c57
+pkgver=0.29.1.r77.gba2dee38fb
 pkgrel=1
 pkgdesc='A free, open source, and cross-platform media player (git version with all possible libs)'
 arch=('i686' 'x86_64')
@@ -18,26 +18,26 @@ depends=(
     # AUR:
         'mujs' 'rsound' 'shaderc-git' 'crossc'
 )
+makedepends=('git' 'mesa' 'python-docutils' 'ladspa' 'vulkan-headers'
+             'wayland-protocols' 'ffnvcodec-headers')
 optdepends=('youtube-dl: for video-sharing websites playback'
             'nvidia-utils: for hardware accelerated video decoding with CUDA')
-makedepends=(
-    # official repositories:
-        'git' 'mesa' 'python-docutils' 'ladspa' 'vulkan-headers'
-        'wayland-protocols'
-    # AUR:
-        'ffnvcodec-headers'
-)
-provides=('mpv')
-conflicts=('mpv' 'mpv-git')
+provides=('mpv' 'mpv-git')
+conflicts=('mpv')
 options=('!emptydirs')
 source=("$pkgname"::'git+https://github.com/mpv-player/mpv.git')
 sha256sums=('SKIP')
 
 pkgver() {
     cd "$pkgname"
-    local _version="$(git tag | sort -Vr | head -n1 | sed 's/^v//')"
-    local _revision="$(git rev-list v"${_version}"..HEAD --count)"
-    local _shorthash="$(git rev-parse --short HEAD)"
+    
+    local _version
+    local _revision
+    local _shorthash
+    
+    _version="$(git tag | sort -Vr | head -n1 | sed 's/^v//')"
+    _revision="$(git rev-list v"${_version}"..HEAD --count)"
+    _shorthash="$(git rev-parse --short HEAD)"
     
     printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
 }
@@ -45,7 +45,6 @@ pkgver() {
 build() {
     cd "$pkgname"
     
-    msg2 'Running bootstrap. Please wait...'
     ./bootstrap.py
     
     ./waf configure \
@@ -70,6 +69,7 @@ build() {
         --disable-clang-database \
         \
         --disable-android \
+        --disable-swift \
         --disable-uwp \
         --disable-win32-internal-pthreads \
         --enable-iconv \
@@ -160,12 +160,14 @@ build() {
         --disable-apple-remote \
         --disable-macos-touchbar \
         --disable-macos-cocoa-cb
-    
+        
     ./waf build
 }
 
 package() {
     cd "$pkgname"
+    
     ./waf install --destdir="$pkgdir"
+    
     install -m644 DOCS/{encoding.rst,tech-overview.txt} "${pkgdir}/usr/share/doc/mpv"
 }