Back to development

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

diff --git a/meson.build b/meson.build
index 6027292..55d1d7e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer-full', 'c',
-  version : '1.21.2',
+  version : '1.21.2.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 54a92b5..d7752da 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.2',
+  version : '1.21.2.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 66239cb..e15c5e2 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.2',
+  version: '1.21.2.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 b504c0b..86393dd 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.2',
+  version : '1.21.2.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 a38dbae..d76dd7d 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.2', license : 'LGPL')
+project('gst-examples', 'c', version : '1.21.2.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 d90dea1..775d783 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.2', meson_version : '>= 0.62', license: 'LGPL')
+project('gst-integration-testsuites', [], version: '1.21.2.1', meson_version : '>= 0.62', license: 'LGPL')

diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build
index c9eccff..c53c699 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.2',
+  version : '1.21.2.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 3952a0e..bcfa1fd 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.2',
+  version : '1.21.2.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 5034ea4..ae4a0ba 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.2',
+  version : '1.21.2.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 4e2dde8..83a341c 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.2',
+  version : '1.21.2.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 e2c5054..f776fc8 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.2 FLV muxer",
+                        "default": "GStreamer 1.21.2.1 FLV muxer",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -7039,7 +7039,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer 1.21.2 FLV muxer",
+                        "default": "GStreamer 1.21.2.1 FLV muxer",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -21196,7 +21196,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer/1.21.2",
+                        "default": "GStreamer/1.21.2.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -21740,7 +21740,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer 1.21.2",
+                        "default": "GStreamer 1.21.2.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -23177,7 +23177,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer souphttpsrc 1.21.2 ",
+                        "default": "GStreamer souphttpsrc 1.21.2.1 ",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",

diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 8950a05..942b38e 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.2',
+  version : '1.21.2.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 e29c073..f4d0b23 100644 (file)
--- 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.21.2
+revision=0.9

diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build
index 0b788c7..b97465d 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.2',
+  version : '1.21.2.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 bb74009..209b2d7 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.2',
+  version : '1.21.2.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 2830983..94c2bd0 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.2",
+                        "default": "GStreamer/1.21.2.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",

diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build
index 5d0da9d..5bc75d6 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.2',
+  version : '1.21.2.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 4de997f..6c286ce 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.2',
+project('gstreamer-sharp', ['cs', 'c'], version: '1.21.2.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 c26cfaf..fd14ed1 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 = 2;
                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 c482b09..0582d31 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 = 2;
                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 574986a..c245f32 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="2" 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="2" 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="2" 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="2" 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 e6b598e..21cb8bc 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.2',
+  version : '1.21.2.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 d312f2b..33ab344 100644 (file)
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer', 'c',
-  version : '1.21.2',
+  version : '1.21.2.1',
   meson_version : '>= 0.62',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])