diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2025-06-11 14:45:57 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2025-06-11 14:45:57 +0100 |
commit | b0992a36a93c8006d0c8f2c2082fc867028610fd (patch) | |
tree | 097fc4f4ac91c67d7cbb8777b82d91a46b8e92dc | |
parent | 0a7d7071207d40cc003f6cd9f2f123f759fdfce1 (diff) |
Back to development after 1.24.131.24
23 files changed, 24 insertions, 24 deletions
diff --git a/girs/GES-1.0.gir b/girs/GES-1.0.gir index a0333af38d..fee0168943 100644 --- a/girs/GES-1.0.gir +++ b/girs/GES-1.0.gir @@ -15473,7 +15473,7 @@ contains one frame)</doc> <source-position filename="../subprojects/gst-editing-services/ges/ges-version.h"/> <type name="gint" c:type="gint"/> </constant> - <constant name="VERSION_NANO" value="0" c:type="GES_VERSION_NANO"> + <constant name="VERSION_NANO" value="1" c:type="GES_VERSION_NANO"> <source-position filename="../subprojects/gst-editing-services/ges/ges-version.h"/> <type name="gint" c:type="gint"/> </constant> diff --git a/girs/Gst-1.0.gir b/girs/Gst-1.0.gir index ea20ea8877..b005f5ef67 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.</doc> <source-position filename="../subprojects/gstreamer/gst/gstversion.h"/> <type name="gint" c:type="gint"/> </constant> - <constant name="VERSION_NANO" value="0" c:type="GST_VERSION_NANO"> + <constant name="VERSION_NANO" value="1" c:type="GST_VERSION_NANO"> <doc xml:space="preserve" filename="../subprojects/gstreamer/gst/gstversion.h">The nano version of GStreamer at compile time: Actual releases have 0, GIT versions have 1, prerelease versions have 2-...</doc> <source-position filename="../subprojects/gstreamer/gst/gstversion.h"/> diff --git a/girs/GstPbutils-1.0.gir b/girs/GstPbutils-1.0.gir index 66e4cf1514..a26d6e9c53 100644 --- a/girs/GstPbutils-1.0.gir +++ b/girs/GstPbutils-1.0.gir @@ -2909,7 +2909,7 @@ in debugging.</doc> <source-position filename="../subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstpluginsbaseversion.h"/> <type name="gint" c:type="gint"/> </constant> - <constant name="PLUGINS_BASE_VERSION_NANO" value="0" c:type="GST_PLUGINS_BASE_VERSION_NANO"> + <constant name="PLUGINS_BASE_VERSION_NANO" value="1" c:type="GST_PLUGINS_BASE_VERSION_NANO"> <doc xml:space="preserve" filename="../subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstpluginsbaseversion.h">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-...</doc> <source-position filename="../subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstpluginsbaseversion.h"/> diff --git a/meson.build b/meson.build index 61d4b8a533..19dafe577a 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.24.13', + version : '1.24.13.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 e5340a51e0..ba5fd726f8 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.24.13', + version : '1.24.13.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 0625fbc5c3..425aa652e1 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.13', + version: '1.24.13.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 9e23936b93..91fd47b753 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.13', + version : '1.24.13.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 4a7498ecee..6b4a0dc5ff 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.24.13', license : 'LGPL') +project('gst-examples', 'c', version : '1.24.13.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 7311616e3b..27704e51c9 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.24.13', meson_version : '>= 1.1', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.24.13.1', meson_version : '>= 1.1', license: 'LGPL') diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 3b467c9b39..a6e1424bf6 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.24.13', + version : '1.24.13.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 250a25a2fd..f5f0695694 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.13', + version : '1.24.13.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 268b95ba0e..7517a79a3c 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.13', + version : '1.24.13.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 40837aa1a2..bfc02c7a26 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.13', + version : '1.24.13.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 3999049dc3..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.13 +revision=0.12 diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index ab47d4b88a..cdbb356a3f 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.13', + version : '1.24.13.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 2b19548598..eab006eb40 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.24.13', + version : '1.24.13.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 a4b1706df7..38804f1e05 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.13', + version : '1.24.13.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 ebfb865391..0f368da14b 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.13', +project('gstreamer-sharp', ['cs', 'c'], version: '1.24.13.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 f2dac01112..22a6e28139 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 = 13; 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 e3f415e76d..0803dfdb42 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 = 13; 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 77a1695766..66475a195b 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 @@ <constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" /> <constant value="13" ctype="gint" gtype="gint" name="VERSION_MICRO" /> <constant value="24" 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_NANO" /> </object> <class name="Parse" cname="GstParse" disable_void_ctor="1"> <method name="ParseBinFromDescription" cname="gst_parse_bin_from_description" shared="true"> @@ -22379,7 +22379,7 @@ <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MAJOR" /> <constant value="13" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" /> <constant value="24" 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_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 6be39c6b09..ba4eb07006 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.24.13', + version : '1.24.13.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 58bb720bf7..f37051dca6 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.24.13', + version : '1.24.13.1', meson_version : '>= 1.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) |