[pitivi] flatpak: Update meson version and remove dependencies that are now in the gnome SDK

[Thibault Saunier <tsaunier src gnome org>]

commit 9a522b3175ff8939507b57aea4a3e1250108ddaa
Author: Thibault Saunier <thibault saunier osg samsung com>
Date:   Tue Dec 20 14:00:25 2016 -0300

    flatpak: Update meson version and remove dependencies that are now in the gnome SDK
    
    Fixes T7635

 bin/pitivi-env                     |    1 +
 build/flatpak/pitivi.template.json |   31 +------------------------------
 meson.build                        |    4 ++--
 3 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/bin/pitivi-env b/bin/pitivi-env
index 0590b80..859c8e2 100755
--- a/bin/pitivi-env
+++ b/bin/pitivi-env
@@ -35,6 +35,7 @@ then
     alias minstall=$minstall
     alias autogen=$autogen
     alias configure=$configure
+    alias ninja="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ninja"
 
     # Prefer to run the binaries in the sandbox. For example "python3".
     for i in `$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ls /app/bin/`;
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/pitivi.template.json
index 29b75ca..eb0b31a 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/pitivi.template.json
@@ -35,21 +35,6 @@
             ]
         },
         {
-            "name": "ninja",
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://github.com/ninja-build/ninja/releases/download/v1.7.1/ninja-linux.zip";,
-                    "sha256": "eb541331792ac75ade60a7c0d7737a4851f2a131e0143b38c059dbfe731fb5a4"
-                },
-                {
-                    "type": "file",
-                    "path": "ninja-configure",
-                    "dest-filename": "configure"
-                }
-            ]
-        },
-        {
             "name": "x264",
             "config-opts": ["--enable-shared", "--enable-static", "--enable-pic", "--disable-lavf"],
             "sources": [
@@ -77,20 +62,6 @@
             ]
         },
         {
-            "name": "setuptools",
-            "build-options" : {
-              "build-args": ["--share=network"]
-            },
-            "config-opts": ["--module=setuptools==19.7"],
-            "sources": [
-                {
-                    "type": "file",
-                    "path": "py-configure",
-                    "dest-filename": "configure"
-                }
-            ]
-        },
-        {
             "name": "ipdb",
             "build-options" : {
               "build-args": ["--share=network"]
@@ -242,7 +213,7 @@
             "build-options" : {
               "build-args": ["--share=network"]
             },
-            "config-opts": ["--module=meson==0.35.1"],
+            "config-opts": ["--module=meson==0.37.0"],
             "sources": [
                 {
                     "type": "file",
diff --git a/meson.build b/meson.build
index 139503d..b1cb61d 100644
--- a/meson.build
+++ b/meson.build
@@ -35,8 +35,8 @@ cdata.set('CONFIGURED_GST_PLUGIN_PATH',
           run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip())
 cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH',
           run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip())
-cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))
-cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))
+cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
 cdata.set('PACKAGE_NAME', 'Pitivi')
 cdata.set('PACKAGE', 'pitivi')
 cdata.set('GITVERSION', GITVERSION)