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: Pass native: false to add_languages()

Browse source 
This is needed for cross-compiling without a build machine compiler
available. The option was added in 0.54, but we only need this in
Cerbero and it doesn't affect older versions so it should be ok.
Will just cause a spurious warning.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/merge_requests/50>
This commit is contained in:
Nirbheek Chauhan 2020-05-12 05:07:47 +05:30
parent 8fe8ed3dd2
commit 8562bb304d
2 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ext/sidplay/meson.build
View file

@ -1,19 +1,33 @@
sidplay_option = get_option('sidplay')
if sidplay_option.disabled()
subdir_done()
endif
if not add_languages('cpp', native: false, required: sidplay_option)
subdir_done()
endif
if not cxx.has_header('sidplay/player.h', required: sidplay_option)
subdir_done()
endif
sidplay_dep = cxx.find_library('sidplay', required: sidplay_option)
if not sidplay_dep.found()
subdir_done()
endif
# sidplay plugin works with libsidplay 1.36.x (not 2.x.x)
have_sidplay = false
if have_cxx and not get_option('sidplay').disabled()
if cxx.has_header('sidplay/player.h')
sid_code = '''#include <sidplay/player.h>
void somefunc (void) {
sidTune tune = sidTune(0);
}'''
sidplay_dep = cxx.find_library('sidplay', required: get_option('sidplay'))
if sidplay_dep.found()
have_sidplay = cxx.compiles(sid_code, dependencies: sidplay_dep, name : 'sidplay')
endif
if not cxx.compiles(sid_code, dependencies: sidplay_dep, name : 'sidplay usage')
if sidplay_option.enabled()
error('sidplay headers and libraries were found, but were not usable')
endif
subdir_done()
endif
if have_sidplay
gstsid = library('gstsid', 'gstsiddec.cc',
cpp_args : ugly_args,
include_directories : [configinc],
@ -22,6 +36,3 @@ if have_sidplay
install_dir : plugins_install_dir)
pkgconfig.generate(gstsid, install_dir : plugins_pkgconfig_install_dir)
plugins += [gstsid]
elif get_option('sidplay').enabled()
error('sidplay plugin enabled but dependencies not found')
endif

2
meson.build
View file

@ -16,7 +16,7 @@ else
endif
gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
have_cxx = add_languages('cpp', required : false)
have_cxx = add_languages('cpp', native: false, required: false)
glib_req = '>= 2.44.0'
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)