[totem/wip/hadess/bug-fixes: 3/4] flatpak: Synchronise Flatpak and CI build options

[Bastien Nocera <hadess src gnome org>]

commit 4a1e0a168087938b5a44ef483ebddda35fe84838
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 7 22:08:15 2019 +0100

    flatpak: Synchronise Flatpak and CI build options

 .gitlab-ci.yml               | 4 ++--
 flatpak/org.gnome.Totem.json | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d853be105..2d260e2b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ flatpak:
         FLATPAK_MODULE: "totem"
         # Make sure to keep this in sync with the Flatpak manifest, all arguments
         # are passed except the config-args because we build it ourselves
-        MESON_ARGS: "-Denable-vala=no"
+        MESON_ARGS: "-Denable-easy-codec-installation=n"
         DBUS_ID: "org.gnome.Totem"
 
     script:
@@ -41,7 +41,7 @@ flatpak:
         # Make sure to keep this in sync with the Flatpak manifest, all arguments
         # are passed except the config-args because we build it ourselves
         - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
-        - flatpak build app ninja -C _build install
+        - flatpak build app ninja -j1 -C _build install
         - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
         # Run automatic tests inside the Flatpak env
         - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
diff --git a/flatpak/org.gnome.Totem.json b/flatpak/org.gnome.Totem.json
index ff81ac582..2b7f1918b 100644
--- a/flatpak/org.gnome.Totem.json
+++ b/flatpak/org.gnome.Totem.json
@@ -249,6 +249,7 @@
             "name": "totem",
             "buildsystem": "meson",
             "no-parallel-make": true,
+            /* Keep in sync with .gitlab-ci.yml */
             "config-opts": ["-Denable-easy-codec-installation=no"],
             "sources": [
                 {