From 22f6e8e36dc10c34e99738fb04bbfedc87b3d9ee Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Thu, 11 Mar 2021 14:25:48 -0300
Subject: [PATCH] meson: Fixed remaining issues from the port to `feature`
 options

---
 meson_options.txt        | 6 +++---
 src/examples/meson.build | 4 +---
 src/meson.build          | 4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 1b5bb5504..397554882 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -38,7 +38,7 @@ option('systemd',
 option('systemd-system-service',
        description: 'Install systemd system service file',
        type: 'feature',
-       value: 'auto')
+       value: 'disabled')
 option('systemd-user-service',
        description: 'Install systemd user service file',
        type: 'feature',
@@ -124,8 +124,8 @@ option('v4l2',
        value: 'auto')
 option('libcamera',
        description: 'Enable libcamera spa plugin integration',
-       type: 'boolean',
-       value: false)
+       type: 'feature',
+       value: 'auto')
 option('videoconvert',
        description: 'Enable videoconvert spa plugin integration',
        type: 'feature',
diff --git a/src/examples/meson.build b/src/examples/meson.build
index 74f2366d7..8f682b041 100644
--- a/src/examples/meson.build
+++ b/src/examples/meson.build
@@ -65,7 +65,7 @@ executable('export-spa-device',
   dependencies : [pipewire_dep, mathlib],
 )
 
-if alsa_dep.found()
+if not get_option('media-session').disabled() and alsa_dep.found()
   executable('pipewire-media-session',
     'media-session/access-flatpak.c',
     'media-session/access-portal.c',
@@ -94,8 +94,6 @@ if alsa_dep.found()
     install: true,
     dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib],
 )
-elif get_option('media-session').enabled() and not alsa_dep.found()
-  error('`media-session` is enabled but required dependency `alsa` not found.')
 endif
 
 executable('pw-reserve',
diff --git a/src/meson.build b/src/meson.build
index db169c926..a4cf719d0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,4 +11,6 @@ if not get_option('tests').disabled()
   subdir('tests')
 endif
 
-subdir('gst')
+if gst_dep.length() != 0
+  subdir('gst')
+endif