mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 12:41:05 +00:00
Back to development
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6066>
This commit is contained in:
parent
9255e397f0
commit
2111d6f015
24 changed files with 31 additions and 31 deletions
2
.gitlint
2
.gitlint
|
@ -20,4 +20,4 @@ regex=^[\w]+[\w, -\\/]*[\w]+: .*
|
|||
regex=^ \#\d(.*):\d+$
|
||||
|
||||
[ignore-by-title]
|
||||
regex=^Release(.*)
|
||||
regex=^(Release|Back to development)
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -49262,7 +49262,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"/>
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gstreamer-full', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : ['buildtype=debugoptimized',
|
||||
# Needed due to https://github.com/mesonbuild/meson/issues/1889,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-devtools', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'c_std=gnu99',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('GStreamer manuals and tutorials', 'c',
|
||||
version: '1.23.1',
|
||||
version: '1.23.1.1',
|
||||
meson_version : '>= 1.1')
|
||||
|
||||
hotdoc_p = find_program('hotdoc')
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-editing-services', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
project('gst-examples', 'c', version : '1.23.1', license : 'LGPL')
|
||||
project('gst-examples', 'c', version : '1.23.1.1', license : 'LGPL')
|
||||
|
||||
static_build = get_option('default_library') == 'static'
|
||||
cc = meson.get_compiler('c')
|
||||
|
|
|
@ -1 +1 @@
|
|||
project('gst-integration-testsuites', [], version: '1.23.1', meson_version : '>= 1.1', license: 'LGPL')
|
||||
project('gst-integration-testsuites', [], version: '1.23.1.1', meson_version : '>= 1.1', license: 'LGPL')
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-libav', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-plugins-bad', 'c', 'cpp',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-plugins-base', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-plugins-good', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -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.1
|
||||
revision=0.9
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-plugins-ugly', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-python', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'c_std=gnu99',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gst-rtsp-server', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : ['warning_level=1', 'buildtype=debugoptimized'])
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
project('gstreamer-sharp', ['cs', 'c'], version: '1.23.1',
|
||||
project('gstreamer-sharp', ['cs', 'c'], version: '1.23.1.1',
|
||||
meson_version : '>= 1.1', license: 'LGPL')
|
||||
|
||||
fs = import ('fs')
|
||||
|
|
|
@ -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 = 23;
|
||||
public const int PLUGINS_BASE_VERSION_NANO = 0;
|
||||
public const int PLUGINS_BASE_VERSION_NANO = 1;
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
@ -173,7 +173,7 @@ namespace Gst {
|
|||
public const int VERSION_MAJOR = 1;
|
||||
public const int VERSION_MICRO = 1;
|
||||
public const int VERSION_MINOR = 23;
|
||||
public const int VERSION_NANO = 0;
|
||||
public const int VERSION_NANO = 1;
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12345,7 +12345,7 @@
|
|||
<constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" />
|
||||
<constant value="1" 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_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="1" 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_NANO" />
|
||||
</object>
|
||||
</namespace>
|
||||
<namespace name="Gst.Rtp" library="gstrtp-1.0-0.dll">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gstreamer-vaapi', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project('gstreamer', 'c',
|
||||
version : '1.23.1',
|
||||
version : '1.23.1.1',
|
||||
meson_version : '>= 1.1',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
|
Loading…
Reference in a new issue