From 4a99827d4ce4d61e2daec9ee955f377e1193101b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 20 Dec 2022 00:39:36 +0000 Subject: [PATCH] Back to development --- meson.build | 2 +- subprojects/gst-devtools/meson.build | 2 +- subprojects/gst-docs/meson.build | 2 +- subprojects/gst-editing-services/meson.build | 2 +- subprojects/gst-examples/meson.build | 2 +- .../gst-integration-testsuites/meson.build | 2 +- subprojects/gst-libav/meson.build | 2 +- subprojects/gst-omx/meson.build | 2 +- subprojects/gst-plugins-bad/meson.build | 2 +- subprojects/gst-plugins-base/meson.build | 2 +- .../gst-plugins-good/docs/gst_plugins_cache.json | 8 ++++---- subprojects/gst-plugins-good/meson.build | 2 +- subprojects/gst-plugins-ugly/meson.build | 2 +- subprojects/gst-python/meson.build | 2 +- .../gst-rtsp-server/docs/gst_plugins_cache.json | 2 +- subprojects/gst-rtsp-server/meson.build | 2 +- subprojects/gstreamer-sharp/meson.build | 2 +- .../sources/generated/Gst.PbUtils/Constants.cs | 2 +- .../sources/generated/Gst/Constants.cs | 2 +- .../sources/generated/gstreamer-sharp-api.xml | 16 ++++++++-------- subprojects/gstreamer-vaapi/meson.build | 2 +- subprojects/gstreamer/meson.build | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/meson.build b/meson.build index bf8415d0ae..46f4a2ecb2 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : ['buildtype=debugoptimized', # Needed due to https://github.com/mesonbuild/meson/issues/1889, diff --git a/subprojects/gst-devtools/meson.build b/subprojects/gst-devtools/meson.build index 92860673b5..0a64c5380a 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build index 4f0f54943c..c08c0ed1bd 100644 --- a/subprojects/gst-docs/meson.build +++ b/subprojects/gst-docs/meson.build @@ -1,5 +1,5 @@ project('GStreamer manuals and tutorials', 'c', - version: '1.20.5', + version: '1.20.5.1', meson_version : '>= 0.59') hotdoc_p = find_program('hotdoc') diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index 63ca7e6d06..079ffc581d 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -1,5 +1,5 @@ project('gst-editing-services', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index ca960b8356..a22be959ec 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.20.5', license : 'LGPL') +project('gst-examples', 'c', version : '1.20.5.1', license : 'LGPL') cc = meson.get_compiler('c') m_dep = cc.find_library('m', required : false) diff --git a/subprojects/gst-integration-testsuites/meson.build b/subprojects/gst-integration-testsuites/meson.build index 15c1f1061b..2585aaba7c 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.20.5', meson_version : '>= 0.59', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.20.5.1', meson_version : '>= 0.59', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 959b163c45..ff3fedc918 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index 22c21f9c8b..ae90ec9264 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -1,5 +1,5 @@ project('gst-omx', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index ae98612fcf..18ce86e493 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-bad', 'c', 'cpp', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 0beccf0045..24183b3eb2 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-base', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json index c73b9b3707..f0dc768523 100644 --- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json +++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json @@ -6607,7 +6607,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.20.5 FLV muxer", + "default": "GStreamer 1.20.5.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -6619,7 +6619,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.20.5 FLV muxer", + "default": "GStreamer 1.20.5.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -20478,7 +20478,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.20.5", + "default": "GStreamer/1.20.5.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -22435,7 +22435,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer souphttpsrc 1.20.5 ", + "default": "GStreamer souphttpsrc 1.20.5.1 ", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index a68126b899..2faf95a2cb 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-good', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 516fce8737..5df913ba13 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-ugly', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 40e58eded8..eecda28a24 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-rtsp-server/docs/gst_plugins_cache.json b/subprojects/gst-rtsp-server/docs/gst_plugins_cache.json index 39c5b1922f..577af7a7e5 100644 --- a/subprojects/gst-rtsp-server/docs/gst_plugins_cache.json +++ b/subprojects/gst-rtsp-server/docs/gst_plugins_cache.json @@ -321,7 +321,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.20.5", + "default": "GStreamer/1.20.5.1", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index 4d830fda33..9a633a6774 100644 --- a/subprojects/gst-rtsp-server/meson.build +++ b/subprojects/gst-rtsp-server/meson.build @@ -1,5 +1,5 @@ project('gst-rtsp-server', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : ['warning_level=1', 'buildtype=debugoptimized']) diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index d7d8ea3d8f..719b2884dd 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.20.5', +project('gstreamer-sharp', ['cs', 'c'], version: '1.20.5.1', meson_version : '>= 0.59', license: 'LGPL') if host_machine.system() == 'osx' diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs index 5f37fb31f1..aba84b4fed 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs @@ -19,7 +19,7 @@ namespace Gst.PbUtils { public const int PLUGINS_BASE_VERSION_MAJOR = 1; public const int PLUGINS_BASE_VERSION_MICRO = 5; public const int PLUGINS_BASE_VERSION_MINOR = 20; - public const int PLUGINS_BASE_VERSION_NANO = 0; + public const int PLUGINS_BASE_VERSION_NANO = 1; #endregion } } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs index b8575106f5..2e99326de9 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs @@ -172,7 +172,7 @@ namespace Gst { public const int VERSION_MAJOR = 1; public const int VERSION_MICRO = 5; public const int VERSION_MINOR = 20; - public const int VERSION_NANO = 0; + public const int VERSION_NANO = 1; #endregion } } diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml index 878b839335..c988c5597b 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml @@ -12127,10 +12127,10 @@ - - - - + + + + @@ -21582,10 +21582,10 @@ - - - - + + + + diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index 322bcac96a..31d68997d9 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index ce860ed140..102ec210f1 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.20.5', + version : '1.20.5.1', meson_version : '>= 0.59', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ])