nonprism/openshot: updated to 2.5.1

3 files changed, 50 insertions, 42 deletions

diff --git a/nonprism/openshot/PKGBUILD b/nonprism/openshot/PKGBUILD
index 33125c5a8..3ce916ec9 100644
--- a/nonprism/openshot/PKGBUILD
+++ b/nonprism/openshot/PKGBUILD
@@ -1,6 +1,6 @@
-# $Id$
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Arch): Florian Pritz <bluewind@xinu.at>
+# Maintainer (Arch): David Runge <dvzrv@archlinux.org>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Florian Pritz <bluewind@xinu.at>
 # Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
@@ -11,37 +11,43 @@
 #  - neuter google analytics and exception tracking as it all happens over http
 
 pkgname=openshot
-pkgver=2.4.4
+pkgver=2.5.1
 pkgrel=1
 pkgrel+=.nonprism1
-pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support"
+pkgdesc="An award-winning free and open-source video editor"
+pkgdesc+=", without nonfree faac recommendation and Youtube uploader support"
 arch=('any')
-url="http://www.openshot.org/"
-license=('GPL')
-depends=('mlt-python-bindings' 'sdl' 'librsvg' 'mplayer'
-	 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab'
-	 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image'
-	 'libopenshot' 'python-pyzmq' 'qt5-webkit' 'python-setuptools'
-         'python-requests')
-optdepends=('frei0r-plugins: effects'
-	    'libquicktime' 'libavc1394' 'jack')
+url="https://www.openshot.org/"
+license=('GPL3')
+depends=('ffmpeg' 'mlt' 'python-pyqt5' 'python-requests' 'libopenshot'
+'libopenshot-audio' 'python-pyzmq' 'qt5-base' 'qt5-svg' 'qt5-webkit')
 makedepends=('python-setuptools')
-
-
-source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz"
-        'nonprism.patch'
-	'neuter_tracking.patch')
-sha256sums=('8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be'
-            '31b78e88c83bba0ff469afdbbdc36577ca64a55640e4220e9a88ccf0c7f105dc'
-            '3990bdf10f46cd5255d01b0b113fe10e3ffed16da0577dfcaad470edd016aef9')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz")
+source+=('nonprism.patch'
+         'neuter_tracking.patch')
+sha256sums=('4c25eb9a5de42e749de4c6ca2f7a313c60e1283fe52d70c121629dbb8bb2df7b'
+            'b7fea3b32dd1666403caab7ff70c59cbdedceee8d3180b7a8878ee239a67623d'
+            '138260661ca9cd1b2bb62556a2e718d0f95e3bf02a92451e39cba5e958ef7ef8')
 
 prepare() {
-  cd "$srcdir"/openshot-qt-$pkgver
+  mv -v "${pkgname}-qt-${pkgver}" "${pkgname}-${pkgver}"
+
+  cd "${pkgname}-${pkgver}"
   patch -Np1 -i $srcdir/nonprism.patch
   patch -Np1 -i $srcdir/neuter_tracking.patch
 }
 
+build() {
+  cd "${pkgname}-${pkgver}"
+  python setup.py build
+}
+
 package() {
-  cd "$srcdir"/openshot-qt-$pkgver
-  python setup.py install --root="$pkgdir/" --optimize=1
+  cd "${pkgname}-${pkgver}"
+  python setup.py install --skip-build \
+                          --optimize=1 \
+                          --prefix=/usr \
+                          --root="${pkgdir}"
+  install -vDm 644 {AUTHORS,{CONTRIBUTING,README}.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
diff --git a/nonprism/openshot/neuter_tracking.patch b/nonprism/openshot/neuter_tracking.patch
index 27c455f6c..a664c1573 100644
--- a/nonprism/openshot/neuter_tracking.patch
+++ b/nonprism/openshot/neuter_tracking.patch
@@ -1,30 +1,32 @@
 --- a/src/classes/metrics.py	2018-09-22 18:49:41.000000000 -0300
 +++ b/src/classes/metrics.py	2019-02-08 08:53:21.561261422 -0400
-@@ -152,10 +152,10 @@
-         url_params = urllib.parse.urlencode(params)
-         url = "http://www.google-analytics.com/collect?%s" % url_params
+@@ -163,10 +163,11 @@ def send_metric(params):
+             url_params = urllib.parse.urlencode(metric_params)
+             url = "http://www.google-analytics.com/collect?%s" % url_params
  
--        # Send metric HTTP data
-+        # Don't Send metric HTTP data
-         try:
--            r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
--            log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
-+            # r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
-+            log.info("Track disabled - nonprism!")
+-            # Send metric HTTP data
++            # Send metric HTTP data (disabled)
+             try:
+-                r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
+-                log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
++                # r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
++                # log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
++                log.info("Tracking disabled")
  
-         except Exception as Ex:
-             log.error("Failed to Track metric: %s" % (Ex))
-@@ -172,10 +172,10 @@
-                                         "unique_install_id": s.get("unique_install_id" )})
+             except Exception as Ex:
+                 log.error("Failed to Track metric: %s" % (Ex))
+@@ -191,10 +192,11 @@ def send_exception(stacktrace, source):
+                                        "unique_install_id": s.get("unique_install_id")})
          url = "http://www.openshot.org/exception/json/"
  
 -        # Send exception HTTP data
-+        # Don't Send exception HTTP data
++        # Send exception HTTP data (disabled)
          try:
 -            r = requests.post(url, data=data, headers={"user-agent": user_agent, "content-type": "application/x-www-form-urlencoded"}, verify=False)
 -            log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text))
 +            # r = requests.post(url, data=data, headers={"user-agent": user_agent, "content-type": "application/x-www-form-urlencoded"}, verify=False)
-+            log.info("Tracking disabled - nonprism!")
++            # log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text))
++            log.info("Tracking disabled")
  
          except Exception as Ex:
              log.error("Failed to Track exception: %s" % (Ex))
diff --git a/nonprism/openshot/nonprism.patch b/nonprism/openshot/nonprism.patch
index 969db2445..cc30ff5ac 100644
--- a/nonprism/openshot/nonprism.patch
+++ b/nonprism/openshot/nonprism.patch
@@ -2,7 +2,7 @@ diff --git a/src/windows/main_window.py b/src/windows/main_window.py
 index df9a7feb3..c69c643b1 100644
 --- a/src/windows/main_window.py
 +++ b/src/windows/main_window.py
-@@ -609,17 +609,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
+@@ -724,17 +724,6 @@ class MainWindow(QMainWindow, updates.Up
          else:
              log.info('canceled')