mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 09:43:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: host_machine.system() is darwin even on iOS

Browse source 
Also use host_system everywhere.
This commit is contained in:
Nirbheek Chauhan 2018-07-25 16:00:28 +05:30
parent 38ec95460f
commit c80a1fd64c
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/gst/check/meson.build
View file

@ -23,7 +23,7 @@ check_cdata.set('ENABLE_SUBUNIT', 0)
check_cdata.set('CHECK_MAJOR_VERSION', 0) check_cdata.set('CHECK_MAJOR_VERSION', 0)
check_cdata.set('CHECK_MINOR_VERSION', 9) check_cdata.set('CHECK_MINOR_VERSION', 9)
check_cdata.set('CHECK_MICRO_VERSION', 14) check_cdata.set('CHECK_MICRO_VERSION', 14)
if host_machine.system() != 'windows' if host_system != 'windows'
check_cdata.set('HAVE_FORK', 1) check_cdata.set('HAVE_FORK', 1)
else else
check_cdata.set('HAVE_FORK', 0) check_cdata.set('HAVE_FORK', 0)

12
libs/gst/helpers/meson.build
View file

@ -23,20 +23,18 @@ endif
# Check PTP support # Check PTP support
have_ptp = false have_ptp = false
if host_machine.system() == 'android' if host_system == 'android'
message('PTP not supported on Android because of permissions.') message('PTP not supported on Android because of permissions.')
elif host_machine.system() == 'windows' elif host_system == 'windows'
message('PTP not supported on Windows, not ported yet.') message('PTP not supported on Windows, not ported yet.')
elif host_machine.system() == 'ios' # FIXME: is it also darwing on iOS ? elif host_system == 'darwin'
message('PTP not supported on iOS because of permissions.')
elif host_machine.system() == 'darwin'
if cc.has_header('MobileCoreServices/MobileCoreServices.h') if cc.has_header('MobileCoreServices/MobileCoreServices.h')
message('PTP not supported on iOS because of permissions.') message('PTP not supported on iOS because of permissions.')
else else
have_ptp = true have_ptp = true
endif endif
elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_machine.system()) elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_system)
message('PTP supported on ' + host_machine.system() + '.') message('PTP supported on ' + host_system + '.')
have_ptp = true have_ptp = true
endif endif

8
meson.build
View file

@ -156,7 +156,7 @@ check_headers = [
'sys/resource.h', 'sys/resource.h',
] ]
if host_machine.system() == 'windows' if host_system == 'windows'
check_headers += ['winsock2.h'] check_headers += ['winsock2.h']
endif endif
@ -269,7 +269,7 @@ if cc.has_function('strdup')
elif host_system == 'windows' and cc.has_function('_strdup') elif host_system == 'windows' and cc.has_function('_strdup')
cdata.set('HAVE__STRDUP', 1) # Windows (MSVC) cdata.set('HAVE__STRDUP', 1) # Windows (MSVC)
endif endif
if host_machine.system() != 'windows' if host_system != 'windows'
cdata.set('HAVE_FORK', 1) cdata.set('HAVE_FORK', 1)
else else
# libcheck requires HAVE_FORK to be 0 when fork() is not available # libcheck requires HAVE_FORK to be 0 when fork() is not available
@ -296,7 +296,7 @@ endif
# Platform deps; only ws2_32 and execinfo for now # Platform deps; only ws2_32 and execinfo for now
platform_deps = [] platform_deps = []
if host_machine.system() == 'windows' if host_system == 'windows'
platform_deps = [cc.find_library('ws2_32')] platform_deps = [cc.find_library('ws2_32')]
endif endif
@ -389,7 +389,7 @@ gobject_dep = dependency('gobject-2.0',
fallback: ['glib', 'libgobject_dep']) fallback: ['glib', 'libgobject_dep'])
gmodule_dep = dependency('gmodule-2.0', gmodule_dep = dependency('gmodule-2.0',
fallback: ['glib', 'libgmodule_dep']) fallback: ['glib', 'libgmodule_dep'])
if host_machine.system() == 'windows' if host_system == 'windows'
gio_dep = dependency('gio-2.0', gio_dep = dependency('gio-2.0',
fallback: ['glib', 'libgio_dep']) fallback: ['glib', 'libgio_dep'])
else else