mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Use host_system for the host_machine system

Browse source 
This is a convention everywhere else in gstreamer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6159>
This commit is contained in:
Nirbheek Chauhan 2024-02-21 08:29:45 +05:30 committed by GStreamer Marge Bot
parent 911d840288
commit ad8ea38e0a
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-editing-services/docs/meson.build
View file

@ -111,7 +111,7 @@ libs_doc = [hotdoc.generate_doc('gst-editing-services',
depends: ges_gir[0], depends: ges_gir[0],
)] )]
if host_machine.system() == 'windows' if host_system == 'windows'
pathsep = ';' pathsep = ';'
else else
pathsep = ':' pathsep = ':'

9
subprojects/gst-editing-services/meson.build
View file

@ -35,6 +35,7 @@ else
gst_req = '>= ' + gst_version gst_req = '>= ' + gst_version
endif endif
host_system = host_machine.system()
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
mathlib = cc.find_library('m', required : false) mathlib = cc.find_library('m', required : false)
@ -101,7 +102,7 @@ gstaudio_dep = dependency('gstreamer-audio-' + apiversion, version : gst_req,
fallback : ['gst-plugins-base', 'audio_dep']) fallback : ['gst-plugins-base', 'audio_dep'])
gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req, gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep']) fallback : ['gstreamer', 'gst_base_dep'])
if host_machine.system() != 'windows' if host_system != 'windows'
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
required : get_option('tests'), required : get_option('tests'),
fallback : ['gstreamer', 'gst_check_dep']) fallback : ['gstreamer', 'gst_check_dep'])
@ -175,7 +176,7 @@ elif build_gir
elif pylib_loc == '' elif pylib_loc == ''
fsmod = import('fs') fsmod = import('fs')
pylib_loc = python.get_variable('LIBPL', '') pylib_loc = python.get_variable('LIBPL', '')
if host_machine.system() != 'windows' and host_machine.system() != 'darwin' if host_system != 'windows' and host_system != 'darwin'
pylib_ldlibrary = python.get_variable('LDLIBRARY', '') pylib_ldlibrary = python.get_variable('LDLIBRARY', '')
if not fsmod.exists(pylib_loc / pylib_ldlibrary) if not fsmod.exists(pylib_loc / pylib_ldlibrary)
# Workaround for Fedora # Workaround for Fedora
@ -189,9 +190,9 @@ elif build_gir
endif endif
if error_msg == '' if error_msg == ''
pylib_suffix = 'so' pylib_suffix = 'so'
if host_machine.system() == 'windows' if host_system == 'windows'
pylib_suffix = 'dll' pylib_suffix = 'dll'
elif host_machine.system() == 'darwin' elif host_system == 'darwin'
pylib_suffix = 'dylib' pylib_suffix = 'dylib'
endif endif

2
subprojects/gst-editing-services/tests/meson.build
View file

@ -3,7 +3,7 @@ if get_option('tests').disabled() or static_build
endif endif
# FIXME: make check work on windows # FIXME: make check work on windows
if host_machine.system() != 'windows' and gstcheck_dep.found() if host_system != 'windows' and gstcheck_dep.found()
subdir('check') subdir('check')
endif endif