From ad0cc551e18a8a1a6dc4caea265adfe66d272e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 29 Jul 2024 16:48:02 +0100 Subject: [PATCH] Back to development after 1.24.6 --- girs/GES-1.0.gir | 2 +- girs/Gst-1.0.gir | 2 +- girs/GstPbutils-1.0.gir | 2 +- meson.build | 2 +- subprojects/gst-devtools/meson.build | 2 +- subprojects/gst-docs/meson.build | 2 +- subprojects/gst-editing-services/meson.build | 2 +- subprojects/gst-examples/meson.build | 2 +- subprojects/gst-integration-testsuites/meson.build | 2 +- subprojects/gst-libav/meson.build | 2 +- subprojects/gst-plugins-bad/meson.build | 2 +- subprojects/gst-plugins-base/meson.build | 2 +- subprojects/gst-plugins-good/meson.build | 2 +- subprojects/gst-plugins-rs.wrap | 2 +- subprojects/gst-plugins-ugly/meson.build | 2 +- subprojects/gst-python/meson.build | 2 +- subprojects/gst-rtsp-server/meson.build | 2 +- subprojects/gstreamer-sharp/meson.build | 2 +- .../sources/generated/Gst.PbUtils/Constants.cs | 2 +- .../gstreamer-sharp/sources/generated/Gst/Constants.cs | 2 +- .../gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml | 4 ++-- subprojects/gstreamer-vaapi/meson.build | 2 +- subprojects/gstreamer/meson.build | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/girs/GES-1.0.gir b/girs/GES-1.0.gir index 47361fd977..e1285552c0 100644 --- a/girs/GES-1.0.gir +++ b/girs/GES-1.0.gir @@ -15466,7 +15466,7 @@ contains one frame) - + diff --git a/girs/Gst-1.0.gir b/girs/Gst-1.0.gir index 268700305b..a12c239eb5 100644 --- a/girs/Gst-1.0.gir +++ b/girs/Gst-1.0.gir @@ -49397,7 +49397,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 2b371c6176..c180086f56 100644 --- a/girs/GstPbutils-1.0.gir +++ b/girs/GstPbutils-1.0.gir @@ -2909,7 +2909,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 33c5a25742..7e3ef8b44d 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', 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 91c4e7459b..ef23ae7f91 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build index d98b094737..766e985aa0 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.24.6', + version: '1.24.6.1', meson_version : '>= 1.1') hotdoc_p = find_program('hotdoc') diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index 8ff5c9ccb3..1f94e237ee 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index de6a5f5c77..b20816166c 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.24.6', license : 'LGPL') +project('gst-examples', 'c', version : '1.24.6.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 e1c3f234a3..e15c848062 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.24.6', meson_version : '>= 1.1', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.24.6.1', meson_version : '>= 1.1', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 18e8bf55c6..b87df22427 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 69c7f4986a..e2c7760d10 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 93eb173b9e..cec73627f1 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index c1cba9e930..a9ffa1464a 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-rs.wrap b/subprojects/gst-plugins-rs.wrap index 900b351eec..0a4bd9aca2 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.24.6 +revision=0.12 diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index d0400ef190..f74fa1fc07 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 8b0ac6dbd1..0aa3b0f549 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index 4af2591668..142f7b170c 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.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : ['warning_level=1', 'buildtype=debugoptimized']) diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index 787c5a65d3..5c8c4a870b 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.24.6', +project('gstreamer-sharp', ['cs', 'c'], version: '1.24.6.1', meson_version : '>= 1.1', 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 f125f7c9c3..1e54afa4b6 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 = 6; public const int PLUGINS_BASE_VERSION_MINOR = 24; - 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 5689284026..cb69a64f5e 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 = 6; public const int VERSION_MINOR = 24; - 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 16c3987be7..5e0fabf7e6 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 90e78f6d68..bc63d0ec23 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index 1d87075f7a..fcd69e9039 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.24.6', + version : '1.24.6.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ])