mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: host_system is 'ios' when building for iOS

Browse source 
The cross file sets this value, and we use 'ios' in Cerbero.
This commit is contained in:
Nirbheek Chauhan 2018-08-17 02:59:26 +05:30
parent 5c462b9b12
commit 5177f7c7ee
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -332,9 +332,10 @@ cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
host_system = host_machine.system() host_system = host_machine.system()
if host_system == 'linux' if host_system == 'linux'
cdata.set_quoted('DEFAULT_VIDEOSRC', 'v4l2src') cdata.set_quoted('DEFAULT_VIDEOSRC', 'v4l2src')
elif host_system == 'darwin' elif ['darwin', 'ios'].contains(host_system)
cdata.set_quoted('DEFAULT_VIDEOSRC', 'avfvideosrc') cdata.set_quoted('DEFAULT_VIDEOSRC', 'avfvideosrc')
cdata.set_quoted('GST_EXTRA_MODULE_SUFFIX', '.dylib') cdata.set_quoted('GST_EXTRA_MODULE_SUFFIX', '.dylib')
# Yes, we set this for iOS too. Same as Autotools.
cdata.set('HAVE_OSX', 1) cdata.set('HAVE_OSX', 1)
else else
cdata.set_quoted('DEFAULT_VIDEOSRC', 'videotestsrc') cdata.set_quoted('DEFAULT_VIDEOSRC', 'videotestsrc')
@ -429,10 +430,9 @@ else
winsock2 = [] winsock2 = []
endif endif
if host_machine.system() == 'darwin' if ['darwin', 'ios'].contains(host_system)
add_languages('objc') add_languages('objc')
mobilecoreservices_dep = dependency('MobileCoreServices', required : false) if host_system == 'ios'
if mobilecoreservices_dep.found()
cdata.set('HAVE_IOS', 1) cdata.set('HAVE_IOS', 1)
endif endif

4
sys/applemedia/meson.build
View file

@ -19,7 +19,7 @@ applemedia_args = [
applemedia_objc_args = [] applemedia_objc_args = []
applemedia_option = get_option('applemedia') applemedia_option = get_option('applemedia')
if host_system != 'darwin' or applemedia_option.disabled() if not ['darwin', 'ios'].contains(host_system) or applemedia_option.disabled()
subdir_done() subdir_done()
endif endif
@ -50,7 +50,7 @@ if videotoolbox_dep.found()
applemedia_frameworks += [videotoolbox_dep] applemedia_frameworks += [videotoolbox_dep]
endif endif
if cdata.has('HAVE_IOS') if host_system == 'ios'
applemedia_sources += [ applemedia_sources += [
'iosassetsrc.m', 'iosassetsrc.m',
'iosglmemory.c' 'iosglmemory.c'

4
sys/decklink/meson.build
View file

@ -31,10 +31,10 @@ else
have_pthread_h = cdata.has('HAVE_PTHREAD_H') have_pthread_h = cdata.has('HAVE_PTHREAD_H')
if libdl.found() and have_pthread_h if libdl.found() and have_pthread_h
decklink_libs = [libm, libdl, dependency('threads')] decklink_libs = [libm, libdl, dependency('threads')]
if host_machine.system() == 'linux' if host_system == 'linux'
decklink_sources += ['linux/DeckLinkAPIDispatch.cpp'] decklink_sources += ['linux/DeckLinkAPIDispatch.cpp']
build_decklink = true build_decklink = true
elif host_machine.system() == 'darwin' elif ['darwin', 'ios'].contains(host_system)
decklink_sources += ['osx/DeckLinkAPIDispatch.cpp'] decklink_sources += ['osx/DeckLinkAPIDispatch.cpp']
decklink_ldflags = ['-Wl,-framework,CoreFoundation'] decklink_ldflags = ['-Wl,-framework,CoreFoundation']
build_decklink = true build_decklink = true

2
sys/shm/meson.build
View file

@ -11,7 +11,7 @@ if get_option('shm').disabled()
endif endif
shm_deps = [] shm_deps = []
if host_system == 'darwin' or host_system.contains('bsd') if ['darwin', 'ios'].contains(host_system) or host_system.endswith('bsd')
rt_dep = [] rt_dep = []
shm_enabled = true shm_enabled = true
else else