Updated to version 1.3.4

2 files changed, 33 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cafeca4fb97c..562d86dd4acf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python2-vmaf
 	pkgdesc = Perceptual video quality assessment algorithm based on multi-method fusion (python2 implementation)
-	pkgver = 1.3.1
+	pkgver = 1.3.4
 	pkgrel = 1
 	url = https://github.com/netflix/vmaf/
 	arch = any
@@ -16,8 +16,10 @@ pkgbase = python2-vmaf
 	depends = python2-h5py
 	depends = libsvm
 	conflicts = python2-vmaf-git
-	source = vmaf-1.3.1.tar.gz::https://github.com/Netflix/vmaf/archive/v1.3.1.tar.gz
-	sha256sums = c0c84f0f02cff6ac23b3bcc07199532ccbf04a18d8802385b35b89d26bb07287
+	source = vmaf-1.3.4.tar.gz::https://github.com/Netflix/vmaf/archive/v1.3.4.tar.gz
+	source = vmaf-submodule-sureal::git+https://github.com/Netflix/sureal.git#commit=392bb9b49441e60162e48f656648cdf601ded5f9
+	sha256sums = 9530d341df8df4104c9d8bd656335a8d79ff61c19e77bb720deb359a40ac26f7
+	sha256sums = SKIP
 
 pkgname = python2-vmaf
 
diff --git a/PKGBUILD b/PKGBUILD
index fa181ddbca7d..78994cafb7b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
-pkgname=python2-vmaf
 _srcname=vmaf
-pkgver=1.3.1
+_sureal_commit='392bb9b49441e60162e48f656648cdf601ded5f9'
+
+pkgname=python2-vmaf
+pkgver=1.3.4
 pkgrel=1
 pkgdesc='Perceptual video quality assessment algorithm based on multi-method fusion (python2 implementation)'
 arch=('any')
@@ -17,8 +19,17 @@ depends=(
 )
 makedepends=('python2' 'python2-setuptools')
 conflicts=('python2-vmaf-git')
-source=("${_srcname}-${pkgver}.tar.gz"::"https://github.com/Netflix/${_srcname}/archive/v${pkgver}.tar.gz")
-sha256sums=('c0c84f0f02cff6ac23b3bcc07199532ccbf04a18d8802385b35b89d26bb07287')
+source=("${_srcname}-${pkgver}.tar.gz"::"https://github.com/Netflix/${_srcname}/archive/v${pkgver}.tar.gz"
+        'vmaf-submodule-sureal'::"git+https://github.com/Netflix/sureal.git#commit=${_sureal_commit}")
+sha256sums=('9530d341df8df4104c9d8bd656335a8d79ff61c19e77bb720deb359a40ac26f7'
+            'SKIP')
+
+prepare() {
+    cd "${_srcname}-${pkgver}"
+    
+    rm -rf sureal
+    ln -sf "${srcdir}/vmaf-submodule-sureal" sureal
+}
 
 build() {
     msg2 'Building for Python2...'
@@ -34,23 +45,25 @@ package() {
     
     python2 setup.py install --root="$pkgdir" --optimize='1'
     
-    # vmaf python2 executables and additional modules
+    # vmaf python2 executables
     cd script
-    for _script in *
+    executables=($(find . -type f -executable))
+    for _script in ${executables[@]}
     do
-        _filemode="$(stat -c %a "$_script")"
-        
-        if [ "$_filemode" = '644' ] 
-        then
-            install -D -m"$_filemode" "$_script" "${pkgdir}/usr/lib/python2.7/site-packages/${_srcname}/${_script}"
-        else
-            install -D -m"$_filemode" "$_script" "${pkgdir}/usr/bin/${_script}"
-        fi
+        install -D -m755 "$_script" "${pkgdir}/usr/bin/${_script}"
     done
     
+    # sureal python2 executable
+    cd "${srcdir}/${_srcname}-${pkgver}/sureal/python/script"
+    install -D -m755 run_subj.py "${pkgdir}/usr/bin/run_subj.py"
+    
+    # sureal python2 modules
+    cd "${srcdir}/${_srcname}-${pkgver}/sureal/python/src"
+    cp -a sureal "${pkgdir}/usr/lib/python2.7/site-packages"
+    
     # fix shebang on python2 scripts
     for _script in "$pkgdir"/usr/bin/*
     do
-        sed -i '1s/python/python2/' "$_script"
+        sed -i '1s/python$/python2/' "$_script"
     done
 }