Updated to 3.1.1

2 files changed, 20 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b45a88ea8b66..4d8ae01fabe5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ovito
 	pkgdesc = Open Visualization Tool
-	pkgver = 2.9.0
-	pkgrel = 2
+	pkgver = 3.1.1
+	pkgrel = 1
 	url = http://www.ovito.org
 	arch = x86_64
 	license = GPL
@@ -13,11 +13,12 @@ pkgbase = ovito
 	depends = openbabel
 	depends = python
 	depends = netcdf
+	depends = ffmpeg
 	conflicts = ovito-git
-	source = https://gitlab.com/stuko/ovito/-/archive/v2.9.0/ovito-v2.9.0.tar.bz2
-	source = 9.patch
-	sha256sums = 8670a5c4fc0199d80e4cf2e96ef1c595c7988bd59fe48e67caebce1713fb1994
-	sha256sums = 154836944fd3ec19411a12e6e6392268406150c186126ff91493500b5ccb6d71
+	source = https://gitlab.com/stuko/ovito/-/archive/v3.1.1/ovito-v3.1.1.tar.bz2
+	source = qwt.patch::https://gitlab.com/stuko/ovito/-/commit/c659ff9f610cd3c0fc786b0075a8ab3c718895de.diff
+	sha256sums = 9c29590f038b79c2b8dcd7a46f5d18138ac52a696e2e310f3f8831717bce63f9
+	sha256sums = 5cd22fda001601889cd6dc6529ba38736040179e10c1b04a52147aae7e1d84eb
 
 pkgname = ovito
 
diff --git a/PKGBUILD b/PKGBUILD
index 1daca5b4c564..382ee3f30b40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,33 @@
-# Maintainter:  Anton Kudelin <kudelin at protonmail dot com>
+# Maintainer:   Anton Kudelin <kudelin at protonmail dot com>
 # Contributor:  Ross Whitfield <whitfieldre@ornl.gov>
 # Contributor:  Brian Lam <blamm9[at]gmail[dot]com>
 # Contributor:  AG_Caesar <caesar[at]drachenhain[dot]net>
 # Contributor:  Jan Oliver Oelerich <janoliver[at]oelerich[dot]org>
 
 pkgname=ovito
-pkgver=2.9.0
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
 pkgdesc="Open Visualization Tool"
 url="http://www.ovito.org"
 arch=('x86_64')
 license=('GPL')
-depends=('boost' 'qscintilla-qt5' 'muparser' 'fftw'
-         'openbabel' 'python' 'netcdf')
+depends=('boost' 'qscintilla-qt5' 'muparser' 'fftw' 'openbabel' 'python' 'netcdf'
+         'ffmpeg')
 makedepends=('cmake')
 conflicts=("$pkgname-git")
 source=("https://gitlab.com/stuko/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2"
-        "9.patch")
-sha256sums=('8670a5c4fc0199d80e4cf2e96ef1c595c7988bd59fe48e67caebce1713fb1994'
-            '154836944fd3ec19411a12e6e6392268406150c186126ff91493500b5ccb6d71')
+        "qwt.patch::https://gitlab.com/stuko/ovito/-/commit/c659ff9f610cd3c0fc786b0075a8ab3c718895de.diff")
+sha256sums=('9c29590f038b79c2b8dcd7a46f5d18138ac52a696e2e310f3f8831717bce63f9'
+            '5cd22fda001601889cd6dc6529ba38736040179e10c1b04a52147aae7e1d84eb')
 
 prepare() {
-    cd $srcdir/$pkgname-v$pkgver
-    patch -p1 < ../9.patch
+    cd "$srcdir/$pkgname-v$pkgver"
     mkdir $srcdir/build
-    sed -i "s/ CODEC_FLAG_GLOBAL_HEADER/AV_CODEC_FLAG_GLOBAL_HEADER/g" src/core/utilities/io/video/VideoEncoder.cpp
-    sed -i "s/\/resources//g" src/plugins/openbabel/CMakeLists.txt
+    patch -p1 < ../qwt.patch
 }
 
 build() {
-    cd $srcdir/build
+    cd "$srcdir/build"
     cmake ../$pkgname-v$pkgver \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DOVITO_BUILD_PLUGIN_OPENBABELPLUGIN=ON \
@@ -38,7 +36,6 @@ build() {
 }
 
 package() {
-    cd $srcdir/build
-    make DESTDIR=$pkgdir install
-    mv $pkgdir/usr/*.txt $pkgdir/usr/share/$pkgname
+    cd "$srcdir/build"
+    make DESTDIR="$pkgdir" install
 }