Back to development

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

diff --git a/meson.build b/meson.build
index a5f68ceff0c8708d5518e96de53af5f967f2a0dc..34e6ecd45d12392101f27793f91d3c46c34d7a35 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 ae3299d313e3ff7a5a60bc804dbdab5921d8eda7..e0be4a9e577f8d4ed145f9a782d0cef40ef72444 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 fb2af986c31189f5014aeb77b3b1c6c37842147b..4338e3168845292cdba574347d7a0576888f0329 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 f40d5225746d6109a3e6f9b6df024c369dd57887..0d41498ddbebf1c7cd9a84084b162def5763714f 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 d43a3ee00f26f47a2c69c4a3a7164039ca3fde05..310c119c034a9dd1cfbbb5c038c8fef01b7c2a05 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 1fbb8cd1591867adcc1c2fc96bee062664693aa2..41beb1cb9c67e9ddadacb4334ad8a92409c12b72 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 fe7a20b9343df3097a79661943c1c9ac172c2c77..2df8a0f1173a2286373a845d3e0f53202517a1ec 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 389163801a93a448874bdb449583999e8669a4e6..d3ec3b564c8f55248f3ab0351aa22122d0c6f4bd 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 0ce5fb0c6f93dfc751bb563a89127ef4624e247b..ac8eeb8d1f972106681c76db1deaff48966c0407 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 01456615efd1eb17f18c0640bb8f838f115fc409..3fc01dd9134ae3b37eae6ba30a26cca5cb06b920 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 5847e94533c57291bb0f0fea5f33c23b403842d8..b6ea130576e4cdbe05cdb0a76d4afd4f7e7ccdf2 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 1c3ba86dd1456bd9c0ac906795370df6a6f439ea..67eb8038b7d3ec3ff784038b7c9e3c4e25e0cb82 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 f1a2fb3123b3f73673c91bd3b6bf8ee93580bff9..f4d0b23f8d6bd35206d1a40a669283279fcdcc10 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 87a6e52034d38f85adb684c20d17887e91e58a3f..7b12a86b156ba0dde28a5da2bc4733f5027ce2cf 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 30f73d960fc75c58cd7b18429aa2a435d5b637b5..a9bd36afe7ccc97edc3f61aa7c7bafd5cfb7c252 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 86b8be7dfa15afeb809d102b5f5af0f36ba0427b..254abbe892a6d432345f22e67a8164a1987857d8 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 529cd72d674e346be395957d885dc9239e5fff96..42643c618e55208524d96363434c092e169b65f1 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 1234e730c8acd578d6dbb2030119dedf2bffd543..a2ff8951e3d797f9ba527ae587d184a67def66b5 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 5778574782a72bf46567a3b3e15b5427182d61ad..88adc0dc4a4dd3917cc7177bda003b91d09701d5 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 a0bb41f28519088ad6c183e143370a82f40249a2..496c0fe18bb105acbb3f4662a0a64e9c20c89eca 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 bc6ff0e03f1dfc554faadb661313e43555bc23a4..ee05e3b2867afec5fe7262b2b9ce7d668bda6f71 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 26f4593ad7c6220718ab5c66cfa63baac0a65ac7..d6176f64b67efa22e9866a644bb388f6af6393ee 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 26e5905ced56f5c041cba89e6bde2f467231012f..67e151490a86e56ffee06937e6250f289c0c2e9b 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' ])