CI: Use flatpak

2 files changed, 65 insertions, 58 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..092f3b78
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+variables:
+    BUNDLE: "org.gnome.Rygel.Devel.flatpak"
+    GIT_SUBMODULE_STRATEGY: recursive
+
+flatpak:
+    extends: ['.flatpak']
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:40
+    variables:
+        MANIFEST_PATH: "build-aux/org.gnome.Rygel.json"
+        RUNTIME_REPO: "https://sdk.gnome.org/gnome.flatpakrepo"
+        # Replace with your application name, as written in the manifest
+        FLATPAK_MODULE: "rygel"
+        APP_ID: "org.gnome.Rygel"
+
+#nightly:
+#extends: '.publish_nightly'
+#    dependencies: ['flatpak']
+#    needs: ['flatpak']
diff --git a/build-aux/org.gnome.Rygel.json b/build-aux/org.gnome.Rygel.json
index 6c13cb92..340dd5f4 100644
--- a/build-aux/org.gnome.Rygel.json
+++ b/build-aux/org.gnome.Rygel.json
@@ -1,127 +1,114 @@
 {
     "app-id" : "org.gnome.Rygel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
+    "runtime-version" : "40",
     "sdk" : "org.gnome.Sdk",
     "command" : "rygel",
     "finish-args" : [
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--filesystem=xdg-download",
-        "--filesystem=xdg-pictures",
-        "--filesystem=xdg-run/dconf",
-        "--share=ipc",
         "--share=network",
-        "--device=all",
-        "--socket=wayland",
-        "--socket=x11",
-        "--talk-name=ca.desrt.dconf",
-        "--talk-name=org.freedesktop.FileManager1",
-        "--talk-name=org.gnome.SettingsDaemon",
+        "--share=ipc",
         "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs.*",
+        "--filesystem=xdg-pictures",
+        "--filesystem=xdg-videos",
+        "--filesystem=xdg-music"
     ],
+    "build-options" : {
+        "cflags" : "-O2 -g",
+        "cxxflags" : "-O2 -g",
+        "env" : {
+            "V" : "1"
+        }
+    },
     "cleanup" : [
         "/include",
-        "/lib/pkconfig",
-        "/share/pkgconfig",
+        "/lib/pkgconfig",
+        "/man",
+        "/share/doc",
         "/share/gtk-doc",
         "/share/man",
-        "/share/vala",
-        "/lib/girepository",
+        "/share/pkgconfig",
         "*.la",
         "*.a"
     ],
     "modules" : [
         {
             "name" : "gssdp",
-            "buildsystem": "meson",
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gssdp.git/",
-                    "branch" : "master"
+                    "url" : "https://gitlab.gnome.org/GNOME/gssdp.git/"
                 }
             ]
         },
         {
             "name" : "gupnp",
-            "buildsystem": "meson",
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gupnp.git/",
-                    "branch" : "master"
+                    "url" : "https://gitlab.gnome.org/GNOME/gupnp.git/"
                 }
             ]
         },
-         {
+        {
             "name" : "gupnp-av",
-            "buildsystem": "meson",
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gupnp-av.git/",
-                    "branch" : "master"
+                    "url" : "https://gitlab.gnome.org/GNOME/gupnp-av.git/"
                 }
             ]
         },
         {
             "name" : "gupnp-dlna",
-            "buildsystem": "autotools",
-            "config-opts" : [
-                "--disable-Werror"
-            ],
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gupnp-dlna.git/",
-                    "branch" : "master"
+                    "url" : "https://gitlab.gnome.org/GNOME/gupnp-dlna.git/"
                 }
             ]
         },
         {
-            "name" : "libgee",
+            "name" : "libmediaart",
+            "buildsystem" : "meson",
             "sources" : [
                 {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.1.tar.xz",
-                    "sha256" : "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libmediaart.git/"
                 }
-            ],
-            "make-install-args": [
-                "girdir=/app/share/gir-1.0",
-                "typelibdir=/app/lib/girepository-1.0"
-            ],
-            "config-opts" : [
-                "--disable-docs"
             ]
         },
         {
-            "name" : "libmediaart",
-            "sources" : [
+            "name": "gst-editing-services",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "-Ddoc=disabled"
+            ],
+            "sources": [
                 {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/libmediaart/1.9/libmediaart-1.9.4.tar.xz",
-                    "sha256" : "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"
+                    "type": "git",
+                    "branch": "1.16.3",
+                    "url": "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
+                    "commit" : "c96045555266a22a48be3465cfdeeb877fcae2b2"
                 }
-            ],
-            "config-opts" : [
-                "--disable-docs"
             ]
         },
-
-       {
+        {
             "name" : "rygel",
             "buildsystem" : "meson",
             "config-opts" : [
-                "-Dplugins=['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih']"
+                "--libdir=lib"
             ],
+            "builddir" : true,
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/rygel.git/",
-                    "branch" : "master"
+                    "url" : "https://gitlab.gnome.org/GNOME/rygel.git/"
                 }
             ]
         }