rtpac3depay: should output audio/x-ac3 not audio/ac3

[platform/upstream/gstreamer.git] / meson.build

diff --git a/meson.build b/meson.build
index b762870..fb1c54b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer-full', 'c',
-  version : '1.21.0.1',
+  version : '1.22.7.1',
   meson_version : '>= 0.62.0',
   default_options : ['buildtype=debugoptimized',
                      # Needed due to https://github.com/mesonbuild/meson/issues/1889,
@@ -77,15 +77,15 @@ if not meson.is_subproject() and cc.get_id() == 'msvc'
 endif
 
 building_full = get_option('default_library') == 'static'
-tools_option = 'tools=auto'
+tools_option = []
 if building_full and not get_option('tools').disabled()
   # Do not build subprojects tools when we build them against gst-full
-  tools_option = 'tools=disabled'
+  tools_option = ['tools=disabled']
 endif
 
 # Ordered list of subprojects (dict has no ordering guarantees)
 subprojects = [
-  ['gstreamer', {'build-hotdoc': true, 'subproject_options': [tools_option]}],
+  ['gstreamer', {'build-hotdoc': true, 'subproject_options': tools_option}],
   ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}],
   ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}],
   ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}],
@@ -93,9 +93,9 @@ subprojects = [
   ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}],
   ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}],
   ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}],
-  ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true, 'subproject_options': [tools_option]}],
+  ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true, 'subproject_options': tools_option}],
   ['gst-integration-testsuites', { 'option': get_option('devtools') }],
-  ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true, 'subproject_options': [tools_option]}],
+  ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true, 'subproject_options': tools_option}],
   ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}],
   ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}],
   ['gstreamer-sharp', { 'option': get_option('sharp') }],
@@ -154,10 +154,7 @@ foreach sp : subprojects
   if match_gst_version
     subproj = subproject(project_name, version: gst_version, required: is_required, default_options: default_options)
   elif sysdep != ''
-      sysdep_dep = dependency(sysdep, version: sysdep_version, required: false, default_options: default_options)
-      if not sysdep_dep.found()
-        subproj = subproject(project_name, required: is_required, default_options: default_options)
-      endif
+    sysdep_dep = dependency(sysdep, version: sysdep_version, required: is_required, default_options: default_options)
   else
     subproj = subproject(project_name, required: is_required, default_options: default_options)
   endif
@@ -256,7 +253,11 @@ configure_file(
 )
 
 if documented_projects != ''
-  subproject('gst-docs', required: get_option('doc').enabled())
+  gst_doc = subproject('gst-docs', required: get_option('doc').enabled())
+  if gst_doc.found()
+    gst_doc_target = gst_doc.get_variable('gstreamer_doc')
+    alias_target('gst-doc', gst_doc_target)
+  endif
   message('Gst docs subprojects: ' + documented_projects)
 endif
 
@@ -267,7 +268,7 @@ foreach plugin: all_plugins
   plugin_path = plugin.get_variable('full_path')
   all_plugins_paths += plugin_path
   all_plugins_dirs += fs.parent(plugin_path)
-  plugins_names += plugin_path
+  plugins_names += fs.name(plugin_path)
 endforeach
 
 # Work around meson bug: https://github.com/mesonbuild/meson/pull/6770
@@ -492,6 +493,8 @@ if orc_subproject.found() and orc_update_targets.length() > 0
   alias_target('update-orc-dist', orc_update_targets)
 endif
 
+subdir('scripts')
+
 dotnet_format = find_program('dotnet-format', required: false)
 if dotnet_format.found()
     run_target('csharp_format_check',