[pitivi] flatpak: Build non git components as soon as possible

[Thibault Saunier <tsaunier src gnome org>]

commit 98bcc23c8764c879225f035b5b01da53c3f706dd
Author: Thibault Saunier <tsaunier gnome org>
Date:   Fri Jun 3 16:46:42 2016 -0400

    flatpak: Build non git components as soon as possible
    
    Making sure we use the cached version and avoid to rebuild
    for nothing.
    
    + Make sure we use only our own built GStreamer plugins and not
    the ones that come with the gnome Sdk
    
    Reviewed-by: Alex Băluț <alexandru balut gmail com>
    Differential Revision: https://phabricator.freedesktop.org/D1064

 build/flatpak/pitivi-flatpak       |    2 +
 build/flatpak/pitivi.template.json |   90 ++++++++++++++++++------------------
 2 files changed, 47 insertions(+), 45 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 149656d..2d4eb7a 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -392,6 +392,7 @@ then
   then
       $FLATPAK build --socket=x11 --socket=session-bus --socket=pulseaudio \
       --share=network \
+      --env=GST_PLUGIN_SYSTEM_PATH= \
       --env=GST_PRESET_PATH=/app/share/gstreamer-1.0/presets/:/app/share/pitivi/gstpresets/:$GST_PRESET_PATH 
\
       --env=GST_ENCODING_TARGET_PATH=/app/share/pitivi/gstpresets/:$GST_ENCODING_TARGET_PATH \
       --env=GST_DEBUG=$GST_DEBUG \
@@ -412,6 +413,7 @@ then
       $FLATPAK build --socket=x11 --socket=session-bus --socket=pulseaudio \
       --share=network \
       --env=GST_DEBUG=$GST_DEBUG \
+      --env=GST_PLUGIN_SYSTEM_PATH= \
       --env=GST_VALIDATE=$GST_VALIDATE \
       --env=GST_VALIDATE_LAUNCHER_DEBUG=$GST_VALIDATE_LAUNCHER_DEBUG \
       --env=PITIVI_DEBUG=$PITIVI_DEBUG \
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/pitivi.template.json
index 0eb9c3e..d9ab8f3 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/pitivi.template.json
@@ -174,68 +174,93 @@
             ]
         },
         {
-            "name": "gstreamer",
+            "name": "libopus",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "git://anongit.freedesktop.org/gstreamer/gstreamer"
+                    "type": "archive",
+                    "url": "http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz";,
+                    "sha256": "0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd"
                 }
             ]
         },
         {
-            "name": "libopus",
+            "name": "frei0r-plugin",
             "sources": [
                 {
                     "type": "archive",
-                    "url": "http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz";,
-                    "sha256": "0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd"
+                    "url": "https://files.dyne.org/frei0r/releases/frei0r-plugins-1.4.tar.gz";,
+                    "sha256": "8470fcabde9f341b729be3be16385ffc8383d6f3328213907a43851b6e83be57"
                 }
             ]
         },
         {
-            "name": "gst-plugins-base",
+            "name": "libsoundtouch",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://www.surina.net/soundtouch/soundtouch-1.8.0.tar.gz";,
+                    "sha256": "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"
+                }
+            ]
+        },
+        {
+
+            "name": "meson",
+            "build-options" : {
+              "build-args": ["--share=network"]
+            },
+            "config-opts": ["--module=meson==0.29"],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "py-configure",
+                    "dest-filename": "configure"
+                }
+            ]
+        },
+        {
+            "name": "yelp",
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-base"
+                    "url": "https://git.gnome.org/browse/yelp";,
+                    "branch": "3.20.1"
                 }
             ]
         },
         {
-            "name": "gst-plugins-good",
+            "name": "gstreamer",
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-good"
+                    "url": "git://anongit.freedesktop.org/gstreamer/gstreamer"
                 }
             ]
         },
         {
-            "name": "gst-plugins-ugly",
+            "name": "gst-plugins-base",
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly"
+                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-base"
                 }
             ]
         },
         {
-            "name": "frei0r-plugin",
+            "name": "gst-plugins-good",
             "sources": [
                 {
-                    "type": "archive",
-                    "url": "https://files.dyne.org/frei0r/releases/frei0r-plugins-1.4.tar.gz";,
-                    "sha256": "8470fcabde9f341b729be3be16385ffc8383d6f3328213907a43851b6e83be57"
+                    "type": "git",
+                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-good"
                 }
             ]
         },
         {
-            "name": "libsoundtouch",
+            "name": "gst-plugins-ugly",
             "sources": [
                 {
-                    "type": "archive",
-                    "url": "http://www.surina.net/soundtouch/soundtouch-1.8.0.tar.gz";,
-                    "sha256": "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"
+                    "type": "git",
+                    "url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly"
                 }
             ]
         },
@@ -287,21 +312,6 @@
             ]
         },
         {
-
-            "name": "meson",
-            "build-options" : {
-              "build-args": ["--share=network"]
-            },
-            "config-opts": ["--module=meson==0.29"],
-            "sources": [
-                {
-                    "type": "file",
-                    "path": "py-configure",
-                    "dest-filename": "configure"
-                }
-            ]
-        },
-        {
             "name": "gst-transcoder",
             "config-opts": ["--libdir=lib"],
             "sources": [
@@ -317,16 +327,6 @@
             ]
         },
         {
-            "name": "yelp",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://git.gnome.org/browse/yelp";,
-                    "branch": "3.20.1"
-                }
-            ]
-        },
-        {
             "name": "pitivi",
             "sources": [
                 {