summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2024-04-29 20:22:56 +0100
committerTim-Philipp Müller <tim@centricular.com>2024-04-30 00:10:11 +0100
commit3dff559d8b6b6c51d6b524c7bc441911b4e79828 (patch)
tree27072e44c93c1bd9d7e5db65e30c1d08663aa63c
parentd2c02bb704b5804ca057fc7e6c7b16b4466fd7d5 (diff)
Back to development after 1.22.121.22
-rw-r--r--meson.build2
-rw-r--r--subprojects/gst-devtools/meson.build2
-rw-r--r--subprojects/gst-docs/meson.build2
-rw-r--r--subprojects/gst-editing-services/meson.build2
-rw-r--r--subprojects/gst-examples/meson.build2
-rw-r--r--subprojects/gst-integration-testsuites/meson.build2
-rw-r--r--subprojects/gst-libav/meson.build2
-rw-r--r--subprojects/gst-omx/meson.build2
-rw-r--r--subprojects/gst-plugins-bad/meson.build2
-rw-r--r--subprojects/gst-plugins-base/meson.build2
-rw-r--r--subprojects/gst-plugins-good/docs/gst_plugins_cache.json8
-rw-r--r--subprojects/gst-plugins-good/meson.build2
-rw-r--r--subprojects/gst-plugins-rs.wrap2
-rw-r--r--subprojects/gst-plugins-ugly/meson.build2
-rw-r--r--subprojects/gst-python/meson.build2
-rw-r--r--subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json2
-rw-r--r--subprojects/gst-rtsp-server/meson.build2
-rw-r--r--subprojects/gstreamer-sharp/meson.build2
-rw-r--r--subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs2
-rw-r--r--subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs2
-rw-r--r--subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml4
-rw-r--r--subprojects/gstreamer-vaapi/meson.build2
-rw-r--r--subprojects/gstreamer/meson.build2
23 files changed, 27 insertions, 27 deletions
diff --git a/meson.build b/meson.build
index ea9e193a96..a9f89e6467 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('gstreamer-full', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62.0',
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 313f9f01ca..8e317a36d3 100644
--- a/subprojects/gst-devtools/meson.build
+++ b/subprojects/gst-devtools/meson.build
@@ -1,5 +1,5 @@
project('gst-devtools', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'c_std=gnu99',
diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build
index 96fc08a691..9980ceb74a 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.22.12',
+ version: '1.22.12.1',
meson_version : '>= 0.62')
hotdoc_p = find_program('hotdoc')
diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
index 25decb8f31..9009568b73 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build
index affd66367f..1c0c3437db 100644
--- a/subprojects/gst-examples/meson.build
+++ b/subprojects/gst-examples/meson.build
@@ -1,4 +1,4 @@
-project('gst-examples', 'c', version : '1.22.12', license : 'LGPL')
+project('gst-examples', 'c', version : '1.22.12.1', license : 'LGPL')
cc = meson.get_compiler('c')
m_dep = cc.find_library('m', required : false)
diff --git a/subprojects/gst-integration-testsuites/meson.build b/subprojects/gst-integration-testsuites/meson.build
index eca00343e4..539bb8e58e 100644
--- a/subprojects/gst-integration-testsuites/meson.build
+++ b/subprojects/gst-integration-testsuites/meson.build
@@ -1 +1 @@
-project('gst-integration-testsuites', [], version: '1.22.12', meson_version : '>= 0.62', license: 'LGPL')
+project('gst-integration-testsuites', [], version: '1.22.12.1', meson_version : '>= 0.62', license: 'LGPL')
diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build
index 656680a871..b719c879dd 100644
--- a/subprojects/gst-libav/meson.build
+++ b/subprojects/gst-libav/meson.build
@@ -1,5 +1,5 @@
project('gst-libav', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build
index 5ff8731607..031a659569 100644
--- a/subprojects/gst-omx/meson.build
+++ b/subprojects/gst-omx/meson.build
@@ -1,5 +1,5 @@
project('gst-omx', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build
index aa2f86ca5b..c79c3fddb5 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index 194de8c231..778389dca4 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
index 54633e6168..3a3b1558af 100644
--- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json
@@ -7027,7 +7027,7 @@
"construct": false,
"construct-only": false,
"controllable": false,
- "default": "GStreamer 1.22.12 FLV muxer",
+ "default": "GStreamer 1.22.12.1 FLV muxer",
"mutable": "null",
"readable": true,
"type": "gchararray",
@@ -7039,7 +7039,7 @@
"construct": false,
"construct-only": false,
"controllable": false,
- "default": "GStreamer 1.22.12 FLV muxer",
+ "default": "GStreamer 1.22.12.1 FLV muxer",
"mutable": "null",
"readable": true,
"type": "gchararray",
@@ -21257,7 +21257,7 @@
"construct": false,
"construct-only": false,
"controllable": false,
- "default": "GStreamer/1.22.12",
+ "default": "GStreamer/1.22.12.1",
"mutable": "null",
"readable": true,
"type": "gchararray",
@@ -23253,7 +23253,7 @@
"construct": false,
"construct-only": false,
"controllable": false,
- "default": "GStreamer souphttpsrc 1.22.12 ",
+ "default": "GStreamer souphttpsrc 1.22.12.1 ",
"mutable": "null",
"readable": true,
"type": "gchararray",
diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 22689dfdbd..ec241da97e 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-plugins-rs.wrap b/subprojects/gst-plugins-rs.wrap
index 97d01b631f..f4d0b23f8d 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.22.12
+revision=0.9
diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build
index d26620fea6..285252ecc3 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build
index 4a18faf42a..df6f797ea2 100644
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@@ -1,5 +1,5 @@
project('gst-python', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'c_std=gnu99',
diff --git a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json
index c5ef17a44f..6efc48d6fb 100644
--- a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json
+++ b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json
@@ -333,7 +333,7 @@
"construct": false,
"construct-only": false,
"controllable": false,
- "default": "GStreamer/1.22.12",
+ "default": "GStreamer/1.22.12.1",
"mutable": "null",
"readable": true,
"type": "gchararray",
diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build
index ad815f78a4..34fd6b07fa 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.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : ['warning_level=1', 'buildtype=debugoptimized'])
diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build
index 451708f4f2..1d072c42b7 100644
--- a/subprojects/gstreamer-sharp/meson.build
+++ b/subprojects/gstreamer-sharp/meson.build
@@ -1,4 +1,4 @@
-project('gstreamer-sharp', ['cs', 'c'], version: '1.22.12',
+project('gstreamer-sharp', ['cs', 'c'], version: '1.22.12.1',
meson_version : '>= 0.62', license: 'LGPL')
if host_machine.system() == 'osx'
diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs
index dd5aafdf3d..0b13b47be2 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 = 12;
public const int PLUGINS_BASE_VERSION_MINOR = 22;
- 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 c55943ca1a..e2cc9026e6 100644
--- a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs
+++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs
@@ -172,7 +172,7 @@ namespace Gst {
public const int VERSION_MAJOR = 1;
public const int VERSION_MICRO = 12;
public const int VERSION_MINOR = 22;
- 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 17052a8f3d..605f4d1222 100644
--- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
+++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
@@ -12130,7 +12130,7 @@
<constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" />
<constant value="12" ctype="gint" gtype="gint" name="VERSION_MICRO" />
<constant value="22" 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">
@@ -21585,7 +21585,7 @@
<constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MAJOR" />
<constant value="12" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" />
<constant value="22" 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 c7c8a25929..89f6c5b312 100644
--- a/subprojects/gstreamer-vaapi/meson.build
+++ b/subprojects/gstreamer-vaapi/meson.build
@@ -1,5 +1,5 @@
project('gstreamer-vaapi', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
index ce6b92a331..68e4316882 100644
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -1,5 +1,5 @@
project('gstreamer', 'c',
- version : '1.22.12',
+ version : '1.22.12.1',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])