summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD22
2 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e73fcff0221b..08ed96129484 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Nov 2 16:36:13 UTC 2016
+# Sun Dec 4 03:24:36 UTC 2016
pkgbase = mpv-ahjolinna-git
pkgdesc = Video player based on MPlayer/mplayer2 (git version)
- pkgver = 0.21.0.0.g3f5b41d
+ pkgver = 44200.g796b48b
pkgrel = 1
url = http://mpv.io
arch = x86_64
@@ -60,7 +60,7 @@ pkgbase = mpv-ahjolinna-git
optdepends = inxi: HIDPI-detection
optdepends = svp: SmoothVideo Project
optdepends = libvdpau: hardware-acceleration for NVIDIA users
- provides = mpv
+ provides = mpv=1:0.22.0
conflicts = mpv
conflicts = mpv-vapoursynth
conflicts = mpv-ahjolinna-build-git
diff --git a/PKGBUILD b/PKGBUILD
index 773290ff5e30..bb8dba832c2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=mpv-ahjolinna-git
_gitname=mpv
-pkgver=0.21.0.0.g3f5b41d
+pkgver=44200.g796b48b
pkgrel=1
pkgdesc='Video player based on MPlayer/mplayer2 (git version)'
arch=('x86_64')
@@ -47,7 +47,7 @@ makedepends+=('libva')
optdepends+=('libva: for open source driver users')
fi
-provides=('mpv')
+ provides=('mpv=1:0.22.0')
conflicts=('mpv' 'mpv-vapoursynth' 'mpv-ahjolinna-build-git' 'mpv-build-git' )
options=('!emptydirs')
source=('git+https://github.com/mpv-player/mpv'
@@ -70,12 +70,12 @@ sha256sums=('SKIP'
pkgver() {
cd "$srcdir/$_gitname"
- _curtag="$(git rev-list --tags --max-count=1)"
- _tagver="$(git describe --tags $_curtag | sed -e 's:^v::' -e 's:-:_:g')"
- _commits="$(git rev-list --count HEAD --since=$_tagver)"
- _sha="$(git rev-parse --short HEAD)"
- printf "%s.%s.g%s" $_tagver $_commits $_sha
- #msg "$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+ #_curtag="$(git rev-list --tags --max-count=1)"
+ #_tagver="$(git describe --tags $_curtag | sed -e 's:^v::' -e 's:-:_:g')"
+ #_commits="$(git rev-list --count HEAD --since=$_tagver)"
+ #_sha="$(git rev-parse --short HEAD)"
+ #printf "%s.%s.g%s" $_tagver $_commits $_sha
+ echo "$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
}
prepare() {
@@ -104,7 +104,7 @@ if [[ $_libvdpau = 1 ]] || [ -f /usr/bin/nvidia-settings ] ; then
_hwaccel="--enable-vaapi-hwaccel"
fi
- waf configure \
+ ./waf configure \
--prefix=/usr \
--confdir=/etc/mpv \
--disable-test \
@@ -127,12 +127,12 @@ if [[ $_libvdpau = 1 ]] || [ -f /usr/bin/nvidia-settings ] ; then
--lua=luajit \
--enable-libavdevice \
--enable-vapoursynth
-waf build
+./waf build
}
package() {
cd "$srcdir/$_gitname"
- waf install --destdir="${pkgdir}"
+ ./waf install --destdir="${pkgdir}"
# install the .desktop files