diff --git a/girs/GES-1.0.gir b/girs/GES-1.0.gir index a45af68ad1..5fdf48a34f 100644 --- a/girs/GES-1.0.gir +++ b/girs/GES-1.0.gir @@ -15637,7 +15637,7 @@ contains one frame) - + diff --git a/girs/Gst-1.0.gir b/girs/Gst-1.0.gir index 6d05bcdacd..32f4506626 100644 --- a/girs/Gst-1.0.gir +++ b/girs/Gst-1.0.gir @@ -51715,7 +51715,7 @@ determine a order for the two provided values. - + The nano version of GStreamer at compile time: Actual releases have 0, GIT versions have 1, prerelease versions have 2-... diff --git a/girs/GstPbutils-1.0.gir b/girs/GstPbutils-1.0.gir index 21898c41e1..a07982afc1 100644 --- a/girs/GstPbutils-1.0.gir +++ b/girs/GstPbutils-1.0.gir @@ -2960,7 +2960,7 @@ in debugging. - + The nano version of GStreamer's gst-plugins-base libraries at compile time. Actual releases have 0, GIT versions have 1, prerelease versions have 2-... diff --git a/meson.build b/meson.build index 225f850a9b..f49342436c 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', 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 035e68b040..8509d297b7 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build index e5cf4ad3dc..feff1e656f 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.25.1', + version: '1.25.1.1', meson_version : '>= 1.3') hotdoc_p = find_program('hotdoc') diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index 1d9bef9d9e..062191d649 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index 5152bc0af3..af340c1e06 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.25.1', license : 'LGPL') +project('gst-examples', 'c', version : '1.25.1.1', license : 'LGPL') static_build = get_option('default_library') == 'static' cc = meson.get_compiler('c') diff --git a/subprojects/gst-integration-testsuites/meson.build b/subprojects/gst-integration-testsuites/meson.build index 7092c664f5..a7cf09173d 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.25.1', meson_version : '>= 1.3', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.25.1.1', meson_version : '>= 1.3', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index ae2f417942..d1c89c8b6d 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index cbf985f259..4c3a03983c 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 987c9b5432..bd69e3f0a3 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 5783a04997..01af2a586b 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-rs.wrap b/subprojects/gst-plugins-rs.wrap index 4c63256b1a..2f350fcea2 100644 --- 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.25.1 +revision=0.13 diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 8a94da9732..760609c566 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 268d02c2ab..f7dc114ad1 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index eccb5cb52b..002e9ddf99 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.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : ['warning_level=1', 'buildtype=debugoptimized']) diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index 3905ffcd83..81303f1b5e 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.25.1', +project('gstreamer-sharp', ['cs', 'c'], version: '1.25.1.1', meson_version : '>= 1.3', license: 'LGPL') fs = import ('fs') diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs index 72633fbd2f..c45a682c12 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 = 25; - 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 1580b197d9..f47b10a445 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs @@ -173,7 +173,7 @@ namespace Gst { public const int VERSION_MAJOR = 1; public const int VERSION_MICRO = 1; public const int VERSION_MINOR = 25; - 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 a089e2c7a4..727382d758 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml @@ -12345,7 +12345,7 @@ - + @@ -22379,7 +22379,7 @@ - + diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index 214ad05a50..f0f37316a4 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index 8636dbf3b9..61c844fa4a 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.25.1', + version : '1.25.1.1', meson_version : '>= 1.3', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ])