build: Remove vala option

After the last vala plugin was ported, we don't need an option to build
Vala plugins.

3 files changed, 3 insertions, 44 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 127f033ff..ce6035db2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,17 +6,12 @@ build-fedora:
   image: fedora:latest
   stage: test
   before_script:
-    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel vala flatpak-builder
+    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel flatpak-builder
   script:
-    - meson _build -Denable-vala=no
+    - meson _build
     - ninja -C _build test
     - ninja -C _build install
 
-    # Check that https://github.com/mesonbuild/meson/issues/1994 work-around still works
-    - rm -rf _build
-    - meson _build -Denable-vala=yes
-    - ninja -C _build -j1
-
 variables:
     # Replace with your preferred file name of the resulting Flatpak bundle
     BUNDLE: "org.gnome.TotemDevel.flatpak"
@@ -33,7 +28,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 -Denable-easy-codec-installation=no"
+        MESON_ARGS: "-Denable-easy-codec-installation=no"
         DBUS_ID: "org.gnome.Totem"
 
     script:
diff --git a/meson.build b/meson.build
index 98f22831b..f27f756f7 100644
--- a/meson.build
+++ b/meson.build
@@ -216,34 +216,6 @@ if python_option != 'no'
   endif
 endif
 
-# vala support
-have_vala = false
-
-vala_option = get_option('enable-vala')
-if vala_option != 'no'
-  if have_gir
-    vala_req_version = '>= 0.14.1'
-    if add_languages('vala', required: false)
-      if meson.get_compiler('vala').version().version_compare(vala_req_version)
-        have_vala = true
-      endif
-    endif
-
-    if not have_vala
-      str = 'you need vala ' + vala_req_version + ' installed to use vala plugins'
-    endif
-  else
-    str = 'you need introspection support for the vala plugins'
-  endif
-
-  if not have_vala
-    if vala_option == 'yes' or introspection_option == 'yes'
-      error(str)
-    endif
-    message(str)
-  endif
-endif
-
 # nautilus support
 have_nautilus = false
 
@@ -307,13 +279,6 @@ else
   message('   ' + str + ' disabled')
 endif
 
-str = 'Vala plugin support'
-if have_vala
-  message('** ' + str + ' enabled')
-else
-  message('   ' + str + ' disabled')
-endif
-
 foreach plugin: allowed_plugins
   if plugins.contains(plugin)
     message('** ' + plugin + ' plugin enabled')
diff --git a/meson_options.txt b/meson_options.txt
index 3b6ff67b0..bcce94676 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,5 @@
 option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer')
 option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
-option('enable-vala', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'whether Vala plugin support is requested')
 option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
 option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'compile the nautilus plugin')
 option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension')