Match latest upstream changes

2 files changed, 20 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d77843e126f..d52e69fe8d7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,31 @@
 pkgbase = pitivi-git
 	pkgdesc = Editor for audio/video projects using the GStreamer framework (git version)
-	pkgver = 0.999.0.r881.g7739e04c
+	pkgver = 2021.01.0.r68.gf0a99577
 	pkgrel = 1
 	url = http://www.pitivi.org/
 	arch = x86_64
 	license = LGPL
-	checkdepends = gst-validate
-	checkdepends = gst-plugin-gtk
-	checkdepends = zbar
-	checkdepends = lilv
-	checkdepends = libkate
-	checkdepends = fluidsynth
-	checkdepends = qt5-base
-	checkdepends = qt5-declarative
-	checkdepends = qt5-x11extras
-	checkdepends = gst-libav
-	checkdepends = xorg-server-xvfb
 	makedepends = git
-	makedepends = gettext
+	makedepends = appstream-glib
+	makedepends = intltool
 	makedepends = itstool
 	makedepends = meson
-	makedepends = appstream-glib
 	depends = gsound
 	depends = gst-editing-services
+	depends = gst-plugin-gtk
 	depends = gst-plugins-bad
 	depends = gst-plugins-good
 	depends = gst-python
-	depends = gst-transcoder
 	depends = gtk3
 	depends = libnotify
+	depends = libpeas
 	depends = python-cairo
 	depends = python-gobject
 	depends = python-matplotlib
 	depends = python-numpy
-	depends = gdk-pixbuf2
-	depends = libpeas
-	optdepends = frei0r-plugins: for additional video effects, clip transformation feature
-	optdepends = gst-libav: for additional multimedia codecs
-	optdepends = gst-plugins-ugly: for additional multimedia codecs
+	optdepends = frei0r-plugins: additional video effects, clip transformation feature
+	optdepends = gst-libav: additional multimedia codecs
+	optdepends = gst-plugins-ugly: additional multimedia codecs
 	provides = pitivi
 	conflicts = pitivi
 	source = git+https://gitlab.gnome.org/GNOME/pitivi.git
diff --git a/PKGBUILD b/PKGBUILD
index f964796f59f2..70f91a81fa37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,47 +6,36 @@
 # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor@vipmail.hu>
 
 pkgname=pitivi-git
-pkgver=0.999.0.r881.g7739e04c
+pkgver=2021.01.0.r68.gf0a99577
 pkgrel=1
 pkgdesc='Editor for audio/video projects using the GStreamer framework (git version)'
 arch=('x86_64')
 url='http://www.pitivi.org/'
 license=('LGPL')
-depends=('gsound' 'gst-editing-services' 'gst-plugins-bad' 'gst-plugins-good' 'gst-python'
-         'gst-transcoder' 'gtk3' 'libnotify' 'python-cairo' 'python-gobject'
-         'python-matplotlib' 'python-numpy' 'gdk-pixbuf2' 'libpeas')
-optdepends=('frei0r-plugins: for additional video effects, clip transformation feature'
-            'gst-libav: for additional multimedia codecs'
-            'gst-plugins-ugly: for additional multimedia codecs')
-makedepends=('git' 'gettext' 'itstool' 'meson' 'appstream-glib')
-checkdepends=('gst-validate' 'gst-plugin-gtk' 'zbar' 'lilv' 'libkate' 'fluidsynth'
-              'qt5-base' 'qt5-declarative' 'qt5-x11extras' 'gst-libav' 'xorg-server-xvfb')
+depends=('gsound' 'gst-editing-services' 'gst-plugin-gtk' 'gst-plugins-bad' 'gst-plugins-good' 'gst-python'
+         'gtk3' 'libnotify' 'libpeas' 'python-cairo' 'python-gobject' 'python-matplotlib' 'python-numpy')
+makedepends=('git' 'appstream-glib' 'intltool' 'itstool' 'meson')
+optdepends=('frei0r-plugins: additional video effects, clip transformation feature'
+            'gst-libav: additional multimedia codecs'
+            'gst-plugins-ugly: additional multimedia codecs')
 provides=('pitivi')
 conflicts=('pitivi')
-BUILDENV+=('!check')
 source=('git+https://gitlab.gnome.org/GNOME/pitivi.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    local _version
-    local _revision
-    local _shorthash
-    _version="$(git -C pitivi tag | grep '[[0-9]*\.]*[0-9]*' | sort -r | head -n1)"
-    _revision="$(git -C pitivi rev-list "${_version}..HEAD" --count)"
-    _shorthash="$(git -C pitivi rev-parse --short HEAD)"
-    printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
+    git -C pitivi describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-    arch-meson pitivi/build pitivi
-    ninja -C pitivi/build
+    arch-meson build pitivi
+    ninja -v -C build
 }
 
 check() {
-    cd pitivi
-    xvfb-run gst-validate-launcher tests/ptv_testsuite.py
+    ninja -v -C build test
 }
 
 package() {
-    DESTDIR="$pkgdir" ninja -C pitivi/build install
+    DESTDIR="$pkgdir" ninja -v -C build install
 }