[pitivi] check: Do no require GNonLin if GES version >= 1.5.0
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] check: Do no require GNonLin if GES version >= 1.5.0
- Date: Fri, 24 Oct 2014 19:49:11 +0000 (UTC)
commit c6395cad34e267bd803abd2817b56a783a86ffe3
Author: Thibault Saunier <tsaunier gnome org>
Date: Fri Oct 24 21:44:19 2014 +0200
check: Do no require GNonLin if GES version >= 1.5.0
As it will be directly integrated in GES itself
pitivi/check.py | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/pitivi/check.py b/pitivi/check.py
index 53b5ae7..5e0ff22 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -38,6 +38,14 @@ from gettext import gettext as _
missing_soft_deps = {}
+def _version_to_string(version):
+ return ".".join([str(x) for x in version])
+
+
+def _string_to_list(version):
+ return [int(x) for x in version.split(".")]
+
+
class Dependency(object):
"""
This abstract class represents a module or component requirement.
@@ -173,14 +181,19 @@ class CairoDependency(ClassicDependency):
return _string_to_list(module.cairo_version_string())
-HARD_DEPENDENCIES = (CairoDependency("1.10.0"),
+HARD_DEPENDENCIES = [CairoDependency("1.10.0"),
GtkOrClutterDependency("Clutter", "1.12.0"),
GstDependency("Gst", "1.4.0"),
GstDependency("GES", "1.4.0.0"),
GtkOrClutterDependency("Gtk", "3.10.0"),
ClassicDependency("numpy", None),
GIDependency("Gio", None),
- GstPluginDependency("gnonlin", "1.4.0"))
+ ]
+
+ges_1_5 = GstDependency("GES", "1.5.0.0")
+ges_1_5.check()
+if not ges_15.satisfied:
+ HARD_DEPENDENCIES.append(GstPluginDependency("gnonlin", "1.4.0"))
PYCANBERRA_SOFT_DEPENDENCY = ClassicDependency("pycanberra", None,
_("enables sound notifications when rendering is complete"))
@@ -207,14 +220,6 @@ def _check_audiosinks():
return True
-def _version_to_string(version):
- return ".".join([str(x) for x in version])
-
-
-def _string_to_list(version):
- return [int(x) for x in version.split(".")]
-
-
def check_requirements():
hard_dependencies_satisfied = True
for dependency in HARD_DEPENDENCIES:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]