Add -std=gnu++11 and update pkgver() finction

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 111ac9d5b00d..86bfc1a5adbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vapoursynth-plugin-removedirtvs-git
 	pkgdesc = Plugin for Vapoursynth: removedirtvs (GIT version)
-	pkgver = 20131120.ddc78e5
+	pkgver = r78.ddc78e5
 	pkgrel = 1
 	url = http://forum.doom9.org/showthread.php?t=169771
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index a3e501399743..9eb9fc3044b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 
 _plug=removedirtvs
 pkgname=vapoursynth-plugin-${_plug}-git
-pkgver=20131120.ddc78e5
+pkgver=r78.ddc78e5
 pkgrel=1
 pkgdesc="Plugin for Vapoursynth: ${_plug} (GIT version)"
 arch=('i686' 'x86_64')
-url="http://forum.doom9.org/showthread.php?t=169771"
+url='http://forum.doom9.org/showthread.php?t=169771'
 license=('GPL')
 depends=('vapoursynth')
 makedepends=('git')
@@ -16,26 +16,27 @@ source=("git+https://github.com/handaimaoh/${_plug}.git"
         'removedirtvs.py')
 sha1sums=('SKIP'
           'bf3826d8944b135c0f32fbfc5e21de35718a2c33')
+
 _sites_packages="$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")"
 
 pkgver() {
   cd "${_plug}"
-  echo "$(git log -1 --format="%cd" --date=short | tr -d '-').$(git log -1 --format="%h")"
+  #echo "$(git describe --long --tags)"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd "${_plug}"
-  rm VapourSynth.h VSHelper.h
+  rm -fr "${_plug}/"{VapourSynth,VSHelper}.h
+
   echo "all:
-	  g++ -shared ${CXXFLAGS} -fPIC -fpermissive -DVS_TARGET_CPU_X86=1 -I. -o lib${_plug}.so *.cpp $(pkg-config --cflags vapoursynth)" > Makefile
+	  g++ -o lib${_plug}.so -std=gnu++11 ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} $(pkg-config --cflags vapoursynth) ${_plug}/*.cpp -fPIC -shared -fpermissive -DVS_TARGET_CPU_X86=1" > Makefile
 }
 
 build() {
-  cd "${_plug}"
   make
 }
 
-package(){
-  install -Dm755 "${_plug}/lib${_plug}.so" "${pkgdir}/usr/lib/vapoursynth/lib${_plug}.so"
+package() {
+  install -Dm755 "lib${_plug}.so" "${pkgdir}/usr/lib/vapoursynth/lib${_plug}.so"
   install -Dm644 removedirtvs.py "${pkgdir}${_sites_packages}/removedirtvs.py"
 }