From a7c1da6ce54580ddf51c1daa5c42ed18b2fab810 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 16 May 2023 17:47:49 +0300
Subject: [PATCH] build: Do not try to build gst-python when introspection is
 disabled

Close #1604

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4648>
---
 .gitlab-ci.yml | 11 ++---------
 meson.build    |  5 ++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3197e76fcf..41ba8de55f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -420,17 +420,11 @@ build fedora clang:
         MESON_ARGS: >-
           ${SIMPLE_BUILD}
           -Dintrospection=disabled
+          -Dpython=disabled
           --force-fallback-for=glib
 
       - BUILD_TYPE: ["--default-library=static"]
         BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
-        # Passing Dpython=enabled prohibits us from -Dgst-editing-services:python=disabled which we
-        # currently need to statically build ges.
-        #
-        # subprojects/gst-editing-services/meson.build:153:4: ERROR: Problem encountered: Want to build python based modules but it is not supported while static building
-        # https://github.com/mesonbuild/meson/issues/5214
-        # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4281?commit_id=d1a687b61d8fbc5ae35b4bb62aa7fd1d091818f2#note_1875699
-        #
         # VAAPI can't be build statically yet
         # subprojects/gstreamer-vaapi/meson.build:8:2: ERROR: Problem encountered: GStreamer-VAAPI plugin not supported with `static` builds yet.
         #
@@ -439,9 +433,8 @@ build fedora clang:
         MESON_ARGS: >-
           ${DEFAULT_MESON_ARGS}
           -Dvaapi=disabled
-          -Dpython=auto
-          -Dgst-editing-services:python=disabled
           -Dintrospection=disabled
+          -Dpython=disabled
           -Ddoc=disabled
           -Dgstreamer-sharp:tests=disabled
           --force-fallback-for=glib
diff --git a/meson.build b/meson.build
index 6438761c87..721ee9f080 100644
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,9 @@ if get_option('webrtc').enabled()
   libnice_options += ['gstreamer=enabled']
 endif
 
+# Disable gst-python if we've disabled introspection
+gst_python_option = get_option('python').disable_if(get_option('introspection').disabled())
+
 # Ordered list of subprojects (dict has no ordering guarantees)
 subprojects = [
   ['gstreamer', {'build-hotdoc': true, 'subproject_options': building_full_options}],
@@ -112,7 +115,7 @@ subprojects = [
   ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}],
   ['gstreamer-sharp', { 'option': get_option('sharp') }],
   ['pygobject', { 'option': get_option('python'), 'match_gst_version': false, 'sysdep': 'pygobject-3.0', 'sysdep_version': '>= 3.8' }],
-  ['gst-python', { 'option': get_option('python')}],
+  ['gst-python', { 'option': gst_python_option}],
   ['gst-examples', { 'option': get_option('gst-examples'), 'match_gst_versions': false}],
   ['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}],
 ]