From: Tim-Philipp Müller Date: Fri, 19 May 2023 11:36:19 +0000 (+0100) Subject: Back to development X-Git-Tag: 1.22.7~264 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fgstreamer.git;a=commitdiff_plain;h=9994bbbd4ce8ccd4b6c8963199799fc8855b5056 Back to development Part-of: --- diff --git a/meson.build b/meson.build index d35a060..2e7ed87 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62.0', 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 0716e4d..a310ebc 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build index 36f4201..3345e4f 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.22.3', + version: '1.22.3.1', meson_version : '>= 0.62') hotdoc_p = find_program('hotdoc') diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index eb05471..8225a7e 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index a1f1939..6fe82c2 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.22.3', license : 'LGPL') +project('gst-examples', 'c', version : '1.22.3.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 2f325ef..5841c6f 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.22.3', meson_version : '>= 0.62', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.22.3.1', meson_version : '>= 0.62', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 79fc6a7..6d9c448 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index 999c0f2..f1faf60 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -1,5 +1,5 @@ project('gst-omx', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index e1854b7..00497ee 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 1c38ae6..4d8ec52 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', 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 94f57dd..8c7706d 100644 --- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json +++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json @@ -7027,7 +7027,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.22.3 FLV muxer", + "default": "GStreamer 1.22.3.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -7039,7 +7039,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.22.3 FLV muxer", + "default": "GStreamer 1.22.3.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -21257,7 +21257,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.22.3", + "default": "GStreamer/1.22.3.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -21816,7 +21816,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.22.3", + "default": "GStreamer 1.22.3.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -23253,7 +23253,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer souphttpsrc 1.22.3 ", + "default": "GStreamer souphttpsrc 1.22.3.1 ", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 2a8666f..e0cfa79 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-rs.wrap b/subprojects/gst-plugins-rs.wrap index 2db6c69..f4d0b23 100644 --- a/subprojects/gst-plugins-rs.wrap +++ b/subprojects/gst-plugins-rs.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-rs url=https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git push-url=git@gitlab.freedesktop.org:gstreamer/gst-plugins-rs.git -revision=gstreamer-1.22.3 +revision=0.9 diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 7579d08..815ba8b 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 25898b4..316f267 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json index 305eb4f..5cdf62d 100644 --- a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json @@ -333,7 +333,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.22.3", + "default": "GStreamer/1.22.3.1", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index b9d7d0d..d4c8cdf 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.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : ['warning_level=1', 'buildtype=debugoptimized']) diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index 5470ed5..77dae02 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.22.3', +project('gstreamer-sharp', ['cs', 'c'], version: '1.22.3.1', meson_version : '>= 0.62', 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 34722ed..6b84448 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 = 3; public const int PLUGINS_BASE_VERSION_MINOR = 22; - 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 3dd8ba6..55e5b43 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 = 3; public const int VERSION_MINOR = 22; - 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 02886e4..eec02c1 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 dd04729..c15f3f3 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index ec79f59..1952c08 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.22.3', + version : '1.22.3.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ])