[gnome-boxes/wip/kalev/ovf-support: 5/8] build: Add libovf-glib dependency

[Felipe Borges <felipeborges src gnome org>]

commit 6d8c393808c230afd65af1d3a2774a62b1916330
Author: Felipe Borges <felipeborges gnome org>
Date:   Mon May 7 14:52:00 2018 +0200

    build: Add libovf-glib dependency
    
    This library enables Boxes to handle .ova files.
    
    See https://gitlab.gnome.org/felipeborges/libovf-glib

 .gitmodules                            |  4 ++++
 build-aux/flatpak/org.gnome.Boxes.json | 13 +++++++++++++
 meson.build                            |  1 +
 src/meson.build                        | 14 +++++++++++++-
 subprojects/libovf-glib                |  1 +
 subprojects/libovf-glib.wrap           |  4 ++++
 6 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/.gitmodules b/.gitmodules
index 9200ccd6..c9ad8749 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "subprojects/gtk-frdp"]
        path = subprojects/gtk-frdp
        url = https://gitlab.gnome.org/gnome/gtk-frdp
+
+[submodule "subprojects/libovf-glib"]
+       path = subprojects/libovf-glib
+       url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index aecbf366..e15f8229 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -350,6 +350,19 @@
                 }
             ]
         },
+        {
+            "name" : "govf",
+            "config-opts" : [
+                "--libdir=/app/lib"
+            ],
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/felipeborges/libovf-glib.git";
+                }
+            ]
+        },
         {
             "name" : "gnome-boxes",
             "buildsystem" : "meson",
diff --git a/meson.build b/meson.build
index 2d3f88c0..1b9fbc3b 100644
--- a/meson.build
+++ b/meson.build
@@ -23,6 +23,7 @@ pkglibdir = join_paths (get_option ('libdir'), meson.project_name ())
 po_dir = join_paths (meson.source_root (), 'po')
 data_dir = join_paths (get_option ('prefix'), get_option ('datadir'))
 locale_dir = join_paths (get_option ('prefix'), get_option ('localedir'))
+pkgdatadir = join_paths (data_dir, meson.project_name ())
 
 conf = configuration_data ()
 conf.set_quoted ('DISTRIBUTOR_NAME', get_option ('distributor_name'))
diff --git a/src/meson.build b/src/meson.build
index a88c5288..69a68f6b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -149,6 +149,8 @@ endif
 if get_option('flatpak')
   vala_args += '--define=FLATPAK'
 
+  dependencies += dependency ('govf-0.1')
+
   if get_option('rdp')
     dependencies += dependency ('gtk-frdp-0.1')
   endif
@@ -172,7 +174,6 @@ else
   endif
 
   if get_option('rdp')
-    pkgdatadir = join_paths (data_dir, meson.project_name ())
     gtk_frdp = subproject(
       'gtk-frdp',
       default_options: [
@@ -183,8 +184,19 @@ else
 
     dependencies += gtk_frdp.get_variable('gtk_frdp_vapi')
   endif
+
+  libovf = subproject(
+    'libovf-glib',
+    default_options: [
+      'pkgdatadir=' + pkgdatadir,
+      'pkglibdir=' + pkglibdir
+    ]
+  )
+
+  dependencies += libovf.get_variable('govf_vapi')
 endif
 
+
 executable ('gnome-boxes', vala_sources + resources,
             include_directories: config_h_dir,
             vala_args: vala_args,
diff --git a/subprojects/libovf-glib b/subprojects/libovf-glib
new file mode 160000
index 00000000..9b06d247
--- /dev/null
+++ b/subprojects/libovf-glib
@@ -0,0 +1 @@
+Subproject commit 9b06d2476e4c04783dc3e9f01dbc8bc0ea6e1e77
diff --git a/subprojects/libovf-glib.wrap b/subprojects/libovf-glib.wrap
new file mode 100644
index 00000000..3ccb2af7
--- /dev/null
+++ b/subprojects/libovf-glib.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libovf-glib
+url=https://gitlab.gnome.org/felipeborges/libovf-glib.git
+revision=head