From f5e01b9196a4191f10b597a9574aff79030dc79e Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn@igalia.com>
Date: Wed, 11 Jan 2023 14:07:15 +0000
Subject: [PATCH] meson: Only enable cargo features when options are enabled
 (bis)

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/285 even more.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1043>
---
 meson.build | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/meson.build b/meson.build
index cebe435a..96270268 100644
--- a/meson.build
+++ b/meson.build
@@ -293,34 +293,42 @@ examples = []
 # Add the plugin library files as output
 output = []
 
-if glib_dep.version().version_compare('>=2.74')
-  features += ['glib/v2_74', 'gio/v2_74']
-elif glib_dep.version().version_compare('>=2.72')
-  features += ['glib/v2_72', 'gio/v2_72']
-elif glib_dep.version().version_compare('>=2.70')
-  features += ['glib/v2_70', 'gio/v2_70']
-elif glib_dep.version().version_compare('>=2.68')
-  features += ['glib/v2_68', 'gio/v2_68']
-elif glib_dep.version().version_compare('>=2.66')
-  features += ['glib/v2_66', 'gio/v2_66']
-elif glib_dep.version().version_compare('>=2.64')
-  features += ['glib/v2_64', 'gio/v2_64']
-elif glib_dep.version().version_compare('>=2.62')
-  features += ['glib/v2_62', 'gio/v2_62']
-elif glib_dep.version().version_compare('>=2.60')
-  features += ['glib/v2_60', 'gio/v2_60']
-elif glib_dep.version().version_compare('>=2.58')
-  features += ['glib/v2_58', 'gio/v2_58']
+if get_option('gtk4').allowed()
+  if glib_dep.version().version_compare('>=2.74')
+    features += ['glib/v2_74', 'gio/v2_74']
+  elif glib_dep.version().version_compare('>=2.72')
+    features += ['glib/v2_72', 'gio/v2_72']
+  elif glib_dep.version().version_compare('>=2.70')
+    features += ['glib/v2_70', 'gio/v2_70']
+  elif glib_dep.version().version_compare('>=2.68')
+    features += ['glib/v2_68', 'gio/v2_68']
+  elif glib_dep.version().version_compare('>=2.66')
+    features += ['glib/v2_66', 'gio/v2_66']
+  elif glib_dep.version().version_compare('>=2.64')
+    features += ['glib/v2_64', 'gio/v2_64']
+  elif glib_dep.version().version_compare('>=2.62')
+    features += ['glib/v2_62', 'gio/v2_62']
+  elif glib_dep.version().version_compare('>=2.60')
+    features += ['glib/v2_60', 'gio/v2_60']
+  elif glib_dep.version().version_compare('>=2.58')
+    features += ['glib/v2_58', 'gio/v2_58']
+  endif
 endif
 
 if gst_dep.version().version_compare('>=1.21')
   components = [
-    '', '-app', '-audio', '-base', '-check', '-net', '-pbutils',
+    '', '-app', '-audio', '-base', '-check',
     '-rtp', '-sdp', '-utils', '-video', '-webrtc',
   ]
   if get_option('tracers').allowed()
     components += '-plugin-tracers'
   endif
+  if get_option('threadshare').allowed()
+    components += '-net'
+  endif
+  if get_option('mp4').allowed() or get_option('fmp4').allowed()
+    components += '-pbutils'
+  endif
   foreach c: components
     features += f'gst@c@/v1_22'
   endforeach