Back to development

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6126>
This commit is contained in:
Tim-Philipp Müller 2024-02-15 16:38:53 +00:00
parent 88751d4110
commit 88412ef100
23 changed files with 30 additions and 30 deletions

View file

@ -15466,7 +15466,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>

View file

@ -49295,7 +49295,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"/>

View file

@ -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"/>

View file

@ -1,5 +1,5 @@
project('gstreamer-full', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : ['buildtype=debugoptimized',
# Needed due to https://github.com/mesonbuild/meson/issues/1889,

View file

@ -1,5 +1,5 @@
project('gst-devtools', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'c_std=gnu99',

View file

@ -1,5 +1,5 @@
project('GStreamer manuals and tutorials', 'c',
version: '1.23.2',
version: '1.23.2.1',
meson_version : '>= 1.1')
hotdoc_p = find_program('hotdoc')

View file

@ -1,5 +1,5 @@
project('gst-editing-services', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,4 +1,4 @@
project('gst-examples', 'c', version : '1.23.2', license : 'LGPL')
project('gst-examples', 'c', version : '1.23.2.1', license : 'LGPL')
static_build = get_option('default_library') == 'static'
cc = meson.get_compiler('c')

View file

@ -1 +1 @@
project('gst-integration-testsuites', [], version: '1.23.2', meson_version : '>= 1.1', license: 'LGPL')
project('gst-integration-testsuites', [], version: '1.23.2.1', meson_version : '>= 1.1', license: 'LGPL')

View file

@ -1,5 +1,5 @@
project('gst-libav', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,5 +1,5 @@
project('gst-plugins-bad', 'c', 'cpp',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,5 +1,5 @@
project('gst-plugins-base', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,5 +1,5 @@
project('gst-plugins-good', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -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.23.2
revision=0.12

View file

@ -1,5 +1,5 @@
project('gst-plugins-ugly', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,5 +1,5 @@
project('gst-python', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'c_std=gnu99',

View file

@ -1,5 +1,5 @@
project('gst-rtsp-server', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : ['warning_level=1', 'buildtype=debugoptimized'])

View file

@ -1,4 +1,4 @@
project('gstreamer-sharp', ['cs', 'c'], version: '1.23.2',
project('gstreamer-sharp', ['cs', 'c'], version: '1.23.2.1',
meson_version : '>= 1.1', license: 'LGPL')
fs = import ('fs')

View file

@ -19,7 +19,7 @@ namespace Gst.PbUtils {
public const int PLUGINS_BASE_VERSION_MAJOR = 1;
public const int PLUGINS_BASE_VERSION_MICRO = 2;
public const int PLUGINS_BASE_VERSION_MINOR = 23;
public const int PLUGINS_BASE_VERSION_NANO = 0;
public const int PLUGINS_BASE_VERSION_NANO = 1;
#endregion
}
}

View file

@ -173,7 +173,7 @@ namespace Gst {
public const int VERSION_MAJOR = 1;
public const int VERSION_MICRO = 2;
public const int VERSION_MINOR = 23;
public const int VERSION_NANO = 0;
public const int VERSION_NANO = 1;
#endregion
}
}

View file

@ -12342,10 +12342,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="2" ctype="gint" gtype="gint" name="VERSION_MICRO" />
<constant value="23" 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="2" ctype="gint" gtype="gint" name="VERSION_MICRO" />
<constant value="23" 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">
@ -22376,10 +22376,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="2" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" />
<constant value="23" 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="2" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" />
<constant value="23" 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">

View file

@ -1,5 +1,5 @@
project('gstreamer-vaapi', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

View file

@ -1,5 +1,5 @@
project('gstreamer', 'c',
version : '1.23.2',
version : '1.23.2.1',
meson_version : '>= 1.1',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])