mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

build: Do not try to build gst-python when introspection is disabled

Browse source 
Close #1604

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4648>
This commit is contained in:
Jordan Petridis 2023-05-16 17:47:49 +03:00 committed by GStreamer Marge Bot
parent 48ab457d79
commit a7c1da6ce5
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci.yml
View file

@ -420,17 +420,11 @@ build fedora clang:
MESON_ARGS: >- MESON_ARGS: >-
${SIMPLE_BUILD} ${SIMPLE_BUILD}
-Dintrospection=disabled -Dintrospection=disabled
-Dpython=disabled
--force-fallback-for=glib --force-fallback-for=glib
- BUILD_TYPE: ["--default-library=static"] - BUILD_TYPE: ["--default-library=static"]
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"] 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 # 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. # 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: >- MESON_ARGS: >-
${DEFAULT_MESON_ARGS} ${DEFAULT_MESON_ARGS}
-Dvaapi=disabled -Dvaapi=disabled
-Dpython=auto
-Dgst-editing-services:python=disabled
-Dintrospection=disabled -Dintrospection=disabled
-Dpython=disabled
-Ddoc=disabled -Ddoc=disabled
-Dgstreamer-sharp:tests=disabled -Dgstreamer-sharp:tests=disabled
--force-fallback-for=glib --force-fallback-for=glib

5
meson.build
View file

@ -96,6 +96,9 @@ if get_option('webrtc').enabled()
libnice_options += ['gstreamer=enabled'] libnice_options += ['gstreamer=enabled']
endif 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) # Ordered list of subprojects (dict has no ordering guarantees)
subprojects = [ subprojects = [
['gstreamer', {'build-hotdoc': true, 'subproject_options': building_full_options}], ['gstreamer', {'build-hotdoc': true, 'subproject_options': building_full_options}],
@ -112,7 +115,7 @@ subprojects = [
['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}],
['gstreamer-sharp', { 'option': get_option('sharp') }], ['gstreamer-sharp', { 'option': get_option('sharp') }],
['pygobject', { 'option': get_option('python'), 'match_gst_version': false, 'sysdep': 'pygobject-3.0', 'sysdep_version': '>= 3.8' }], ['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-examples', { 'option': get_option('gst-examples'), 'match_gst_versions': false}],
['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}], ['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}],
] ]