Back to development

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

diff --git a/meson.build b/meson.build
index 99eb94a..1fabfaf 100644 (file)
--- 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 3c0e738..a181ce8 100644 (file)
--- 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 3ec468b..76eb933 100644 (file)
--- 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 02e6735..8794e97 100644 (file)
--- 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 6cb4f64..2a207a3 100644 (file)
--- 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 679e4fb..87e37b0 100644 (file)
--- 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 41fa130..28e9446 100644 (file)
--- 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 9f9bfe0..b6d828b 100644 (file)
--- 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 3b8cdbe..2e976a8 100644 (file)
--- 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 b6c11cf..277d8fc 100644 (file)
--- 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 216033c..caef5ce 100644 (file)
--- 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 dd8eadc..6b86ba1 100644 (file)
--- 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 03fc6c9..9f18f92 100644 (file)
--- 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 2748296..7717980 100644 (file)
--- 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 d94ee52..72a36c2 100644 (file)
--- 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 d613302..1971005 100644 (file)
--- 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 99ea048..f84d8da 100644 (file)
--- 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 aa16a53..2dd4e33 100644 (file)
--- 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 93a795e..72cfe48 100644 (file)
--- 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 0ad5e1f..8f65100 100644 (file)
--- 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 4805970..2562235 100644 (file)
--- 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 5ef0242..56d9709 100644 (file)
--- 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' ])