[pitivi] GNONLIN IS DEAD

[Jean-François Fortin Tam <jfft src gnome org>]

commit ed81b0111f081fcafcebc9336ba17ded9217873c
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date:   Sun Dec 7 11:38:04 2014 -0500

    GNONLIN IS DEAD
    
    Long live GES & NLE!

 bin/pitivi-git-environment.sh |    7 ++-----
 pitivi/check.py               |    8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index fc51273..0212c46 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -68,9 +68,9 @@ fi
 # otherwise the script will detect our "gst uninstalled" and think it's the
 # system-wide install.
 if pkg-config gstreamer-1.0 --atleast-version=$GST_MIN_VERSION --print-errors; then
-    MODULES="gnonlin gst-editing-services gst-python"
+    MODULES="gst-editing-services gst-python"
 else
-    MODULES="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg gnonlin 
gst-editing-services gst-python"
+    MODULES="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg 
gst-editing-services gst-python"
 fi
 
 
@@ -203,9 +203,6 @@ export PATH=$PITIVI/gst-editing-services/tools:$PATH
 GI_TYPELIB_PATH=$PITIVI/gst-editing-services/ges:$GI_TYPELIB_PATH
 
GI_TYPELIB_PATH=$PITIVI_PREFIX/share/gir-1.0:${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}:/usr/lib64/girepository-1.0:/usr/lib/girepository-1.0
 
-# And GNonLin
-export GST_PLUGIN_PATH=$GST_PLUGIN_PATH:$PITIVI/gnonlin/gnl/.libs
-
 # And python
 PYTHONPATH=$PYTHONPATH:$MYPITIVI/gst-python:$MYPITIVI/gst-editing-services/bindings/python
 export LD_LIBRARY_PATH=$PITIVI/pygobject/gi/.libs:$LD_LIBRARY_PATH
diff --git a/pitivi/check.py b/pitivi/check.py
index c4f40c7..69c169b 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -286,18 +286,12 @@ a specific version requirement, they have the "None" value.
 HARD_DEPENDENCIES = [CairoDependency("1.10.0"),
                      GtkOrClutterDependency("Clutter", "1.12.0"),
                      GstDependency("Gst", "1.4.0"),
-                     GstDependency("GES", "1.4.0.0"),
+                     GstDependency("GES", "1.5.0.0"),
                      GtkOrClutterDependency("Gtk", "3.10.0"),
                      ClassicDependency("numpy", None),
                      GIDependency("Gio", None),
                      ]
 
-# This one is a special case: eventually gnonlin will be dropped
-ges_1_5 = GstDependency("GES", "1.5.0.0")
-ges_1_5.check()
-if not ges_1_5.satisfied:
-    HARD_DEPENDENCIES.append(GstPluginDependency("gnonlin", "1.4.0"))
-
 SOFT_DEPENDENCIES = \
     (
         ClassicDependency("pycanberra", None, _("enables sound notifications when rendering is complete")),