X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=meson.build;h=ace91f107e64adaf64e125c6b3322dc766c6142c;hb=a525a76e54f602b1d05a1f6f889d71abbc7a8d1a;hp=10ad7cd55eaac40bac2fc2e97abf4fa567a11d22;hpb=1ec04817eb0af92f53bf035033876d79117aeff2;p=platform%2Fupstream%2Fgstreamer.git diff --git a/meson.build b/meson.build index 10ad7cd..ace91f1 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gstreamer-full', 'c', - version : '1.19.2.1', - meson_version : '>= 0.59', + version : '1.21.0.1', + meson_version : '>= 0.60.0', default_options : ['buildtype=debugoptimized', # Needed due to https://github.com/mesonbuild/meson/issues/1889, # but this can cause problems in the future. Remove it @@ -16,21 +16,21 @@ fs = import('fs') gnome = import('gnome') pkgconfig = import('pkgconfig') python3 = import('python').find_installation() -# Ensure that we're not being run from inside the gst-uninstalled env +# Ensure that we're not being run from inside the development environment # because that will confuse meson, and it might find the already-built # gstreamer. It's fine if people run `ninja` as long as it doesn't run # reconfigure because ninja doesn't care about the env. -ensure_not_uninstalled = ''' +ensure_not_devenv = ''' import os assert('GST_ENV' not in os.environ) ''' -cmdres = run_command(python3, '-c', ensure_not_uninstalled) +cmdres = run_command(python3, '-c', ensure_not_devenv, check: false) if cmdres.returncode() != 0 - error('Do not run `ninja` or `meson` for gst-build inside the uninstalled environment, you will run into problems') + error('Do not run `ninja reconfigure` or `meson` for gst-build inside the development environment, you will run into problems') endif # Install gst-indent pre-commit hook -run_command(python3, '-c', 'import shutil; shutil.copy("scripts/git-hooks/multi-pre-commit.hook", ".git/hooks/pre-commit")') +run_command(python3, '-c', 'import shutil; shutil.copy("scripts/git-hooks/multi-pre-commit.hook", ".git/hooks/pre-commit")', check: false) # Ensure that the user does not have Strawberry Perl in PATH, since it ships # with a pkg-config.bat and broken pkgconfig files for libffi and zlib. Will @@ -41,7 +41,7 @@ import os assert(r'Strawberry\perl\bin' not in os.environ['PATH']) ''' if build_system == 'windows' and meson.version().version_compare('<0.60.0') - cmdres = run_command(python3, '-c', ensure_no_strawberry_perl) + cmdres = run_command(python3, '-c', ensure_no_strawberry_perl, check: false) if cmdres.returncode() != 0 error('You have Strawberry Perl in PATH which is known to cause build issues with Meson < 0.60.0. Please remove it from PATH, uninstall it, or upgrade Meson.') endif @@ -53,9 +53,9 @@ documented_projects = '' if not meson.is_subproject() and cc.get_id() == 'msvc' uname = find_program('uname', required: false) if uname.found() - ret = run_command(uname, '-o') + ret = run_command(uname, '-o', check: false) if ret.returncode() == 0 and ret.stdout().to_lower() == 'msys' - ret = run_command(uname, '-r') + ret = run_command(uname, '-r', check: false) # The kernel version returned by uname is actually the msys version if ret.returncode() == 0 and ret.stdout().startswith('2') # If a system zlib is found, disable UNIX features in zlib.h and zconf.h @@ -92,7 +92,7 @@ subprojects = [ ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}], ['gstreamer-sharp', { 'option': get_option('sharp') }], - ['pygobject', { 'option': get_option('python'), 'match_gst_version': false, 'sysdep': 'pygobject-3.0', 'sysdep_version': '>= 3.38.1' }], + ['pygobject', { 'option': get_option('python'), 'match_gst_version': false, 'sysdep': 'pygobject-3.0', 'sysdep_version': '>= 3.8' }], ['gst-python', { 'option': get_option('python')}], ['gst-examples', { 'option': get_option('gst-examples'), 'match_gst_versions': false}], ['gst-plugins-rs', { 'option': get_option('rs'), 'match_gst_version': false}], @@ -114,6 +114,14 @@ endif orc_subproject = subproject('orc', required: get_option('orc')) +foreach custom_subproj: get_option('custom_subprojects').split(',') + if custom_subproj != '' + message ('Adding custom subproject ' + custom_subproj) + subprojects += [[custom_subproj, {'match_gst_version': false}]] + endif +endforeach + + subprojects_names = [] plugins_doc_caches = [] orc_update_targets = [] @@ -148,10 +156,6 @@ foreach sp : subprojects orc_update_targets += subproj.get_variable('orc_update_targets', []) subprojects_names += [project_name] - cmdres = run_command(python3, '-c', symlink.format(project_name, meson.current_source_dir())) - if cmdres.returncode() == 0 - message('Created symlink to ' + project_name) - endif if not meson.is_cross_build() and build_infos.get('build-hotdoc', false) if plugins.length() > 0 @@ -230,7 +234,7 @@ pathsep = host_machine.system() == 'windows' ? ';' : ':' all_plugins_paths = pathsep.join(all_plugins_paths) devenv = environment() -devenv.set('GST_PLUGIN_PATH', all_plugins_dirs) +devenv.prepend('GST_PLUGIN_PATH', all_plugins_dirs) devenv.set('CURRENT_GST', meson.current_source_dir()) devenv.set('GST_VERSION', meson.project_version()) devenv.set('GST_ENV', 'gst-' + meson.project_version()) @@ -324,7 +328,7 @@ if get_option('default_library') == 'static' elif cc.get_id() == 'msvc' warning('FIXME: Provide a def file to publish the public symbols') else - error('Failed to link with version script (' + symbol_map + '), check logs for details') + warning('FIXME: Linker does not support the supplied version script (' + symbol_map + '), please disable the "gst-full-version-script" option') endif endif @@ -373,20 +377,12 @@ if get_option('default_library') == 'static' meson.override_dependency('gstreamer-full-1.0', gst_full_dep) endif -foreach custom_subproj: get_option('custom_subprojects').split(',') - if custom_subproj != '' - message ('Adding custom subproject ' + custom_subproj) - subproject(custom_subproj) - subprojects_names += [custom_subproj] - endif -endforeach - message('Building subprojects: ' + ', '.join(subprojects_names)) setenv = find_program('gst-env.py') -devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()), - '--gstbuilddir=@0@'.format(meson.current_build_dir()), - '--srcdir=@0@'.format(meson.project_source_root())] + +devenv_cmd = [setenv, '--builddir=@0@'.format(meson.build_root()), + '--srcdir=@0@'.format(meson.source_root())] subdir('tests') if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows' @@ -399,7 +395,6 @@ if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_ endif endif -run_target('uninstalled', command : devenv_cmd) run_target('devenv', command : devenv_cmd) if orc_subproject.found() and orc_update_targets.length() > 0