diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2022-10-04 03:57:31 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2022-10-04 03:57:31 +0100 |
commit | 99bbb1ef359f6b9d962b2cb9f66a74fe3bb31280 (patch) | |
tree | 59b0a5c5db83f81293185eb6f895bd77dbf2e29f | |
parent | 9820e58be68004fcfe674eb577efb5cae203c65d (diff) | |
download | gstreamer-99bbb1ef359f6b9d962b2cb9f66a74fe3bb31280.tar.gz |
Back to development
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3115>
22 files changed, 33 insertions, 33 deletions
diff --git a/meson.build b/meson.build index 99eb94aae9..1fabfafe1c 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.21.1', + version : '1.21.1.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 3c0e738677..a181ce8374 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.21.1', + version : '1.21.1.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 3ec468b65e..76eb933b18 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.21.1', + version: '1.21.1.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 02e67350f7..8794e97249 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.21.1', + version : '1.21.1.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 6cb4f640ab..2a207a3dfa 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.21.1', license : 'LGPL') +project('gst-examples', 'c', version : '1.21.1.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 679e4fbfd3..87e37b0cbb 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.21.1', meson_version : '>= 0.62', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.21.1.1', meson_version : '>= 0.62', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 41fa130462..28e9446214 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.21.1', + version : '1.21.1.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 9f9bfe06c2..b6d828ba73 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -1,5 +1,5 @@ project('gst-omx', 'c', - version : '1.21.1', + version : '1.21.1.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 3b8cdbeec3..2e976a8238 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.21.1', + version : '1.21.1.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 b6c11cf0cd..277d8fc0d0 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.21.1', + version : '1.21.1.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 216033c0b9..caef5ceaa6 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.21.1 FLV muxer", + "default": "GStreamer 1.21.1.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -7039,7 +7039,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.21.1 FLV muxer", + "default": "GStreamer 1.21.1.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -21184,7 +21184,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.21.1", + "default": "GStreamer/1.21.1.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -21728,7 +21728,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.21.1", + "default": "GStreamer 1.21.1.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -23165,7 +23165,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer souphttpsrc 1.21.1 ", + "default": "GStreamer souphttpsrc 1.21.1.1 ", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index dd8eadca71..6b86ba109a 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.21.1', + version : '1.21.1.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 03fc6c93e9..9f18f92b4c 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.21.1', + version : '1.21.1.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 2748296e46..7717980fc1 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.21.1', + version : '1.21.1.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 d94ee529fa..72a36c2732 100644 --- a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json @@ -321,7 +321,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.21.1", + "default": "GStreamer/1.21.1.1", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index d6133020fd..1971005631 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.21.1', + version : '1.21.1.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 99ea048a4d..f84d8da05b 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.21.1', +project('gstreamer-sharp', ['cs', 'c'], version: '1.21.1.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 aa16a53405..2dd4e3363a 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 = 1; public const int PLUGINS_BASE_VERSION_MINOR = 21; - 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 93a795e152..72cfe488e3 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 = 1; public const int VERSION_MINOR = 21; - 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 0ad5e1fb68..8f65100446 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 @@ <constant value="1" ctype="gint" gtype="gint" name="VALUE_GREATER_THAN" /> <constant value="-1" ctype="gint" gtype="gint" name="VALUE_LESS_THAN" /> <constant value="2" ctype="gint" gtype="gint" name="VALUE_UNORDERED" /> - <constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" /> - <constant value="1" ctype="gint" gtype="gint" name="VERSION_MICRO" /> - <constant value="21" ctype="gint" gtype="gint" name="VERSION_MINOR" /> - <constant value="0" ctype="gint" gtype="gint" name="VERSION_NANO" /> + <constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" /> + <constant value="1" ctype="gint" gtype="gint" name="VERSION_MICRO" /> + <constant value="21" ctype="gint" gtype="gint" name="VERSION_MINOR" /> + <constant value="1" ctype="gint" gtype="gint" name="VERSION_NANO" /> </object> <class name="Parse" cname="GstParse" disable_void_ctor="1"> <method name="ParseBinFromDescription" cname="gst_parse_bin_from_description" shared="true"> @@ -21582,10 +21582,10 @@ <constant value="file-extension" ctype="gchar*" gtype="gchar*" name="ENCODING_CATEGORY_FILE_EXTENSION" /> <constant value="online-service" ctype="gchar*" gtype="gchar*" name="ENCODING_CATEGORY_ONLINE_SERVICE" /> <constant value="storage-editing" ctype="gchar*" gtype="gchar*" name="ENCODING_CATEGORY_STORAGE_EDITING" /> - <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MAJOR" /> - <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" /> - <constant value="21" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MINOR" /> - <constant value="0" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_NANO" /> + <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MAJOR" /> + <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" /> + <constant value="21" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MINOR" /> + <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_NANO" /> </object> </namespace> <namespace name="Gst.Rtp" library="gstrtp-1.0-0.dll"> diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index 4805970fe8..256223511d 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.21.1', + version : '1.21.1.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 5ef024277b..56d970913f 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.21.1', + version : '1.21.1.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) |