meson: Give the same name for api_version in all modules

There were 2 version of it, apiversion and api_version, I chose the one
with most occurencies: `api_version`

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8178>

meson.build

@@ -7,7 +7,7 @@ project('gstreamer-full', 'c',
                      # when it's no longer necessary.
                      'cpp_std=c++14'])
 
-apiversion = '1.0'
+api_version = '1.0'
 gst_version = '>= @0@'.format(meson.project_version())
 
 host_system = host_machine.system()
@@ -371,7 +371,7 @@ configure_file(
 
 if building_full
   cdata = configuration_data()
-  cdata.set_quoted('GST_API_VERSION', apiversion)
+  cdata.set_quoted('GST_API_VERSION', api_version)
   cdata.set_quoted('GETTEXT_PACKAGE', 'gstreamer-full-1.0')
   cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
   cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
@@ -547,7 +547,7 @@ if building_full
     # Loop for tools
     foreach tool, data: all_tools
       gst_tools += tool
-      exe_name = '@0@-@1@'.format(tool, apiversion)
+      exe_name = '@0@-@1@'.format(tool, api_version)
 
       deps = []
       foreach d : data.get('deps', [])

subprojects/gst-devtools/docs/meson.build

@@ -66,7 +66,7 @@ validate_sources = gstvalidate_headers + gstvalidate_sources
 hotdoc = import('hotdoc')
 plugins_doc = []
 libs_doc = [hotdoc.generate_doc('gst-devtools',
-    project_version: apiversion,
+    project_version: api_version,
     sitemap: 'sitemap.txt',
     index: 'index.md',
     gi_c_sources: validate_sources,

subprojects/gst-devtools/meson.build

@@ -17,7 +17,7 @@ else
   TESTSUITE_VERSION = 'master' # FIXME: main?
 endif
 
-apiversion = '1.0'
+api_version = '1.0'
 soversion = 0
 # maintaining compatibility with the previous libtool versioning
 # current = minor * 100 + micro
@@ -78,17 +78,17 @@ if cc.has_argument('-fno-strict-aliasing')
   add_project_arguments('-fno-strict-aliasing', language: 'c')
 endif
 
-gst_dep = dependency('gstreamer-' + apiversion, version : gst_req,
+gst_dep = dependency('gstreamer-' + api_version, version : gst_req,
     fallback : ['gstreamer', 'gst_dep'])
-gstbase_dep = dependency('gstreamer-base-' + apiversion, version : gst_req,
+gstbase_dep = dependency('gstreamer-base-' + api_version, version : gst_req,
     fallback : ['gstreamer', 'gst_base_dep'])
-gstapp_dep = dependency('gstreamer-app-' + apiversion, version : gst_req,
+gstapp_dep = dependency('gstreamer-app-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'app_dep'])
-gst_pbutils_dep = dependency('gstreamer-pbutils-' + apiversion, version : gst_req,
+gst_pbutils_dep = dependency('gstreamer-pbutils-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'pbutils_dep'])
-gst_video_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
+gst_video_dep = dependency('gstreamer-video-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'video_dep'])
-gst_controller_dep = dependency('gstreamer-controller-' + apiversion, version : gst_req,
+gst_controller_dep = dependency('gstreamer-controller-' + api_version, version : gst_req,
     fallback : ['gstreamer', 'gst_controller_dep'])
 gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
   required : get_option('validate'),

subprojects/gst-devtools/validate/data/scenarios/meson.build

@@ -28,15 +28,15 @@ _scenarios = ['simple_seeks.scenario',
 
 install_data(sources: _scenarios,
              install_dir: get_option('datadir') + '/gstreamer-' +
-             apiversion + '/validate/scenarios')
+             api_version + '/validate/scenarios')
 
 install_subdir('includes',
              install_dir: get_option('datadir') + '/gstreamer-' +
-             apiversion + '/validate/scenarios')
+             api_version + '/validate/scenarios')
 
 install_subdir('rtsp_overrides',
              install_dir: get_option('datadir') + '/gstreamer-' +
-             apiversion + '/validate/scenarios')
+             api_version + '/validate/scenarios')
 
 env = environment()
 env.prepend('GST_VALIDATE_SCENARIOS_PATH', meson.current_source_dir())

subprojects/gst-devtools/validate/gst/validate/meson.build

@@ -65,7 +65,7 @@ validate_resources = gnome.compile_resources(
 
 validate_deps = [gst_check_dep, gst_dep, gst_controller_dep, gstbase_dep, gstapp_dep,
                  gio_dep, gmodule_dep, gst_pbutils_dep, mathlib, json_dep]
-gstvalidate = library('gstvalidate-@0@'.format(apiversion),
+gstvalidate = library('gstvalidate-@0@'.format(api_version),
     sources: gstvalidate_sources + gst_validate_enums + runner_file + validate_resources,
     version : libversion,
     soversion : soversion,
@@ -114,8 +114,8 @@ if build_gir
                         'GLib-2.0',
                         'Gio-2.0',
                         'GModule-2.0',
-                        'Gst-' + apiversion,
+                        'Gst-' + api_version,
-                        'GstPbutils-' + apiversion],
+                        'GstPbutils-' + api_version],
             'install' : true,
             'dependencies' : validate_deps,
             'extra_args' : gst_validate_gir_extra_args,

subprojects/gst-devtools/validate/meson.build

@@ -7,7 +7,7 @@ cdata.set('VERSION', '"@0@"'.format(gst_version))
 cdata.set('PACKAGE', '"gst-validate"')
 cdata.set('GST_PACKAGE_NAME', '"GStreamer Validate"')
 cdata.set('GST_PACKAGE_ORIGIN', '"Unknown package origin"')
-cdata.set('GST_API_VERSION', '"@0@"'.format(apiversion))
+cdata.set('GST_API_VERSION', '"@0@"'.format(api_version))
 cdata.set('VALIDATEPLUGINDIR', '"@0@/@1@/gstreamer-1.0/validate"'.format(get_option('prefix'),get_option('libdir')))
 cdata.set('GST_DATADIR', '"@0@/@1@"'.format(prefix, get_option('datadir')))
 cdata.set('PACKAGE_NAME', '"GStreamer Validate"')

subprojects/gst-devtools/validate/tests/meson.build

@@ -1,6 +1,6 @@
 pluginsdirs = [  ]
 if gst_dep.type_name() == 'pkgconfig'
-  pbase = dependency('gstreamer-plugins-base-' + apiversion)
+  pbase = dependency('gstreamer-plugins-base-' + api_version)
 
   pluginsdirs = [gst_dep.get_variable('pluginsdir'),
                  pbase.get_variable('pluginsdir')]

subprojects/gst-devtools/validate/tools/meson.build

@@ -17,10 +17,10 @@ if validate_video_dep.found()
     },
   }
 else
-    message('Can not build gst-validate-images-check' + apiversion)
+    message('Can not build gst-validate-images-check' + api_version)
 endif
 
-rtsp_server_dep = dependency('gstreamer-rtsp-server-' + apiversion,
+rtsp_server_dep = dependency('gstreamer-rtsp-server-' + api_version,
   fallback: ['gst-rtsp-server', 'gst_rtsp_server_dep'],
   version : gst_req,
   required: false)
@@ -32,10 +32,10 @@ if rtsp_server_dep.found()
       }
     }
 else
-    message('Can not build gst-validate-rtsp-server-' + apiversion)
+    message('Can not build gst-validate-rtsp-server-' + api_version)
 endif
 
-gst_transcoder_dep = dependency('gstreamer-transcoder-' + apiversion, version : gst_req,
+gst_transcoder_dep = dependency('gstreamer-transcoder-' + api_version, version : gst_req,
     fallback : ['gst-plugins-bad', 'gst_transcoder_dep'], required: false)
 if gst_transcoder_dep.found()
     gst_tools += {'gst-validate-transcoding': {
@@ -44,14 +44,14 @@ if gst_transcoder_dep.found()
       }
     }
 else
-  message('Can not build gst-validate-transcoding-' + apiversion)
+  message('Can not build gst-validate-transcoding-' + api_version)
 endif
 
 if not get_option('tools').disabled() and not static_build
 
   foreach tool, data: gst_tools
     if not data.has_key('config_data')
-      exe_name = '@0@-@1@'.format(tool, apiversion)
+      exe_name = '@0@-@1@'.format(tool, api_version)
       executable(
         exe_name,
         data.get('files'),

subprojects/gst-docs/meson.build

@@ -17,7 +17,7 @@ endif
 hotdoc = import('hotdoc')
 hotdoc_subprojects = []
 
-apiversion = '1.0'
+api_version = '1.0'
 if host_machine.system() == 'windows'
   pathsep = ';'
 else
@@ -88,7 +88,7 @@ if built_subprojects != ''
         endif
     endforeach
 endif
-deps += [dependency('gstreamer-' + apiversion, fallback: ['gstreamer', 'gst_dep'])]
+deps += [dependency('gstreamer-' + api_version, fallback: ['gstreamer', 'gst_dep'])]
 
 if get_option('use_portal_index')
   index = 'markdown/index.md'
@@ -104,7 +104,7 @@ sitemap = configure_file(command: [sitemap_gen, '@INPUT@', '@OUTPUT@',
 html_theme = 'https://github.com/hotdoc/hotdoc_lumen_theme/releases/download/0.16/hotdoc_lumen_theme-0.16.tar.xz?sha256=b7d7dde51285d1c90836c44ae298754e4cfa957e9a6d14ee5844b8a2cac04b5a'
 
 gstreamer_doc = hotdoc.generate_doc('GStreamer',
-    project_version: apiversion,
+    project_version: api_version,
     sitemap: sitemap,
     index: index,
     gi_index: index,
@@ -137,7 +137,7 @@ meson.add_devenv({'XDG_DATA_DIRS': meson.current_build_dir() / 'GStreamer-doc'},
   method: 'prepend')
 
 cdata = configuration_data()
-cdata.set('GST_API_VERSION', apiversion)
+cdata.set('GST_API_VERSION', api_version)
 readme = configure_file(input: 'scripts/RELEASE_README.md',
                output: 'README.md',
                configuration : cdata)

subprojects/gst-editing-services/docs/meson.build

@@ -32,7 +32,7 @@ if gst_dep.type_name() == 'internal'
     plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
 else
     plugins_cache_generator = find_program('gst-plugins-doc-cache-generator',
-        dirs: [join_paths(gst_dep.get_variable('libexecdir', default_value: ''), 'gstreamer-' + apiversion)],
+        dirs: [join_paths(gst_dep.get_variable('libexecdir', default_value: ''), 'gstreamer-' + api_version)],
         required: false)
 endif
 
@@ -100,7 +100,7 @@ endforeach
 
 hotdoc = import('hotdoc')
 libs_doc = [hotdoc.generate_doc('gst-editing-services',
-    project_version: apiversion,
+    project_version: api_version,
     extra_assets: [join_paths(meson.current_source_dir(), 'images')],
     gi_c_sources: ges_sources + ges_headers,
     gi_c_source_roots: [join_paths(meson.current_source_dir(), '../ges/')],
@@ -126,7 +126,7 @@ gst_plugins_doc = run_command(
     plugins_cache_generator,
     'hotdoc-config',
     '--builddir', meson.current_build_dir(),
-    '--project_version', apiversion,
+    '--project_version', api_version,
     '--sitemap', cdir / 'plugins/sitemap.txt',
     '--index', cdir / 'plugins/index.md',
     '--gst_index', cdir / 'plugins/index.md',

subprojects/gst-editing-services/ges/meson.build

@@ -210,7 +210,7 @@ if build_gir
     gir = {
         'sources' : ges_sources + ges_headers,
         'namespace' : 'GES',
-        'nsversion' : apiversion,
+        'nsversion' : api_version,
         'identifier_prefix' : 'GES',
         'symbol_prefix' : 'ges',
         'export_packages' : pkg_name,

subprojects/gst-editing-services/meson.build

@@ -19,7 +19,7 @@ endif
 gst_version_is_stable = gst_version_minor.is_even()
 gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
 
-apiversion = '1.0'
+api_version = '1.0'
 soversion = 0
 # maintaining compatibility with the previous libtool versioning
 # current = minor * 100 + micro
@@ -92,13 +92,13 @@ cdata.set_quoted('GST_PACKAGE_ORIGIN', 'Unknown package origin')
 cdata.set_quoted('GST_LICENSE', 'LGPL')
 
 # Mandatory GST deps
-gst_dep = dependency('gstreamer-' + apiversion, version : gst_req,
+gst_dep = dependency('gstreamer-' + api_version, version : gst_req,
     fallback : ['gstreamer', 'gst_dep'])
-gstpbutils_dep = dependency('gstreamer-pbutils-' + apiversion, version : gst_req,
+gstpbutils_dep = dependency('gstreamer-pbutils-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'pbutils_dep'])
-gstvideo_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
+gstvideo_dep = dependency('gstreamer-video-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'video_dep'])
-gstaudio_dep = dependency('gstreamer-audio-' + apiversion, version : gst_req,
+gstaudio_dep = dependency('gstreamer-audio-' + api_version, version : gst_req,
     fallback : ['gst-plugins-base', 'audio_dep'])
 gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
     fallback : ['gstreamer', 'gst_base_dep'])

subprojects/gst-editing-services/tests/check/meson.build

@@ -44,8 +44,8 @@ test_defines = [
 
 pluginsdirs = []
 if gst_dep.type_name() == 'pkgconfig'
-  pbase = dependency('gstreamer-plugins-base-' + apiversion, required : false)
+  pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)
-  pbad = dependency('gstreamer-plugins-bad-' + apiversion, required : false)
+  pbad = dependency('gstreamer-plugins-bad-' + api_version, required : false)
 
   pluginsdirs = [gst_dep.get_variable('pluginsdir'),
                  pbase.get_variable('pluginsdir'),

subprojects/gst-editing-services/tests/validate/meson.build

@@ -8,7 +8,7 @@ env = environment()
 env.prepend('GST_VALIDATE_APPS_DIR', meson.current_source_dir())
 meson.add_devenv(env)
 
-gst_tester = find_program('gst-tester-@0@'.format(apiversion), required: get_option('tests'))
+gst_tester = find_program('gst-tester-@0@'.format(api_version), required: get_option('tests'))
 if not gst_tester.found()
     subdir_done()
 endif

subprojects/gst-editing-services/tools/meson.build

@@ -13,16 +13,16 @@ gst_tools = {
   'ges-launch': {
     'files': ges_launch_files,
     'deps': deps,
-    'extra_c_args': [ges_tool_args] + ['-DG_LOG_DOMAIN="ges-launch-@0@"'.format(apiversion)],
+    'extra_c_args': [ges_tool_args] + ['-DG_LOG_DOMAIN="ges-launch-@0@"'.format(api_version)],
     'man_page': man_page,
   },
 }
 
 if not get_option('tools').disabled() and not static_build
   # FIXME: need ges_launch in the tests.
-  ges_launch = executable('ges-launch-@0@'.format(apiversion),
+  ges_launch = executable('ges-launch-@0@'.format(api_version),
       ges_launch_files,
-      c_args : [ges_tool_args] + ['-DG_LOG_DOMAIN="ges-launch-@0@"'.format(apiversion)],
+      c_args : [ges_tool_args] + ['-DG_LOG_DOMAIN="ges-launch-@0@"'.format(api_version)],
       dependencies : deps,
       install: true
   )

subprojects/gst-python/testsuite/meson.build

@@ -40,12 +40,12 @@ gst_deps_defs = [
   ['gstreamer-rtsp-server', ['gst-rtsp-server', 'gst_rtsp_server_dep'], 'gst_rtsp_server'],
 ]
 
-apiversion = '1.0'
+api_version = '1.0'
 gst_required_version = '>=@0@'.format(meson.project_version())
 gst_deps = []
 
 foreach dep: gst_deps_defs
-  gst_deps += [dependency(dep.get(0) + '-' + apiversion, version: gst_required_version,
+  gst_deps += [dependency(dep.get(0) + '-' + api_version, version: gst_required_version,
     fallback: dep.get(1))]
 endforeach
 

subprojects/gstreamer-sharp/meson.build

@@ -56,7 +56,7 @@ diff = find_program('Tests/test_abi.py')
 
 # TODO Handle monodoc
 
-apiversion = '1.0'
+api_version = '1.0'
 gst_required_version = '>=@0@'.format(meson.project_version())
 gst_deps = []
 
@@ -81,11 +81,11 @@ gst_deps_defs = [
 ]
 
 foreach dep: gst_deps_defs
-  gst_deps += [dependency(dep.get(0) + '-' + apiversion, version: gst_required_version,
+  gst_deps += [dependency(dep.get(0) + '-' + api_version, version: gst_required_version,
     fallback: dep.get(1))]
 endforeach
 
-ges_dep = dependency('gst-editing-services-' + apiversion, version: gst_required_version,
+ges_dep = dependency('gst-editing-services-' + api_version, version: gst_required_version,
     fallback: ['gst-editing-services', 'ges_dep'], required: false)
 
 if ges_dep.found()

subprojects/gstreamer/data/bash-completion/helpers/meson.build

@@ -1,7 +1,7 @@
 bash_helper_conf = configuration_data()
 bash_helper_conf.set('GST_COMPLETION_HELPER_INSTALLED',
     join_paths(prefix, helpers_install_dir, 'gst-completion-helper'))
-bash_helper_conf.set('GST_API_VERSION', apiversion)
+bash_helper_conf.set('GST_API_VERSION', api_version)
 
 configure_file(input : 'gst.in',
     output : 'gst',

subprojects/gstreamer/docs/meson.build

@@ -99,7 +99,7 @@ endforeach
 
 build_hotdoc = true
 docconf = configuration_data()
-docconf.set('GST_API_VERSION', apiversion)
+docconf.set('GST_API_VERSION', api_version)
 
 version_entities = configure_file(input : 'version.in',
     output : 'gst_api_version.md',
@@ -122,7 +122,7 @@ foreach h: ['gettext.h', 'glib-compat-private.h', 'glib-compat.h',
 endforeach
 
 libs_doc = [hotdoc.generate_doc('gstreamer',
-    project_version: apiversion,
+    project_version: api_version,
     gi_c_sources: '../gst/*.[hc]',
     gi_sources: [gst_gir[0].full_path()],
     gi_c_source_filters: gst_excludes,
@@ -148,7 +148,7 @@ foreach lib: libs
   gir = lib[1]
   deps = [lib[2], gir]
   libs_doc += [hotdoc.generate_doc(name,
-      project_version: apiversion,
+      project_version: api_version,
       gi_c_sources: ['../libs/gst/' + name + '/*.[hc]'],
       gi_c_source_filters: gst_excludes,
       gi_sources: gir[0].full_path(),
@@ -174,7 +174,7 @@ gst_plugins_doc = run_command(
     plugins_cache_generator,
     'hotdoc-config',
     '--builddir', meson.current_build_dir(),
-    '--project_version', apiversion,
+    '--project_version', api_version,
     '--sitemap', cdir / 'plugins/sitemap.txt',
     '--index', cdir / 'plugins/index.md',
     '--gst_index', cdir / 'plugins/index.md',

subprojects/gstreamer/gst/meson.build

@@ -314,7 +314,7 @@ if build_gir
   gir = {
     'sources' : gst_sources + gst_headers + gst_enums + [gst_version_h],
     'namespace' : 'Gst',
-    'nsversion' : apiversion,
+    'nsversion' : api_version,
     'identifier_prefix' : 'Gst',
     'symbol_prefix' : 'gst',
     'export_packages' : pkg_name,

subprojects/gstreamer/libs/gst/base/meson.build

@@ -38,7 +38,7 @@ gst_base_headers = files(
   'gsttypefindhelper.h',
 )
 
-gst_base = library('gstbase-@0@'.format(apiversion),
+gst_base = library('gstbase-@0@'.format(api_version),
   gst_base_sources,
   c_args : gst_c_args + ['-DBUILDING_GST_BASE', '-DG_LOG_DOMAIN="GStreamer-Base"'],
   version : libversion,
@@ -65,7 +65,7 @@ if build_gir
   gir = {
     'sources' : gst_base_sources + gst_base_headers,
     'namespace' : 'GstBase',
-    'nsversion' : apiversion,
+    'nsversion' : api_version,
     'identifier_prefix' : 'Gst',
     'symbol_prefix' : 'gst',
     'export_packages' : pkg_name,

subprojects/gstreamer/libs/gst/check/meson.build

@@ -37,7 +37,7 @@ configure_file(input : 'libcheck/check.h.in',
   install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/check'),
   configuration : check_cdata)
 
-gst_check = library('gstcheck-@0@'.format(apiversion),
+gst_check = library('gstcheck-@0@'.format(api_version),
   gst_check_sources,
   c_args : gst_c_args + ['-UG_DISABLE_ASSERT', '-DBUILDING_GST_CHECK', '-DG_LOG_DOMAIN="GStreamer-Check"'],
   version : libversion,
@@ -69,7 +69,7 @@ if build_gir
   gir = {
     'sources' : gst_check_sources + gst_check_headers,
     'namespace' : 'GstCheck',
-    'nsversion' : apiversion,
+    'nsversion' : api_version,
     'identifier_prefix' : 'Gst',
     'symbol_prefix' : 'gst',
     'export_packages' : pkg_name,

subprojects/gstreamer/libs/gst/controller/meson.build

@@ -37,7 +37,7 @@ gstcontroller_c = controller_enums[0]
 gstcontroller_h = controller_enums[1]
 
 gst_controller_gen_sources = [gstcontroller_h]
-gst_controller = library('gstcontroller-@0@'.format(apiversion),
+gst_controller = library('gstcontroller-@0@'.format(api_version),
   gst_controller_sources, gstcontroller_h, gstcontroller_c,
   c_args : gst_c_args + ['-DBUILDING_GST_CONTROLLER', '-DG_LOG_DOMAIN="GStreamer-Controller"'],
   install : true,
@@ -63,7 +63,7 @@ if build_gir
   gir = {
     'sources' : gst_controller_sources + gst_controller_headers + [gstcontroller_h] + [gstcontroller_c],
     'namespace': 'GstController',
-    'nsversion': apiversion,
+    'nsversion': api_version,
     'identifier_prefix' : 'Gst',
     'symbol_prefix' : 'gst',
     'export_packages' : pkg_name,

subprojects/gstreamer/libs/gst/helpers/meson.build

@@ -46,7 +46,7 @@ gst_scanner_dir = meson.current_build_dir()
 
 
 install_data(['gst_gdb.py', 'glib_gobject_helper.py'],
-  install_dir : join_paths(get_option('datadir'), 'gstreamer-@0@'.format(apiversion), 'gdb'),
+  install_dir : join_paths(get_option('datadir'), 'gstreamer-@0@'.format(api_version), 'gdb'),
   install_tag : 'devel')
 
 # This is needed to make gdb find gst_gdb.py
@@ -55,7 +55,7 @@ env.prepend('PYTHONPATH', meson.current_source_dir())
 meson.add_devenv(env)
 
 gdbconf = configuration_data()
-gdbconf.set('GST_API_VERSION', apiversion)
+gdbconf.set('GST_API_VERSION', api_version)
 gdbconf.set('DATADIR', '@0@/@1@'.format(get_option('prefix'), get_option('datadir')))
 
 if host_system != 'windows'
@@ -68,7 +68,7 @@ else
   gdb_install_dir = disabler()
 endif
 configure_file(input : 'libgstreamer-gdb.py.in',
-  output : 'libgstreamer-@0@.so.@1@-gdb.py'.format(apiversion, libversion),
+  output : 'libgstreamer-@0@.so.@1@-gdb.py'.format(api_version, libversion),
   install_dir : gdb_install_dir,
   install_tag : 'devel',
   configuration : gdbconf)

subprojects/gstreamer/libs/gst/net/meson.build

@@ -24,7 +24,7 @@ gst_net_headers = files(
 install_headers(gst_net_headers, subdir : 'gstreamer-1.0/gst/net/')
 
 gst_net_gen_sources = []
-gst_net = library('gstnet-@0@'.format(apiversion),
+gst_net = library('gstnet-@0@'.format(api_version),
   gst_net_sources,
   c_args : gst_c_args + ['-DBUILDING_GST_NET', '-DG_LOG_DOMAIN="GStreamer-Net"'],
   include_directories : [configinc, libsinc],
@@ -50,7 +50,7 @@ if build_gir
   gir = {
     'sources' : gst_net_sources + gst_net_headers,
     'namespace' : 'GstNet',
-    'nsversion' : apiversion,
+    'nsversion' : api_version,
     'identifier_prefix' : 'Gst',
     'symbol_prefix' : 'gst',
     'export_packages' : pkg_name,

subprojects/gstreamer/meson.build

@@ -16,7 +16,7 @@ else
 endif
 gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
 
-apiversion = '1.0'
+api_version = '1.0'
 soversion = 0
 # maintaining compatibility with the previous libtool versioning
 # current = minor * 100 + micro
@@ -130,7 +130,7 @@ if disable_glib_checks
   add_project_arguments('-DG_DISABLE_CHECKS', language: 'c')
 endif
 
-cdata.set_quoted('GST_API_VERSION', apiversion)
+cdata.set_quoted('GST_API_VERSION', api_version)
 cdata.set_quoted('GST_DATADIR', datadir)
 cdata.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
 cdata.set_quoted('LIBDIR', join_paths(prefix, get_option('libdir')))

subprojects/gstreamer/tests/validate/meson.build

@@ -1,4 +1,4 @@
-gst_tester = executable('gst-tester-' + apiversion,
+gst_tester = executable('gst-tester-' + api_version,
     'gst-tester.c',
     c_args : gst_c_args,
     include_directories : [configinc],
@@ -7,7 +7,7 @@ gst_tester = executable('gst-tester-' + apiversion,
     dependencies : [gio_dep],
 )
 
-meson.override_find_program('gst-tester-' + apiversion, gst_tester)
+meson.override_find_program('gst-tester-' + api_version, gst_tester)
 
 tests = [
     'simplest',

subprojects/gstreamer/tools/meson.build

@@ -20,7 +20,7 @@ if gst_parse
 endif
 
 foreach tool : tools
-  exe_name = '@0@-@1@'.format(tool, apiversion)
+  exe_name = '@0@-@1@'.format(tool, api_version)
   src_file = '@0@.c'.format(tool)
   extra_deps = []
   extra_c_args = []