From 5ca7a02371dda95481c151edd2a0ddd9753cfa77 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 1 Sep 2018 09:30:23 +0530 Subject: [PATCH] meson: Fix osxaudio build on iOS Must define HAVE_IOS, and use appleframeworks dependency to ensure the right frameworks are picked up. --- meson.build | 3 ++- sys/osxaudio/meson.build | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index d861fdf..a37c7c4 100644 --- a/meson.build +++ b/meson.build @@ -134,7 +134,6 @@ check_functions = [ ['HAVE_GETPAGESIZE', 'getpagesize', '#include'], # check token HAVE_GETTEXT # check token HAVE_GST_V4L2 -# check token HAVE_IOS ['HAVE_ISINF', 'isinf', '#include'], # check token HAVE_LIBV4L2 ['HAVE_MMAP', 'mmap', '#include'], @@ -154,6 +153,8 @@ foreach f : check_functions endif endforeach +cdata.set('HAVE_IOS', host_system == 'ios') + cdata.set('SIZEOF_CHAR', cc.sizeof('char')) cdata.set('SIZEOF_INT', cc.sizeof('int')) cdata.set('SIZEOF_LONG', cc.sizeof('long')) diff --git a/sys/osxaudio/meson.build b/sys/osxaudio/meson.build index 995705f..4a33028 100644 --- a/sys/osxaudio/meson.build +++ b/sys/osxaudio/meson.build @@ -27,16 +27,17 @@ if not have_osxaudio and osxaudio_option.enabled() endif if have_osxaudio - osxaudio_dep = [dependency('CoreAudio'), dependency('AudioToolbox')] + modules = ['CoreAudio', 'AudioToolBox'] if host_system == 'darwin' - osxaudio_dep += [dependency('AudioUnit'), dependency('CoreServices')] + modules += ['AudioUnit', 'CoreServices'] endif + osxaudio_dep = dependency('appleframeworks', modules : modules) gstosxaudio = library('gstosxaudio', osxaudio_sources, c_args : gst_plugins_good_args, include_directories : [configinc, libsinc], - dependencies : [gstaudio_dep] + osxaudio_dep, + dependencies : [gstaudio_dep, osxaudio_dep], install : true, install_dir : plugins_install_dir) pkgconfig.generate(gstosxaudio, install_dir : plugins_pkgconfig_install_dir) -- 2.7.4