mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Allow sysdeps to be forced as fallback subprojects

Browse source 
The original code was too complicated; likely created before the
provide section existed for wraps:

https://mesonbuild.com/Wrap-dependency-system-manual.html#provide-section

Now you can do --force-fallback-for=pygobject and it'll actually work.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3804>
This commit is contained in:
Nirbheek Chauhan 2023-01-26 19:52:37 +05:30 committed by GStreamer Marge Bot
parent 99cdc3a965
commit 77b8547586
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -154,10 +154,7 @@ foreach sp : subprojects
if match_gst_version if match_gst_version
subproj = subproject(project_name, version: gst_version, required: is_required, default_options: default_options) subproj = subproject(project_name, version: gst_version, required: is_required, default_options: default_options)
elif sysdep != '' elif sysdep != ''
sysdep_dep = dependency(sysdep, version: sysdep_version, required: false, default_options: default_options) sysdep_dep = dependency(sysdep, version: sysdep_version, required: is_required, default_options: default_options)
if not sysdep_dep.found()
subproj = subproject(project_name, required: is_required, default_options: default_options)
endif
else else
subproj = subproject(project_name, required: is_required, default_options: default_options) subproj = subproject(project_name, required: is_required, default_options: default_options)
endif endif

3
subprojects/pygobject.wrap
View file

@ -3,3 +3,6 @@ directory = pygobject-3.42.2
source_url = https://download.gnome.org/sources/pygobject/3.42/pygobject-3.42.2.tar.xz source_url = https://download.gnome.org/sources/pygobject/3.42/pygobject-3.42.2.tar.xz
source_filename = pygobject-3.42.2.tar.xz source_filename = pygobject-3.42.2.tar.xz
source_hash = ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957 source_hash = ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957
[provide]
pygobject-3.0 = pygobject_dep