Back to development

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

diff --git a/meson.build b/meson.build
index a5f68ce..34e6ecd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer-full', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 ae3299d..e0be4a9 100644 (file)
--- a/subprojects/gst-devtools/meson.build
+++ b/subprojects/gst-devtools/meson.build
@@ -1,5 +1,5 @@
 project('gst-devtools', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 fb2af98..4338e31 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.22.6',
+  version: '1.22.6.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 f40d522..0d41498 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.22.6',
+  version : '1.22.6.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 d43a3ee..310c119 100644 (file)
--- a/subprojects/gst-examples/meson.build
+++ b/subprojects/gst-examples/meson.build
@@ -1,4 +1,4 @@
-project('gst-examples', 'c', version : '1.22.6', license : 'LGPL')
+project('gst-examples', 'c', version : '1.22.6.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 1fbb8cd..41beb1c 100644 (file)
--- a/subprojects/gst-integration-testsuites/meson.build
+++ b/subprojects/gst-integration-testsuites/meson.build
@@ -1 +1 @@
-project('gst-integration-testsuites', [], version: '1.22.6', meson_version : '>= 0.62', license: 'LGPL')
+project('gst-integration-testsuites', [], version: '1.22.6.1', meson_version : '>= 0.62', license: 'LGPL')

diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build
index fe7a20b..2df8a0f 100644 (file)
--- a/subprojects/gst-libav/meson.build
+++ b/subprojects/gst-libav/meson.build
@@ -1,5 +1,5 @@
 project('gst-libav', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 3891638..d3ec3b5 100644 (file)
--- a/subprojects/gst-omx/meson.build
+++ b/subprojects/gst-omx/meson.build
@@ -1,5 +1,5 @@
 project('gst-omx', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 0ce5fb0..ac8eeb8 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.22.6',
+  version : '1.22.6.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 0145661..3fc01dd 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.22.6',
+  version : '1.22.6.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 5847e94..b6ea130 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.22.6 FLV muxer",
+                        "default": "GStreamer 1.22.6.1 FLV muxer",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -7039,7 +7039,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer 1.22.6 FLV muxer",
+                        "default": "GStreamer 1.22.6.1 FLV muxer",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -21257,7 +21257,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer/1.22.6",
+                        "default": "GStreamer/1.22.6.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -21816,7 +21816,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer 1.22.6",
+                        "default": "GStreamer 1.22.6.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -23253,7 +23253,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "GStreamer souphttpsrc 1.22.6 ",
+                        "default": "GStreamer souphttpsrc 1.22.6.1 ",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",

diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 1c3ba86..67eb803 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.22.6',
+  version : '1.22.6.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 f1a2fb3..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.22.6
+revision=0.9

diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build
index 87a6e52..7b12a86 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.22.6',
+  version : '1.22.6.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 30f73d9..a9bd36a 100644 (file)
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@@ -1,5 +1,5 @@
 project('gst-python', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 86b8be7..254abbe 100644 (file)
--- 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.6",
+                        "default": "GStreamer/1.22.6.1",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",

diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build
index 529cd72..42643c6 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.22.6',
+  version : '1.22.6.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 1234e73..a2ff895 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.22.6',
+project('gstreamer-sharp', ['cs', 'c'], version: '1.22.6.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 5778574..88adc0d 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 = 6;
                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 a0bb41f..496c0fe 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 = 6;
                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 bc6ff0e..ee05e3b 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="6" ctype="gint" gtype="gint"                          name="VERSION_MICRO" />
-      <constant value="22" 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="6" ctype="gint" gtype="gint"                           name="VERSION_MICRO" />
+      <constant value="22" 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="6" ctype="gint" gtype="gint"                          name="PLUGINS_BASE_VERSION_MICRO" />
-      <constant value="22" 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="6" ctype="gint" gtype="gint"                           name="PLUGINS_BASE_VERSION_MICRO" />
+      <constant value="22" 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 26f4593..d6176f6 100644 (file)
--- a/subprojects/gstreamer-vaapi/meson.build
+++ b/subprojects/gstreamer-vaapi/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer-vaapi', 'c',
-  version : '1.22.6',
+  version : '1.22.6.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 26e5905..67e1514 100644 (file)
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer', 'c',
-  version : '1.22.6',
+  version : '1.22.6.1',
   meson_version : '>= 0.62',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])