[totem-video-thumbnailer/wip/hadess/add-ci: 2/3] build: Fix build with newer meson

[Bastien Nocera <hadess src gnome org>]

commit 093a1a704fb27b0a52e7079dd45ba1e20bee4bbf
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Nov 3 16:39:41 2019 +0100

    build: Fix build with newer meson
    
    Newer versions of meson don't like us messing around with files from
    "subprojects":
    meson.build:84:0: ERROR: Sandbox violation: Tried to grab file totem.thumbnailer.in from a different 
subproject.
    
    Except that totem isn't a meson subproject, just a git submodule we want
    to be able to muck around with.

 .gitmodules       |  4 ++--
 meson.build       | 18 +++++++++---------
 submodules/totem  |  1 +
 subprojects/totem |  1 -
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 8b12690..86636ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "subprojects/totem"]
-       path = subprojects/totem
+[submodule "submodules/totem"]
+       path = submodules/totem
        url = https://gitlab.gnome.org/GNOME/totem.git
diff --git a/meson.build b/meson.build
index 540587c..6df175a 100644
--- a/meson.build
+++ b/meson.build
@@ -40,10 +40,10 @@ configure_file(
 )
 
 totem_video_thumbnailer_sources = files(
-  'subprojects/totem/src/totem-resources.c',
-  'subprojects/totem/src/totem-video-thumbnailer.c',
-  'subprojects/totem/src/gst/totem-gst-helpers.c',
-  'subprojects/totem/src/gst/totem-gst-pixbuf-helpers.c'
+  'submodules/totem/src/totem-resources.c',
+  'submodules/totem/src/totem-video-thumbnailer.c',
+  'submodules/totem/src/gst/totem-gst-helpers.c',
+  'submodules/totem/src/gst/totem-gst-pixbuf-helpers.c'
 )
 
 totem_video_thumbnailer_deps = [
@@ -59,8 +59,8 @@ executable(
   'totem-video-thumbnailer',
   totem_video_thumbnailer_sources,
   include_directories: [
-    include_directories('subprojects/totem/src/'),
-    include_directories('subprojects/totem/src/gst'),
+    include_directories('submodules/totem/src/'),
+    include_directories('submodules/totem/src/gst'),
   ],
   dependencies: totem_video_thumbnailer_deps,
   c_args: [
@@ -70,8 +70,8 @@ executable(
   install_dir: totem_bindir
 )
 
-thumbnailer_sh = find_program('subprojects/totem/data/thumbnailer.sh')
-mime_type_list = files('subprojects/totem/data/mime-type-list.txt')
+thumbnailer_sh = find_program('submodules/totem/data/thumbnailer.sh')
+mime_type_list = files('submodules/totem/data/mime-type-list.txt')
 
 r = run_command(thumbnailer_sh, mime_type_list)
 
@@ -82,7 +82,7 @@ thumbnailer_conf.set('MIME_TYPE', r.stdout().strip())
 thumbnailer = 'totem.thumbnailer'
 
 configure_file(
-  input: 'subprojects/totem/data/' + thumbnailer + '.in',
+  input: 'submodules/totem/data/' + thumbnailer + '.in',
   output: thumbnailer,
   install: true,
   install_dir: join_paths(totem_datadir, 'thumbnailers'),
diff --git a/submodules/totem b/submodules/totem
new file mode 160000
index 0000000..0a3ff1f
--- /dev/null
+++ b/submodules/totem
@@ -0,0 +1 @@
+Subproject commit 0a3ff1f1b0234fa6ed35f72d179c450b7885adbe