Update to 2.5.1.236

PR:		247533
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)

multimedia/openshot/Makefile

@@ -3,8 +3,8 @@
 
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.1-7
-DISTVERSIONSUFFIX=	-g90e7bc4c
+DISTVERSION=	2.5.1-236
+DISTVERSIONSUFFIX=	-g18e52fc3
 CATEGORIES=	multimedia
 
 MAINTAINER=	tatsuki_makino@hotmail.com

multimedia/openshot/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1583463600
-SHA256 (OpenShot-openshot-qt-v2.5.1-7-g90e7bc4c_GH0.tar.gz) = 8fcb10d67b316b5b200cadb91b8e3434ef51781b5f536fea6131ba2eb7b3ae88
-SIZE (OpenShot-openshot-qt-v2.5.1-7-g90e7bc4c_GH0.tar.gz) = 60225782
+TIMESTAMP = 1592888400
+SHA256 (OpenShot-openshot-qt-v2.5.1-236-g18e52fc3_GH0.tar.gz) = 64ada401743f15ba1af6f856c3a649ee3ed230ab560de9db6edaa6bb0d55e1a8
+SIZE (OpenShot-openshot-qt-v2.5.1-236-g18e52fc3_GH0.tar.gz) = 64019270

multimedia/openshot/files/patch-setup.py

@@ -1,4 +1,4 @@
---- setup.py.orig	2020-02-10 04:29:35 UTC
+--- setup.py.orig	2020-06-15 23:50:00 UTC
 +++ setup.py
 @@ -68,7 +68,7 @@ os_files = [
      # AppStream metadata
@@ -8,8 +8,8 @@
 +    ('share/pixmaps', ['xdg/icon/64/openshot-qt.png']),
      # XDG Freedesktop icon paths
      ('share/icons/hicolor/scalable/apps', ['xdg/openshot-qt.svg']),
-     ('share/icons/hicolor/64x64/apps', ['xdg/icon/64/openshot-qt.png']),
-@@ -77,7 +77,7 @@ os_files = [
+     ('share/icons/hicolor/scalable/mimetypes', ['xdg/openshot-qt-doc.svg']),
+@@ -79,7 +79,7 @@ os_files = [
      # XDG desktop mime types cache
      ('share/mime/packages', ['xdg/org.openshot.OpenShot.xml']),
      # launcher (mime.types)
@@ -18,7 +18,7 @@
  ]
  
  # Find files matching patterns
-@@ -118,26 +118,6 @@ if os.path.exists(os.path.join(PATH, "src")):
+@@ -120,26 +120,6 @@ if os.path.exists(os.path.join(PATH, "src")):
  FAILED = 'Failed to update.\n'
  
  if ROOT and dist != None:

multimedia/openshot/files/patch-src_classes_info.py

@@ -1,6 +1,6 @@
---- src/classes/info.py.orig	2020-02-10 04:29:35 UTC
+--- src/classes/info.py.orig	2020-06-15 23:50:00 UTC
 +++ src/classes/info.py
-@@ -136,6 +136,7 @@ SETUP = {
+@@ -151,6 +151,7 @@ SETUP = {
                         "License :: OSI Approved :: GNU General Public License (GPL)",
                         "Operating System :: OS Independent",
                         "Operating System :: POSIX :: Linux",

multimedia/openshot/files/patch-src_settings___default.settings

@@ -0,0 +1,20 @@
+--- src/settings/_default.settings.orig	2020-06-15 23:50:00 UTC
++++ src/settings/_default.settings
+@@ -406,7 +406,7 @@
+     "min": 0,
+     "setting": "graca_number_de",
+     "type": "dropdown",
+-    "value": "0",
++    "value": 0,
+     "translate_values": true,
+     "values": [],
+     "restart": true
+@@ -418,7 +418,7 @@
+     "min": 0,
+     "setting": "graca_number_en",
+     "type": "dropdown",
+-    "value": "0",
++    "value": 0,
+     "values": [],
+     "restart": true
+   },

multimedia/openshot/files/patch-src_windows_main__window.py

@@ -1,6 +1,6 @@
---- src/windows/main_window.py.orig	2020-02-10 04:29:35 UTC
+--- src/windows/main_window.py.orig	2020-06-15 23:50:00 UTC
 +++ src/windows/main_window.py
-@@ -249,6 +249,8 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
+@@ -257,6 +257,8 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
                  # Format last log line based on OS (since each OS can be formatted differently)
                  if platform.system() == "Darwin":
                      last_log_line = "mac-%s" % last_log_line[58:].strip()

multimedia/openshot/files/patch-src_windows_preferences.py

@@ -1,4 +1,4 @@
---- src/windows/preferences.py.orig	2019-11-11 07:57:57 UTC
+--- src/windows/preferences.py.orig	2020-06-15 23:50:00 UTC
 +++ src/windows/preferences.py
 @@ -293,7 +293,7 @@ class Preferences(QDialog):
                                  value_list.remove(value_item)
@@ -9,3 +9,11 @@
                                  value_list.remove(value_item)
  
                          # Remove hardware mode items which cannot decode the example video
+@@ -305,6 +305,7 @@ class Preferences(QDialog):
+ 
+                     # Replace %s dropdown values for hardware acceleration
+                     if param["setting"] in ("graca_number_en", "graca_number_de"):
++                        value_list = []
+                         for card_index in range(0,3):
+                             # Test each graphics card, and only include valid ones
+                             if card_index in self.hardware_tests_cards and self.hardware_tests_cards.get(card_index):