diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2018-05-19 11:53:37 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2018-07-25 18:35:11 +0100 |
commit | e1fbc9e15eb5d6a657d3aaa684e2577134b69128 (patch) | |
tree | 1525254b636bd7eb40a61c7f46e3f9aeb5c8f39e | |
parent | 27037a5ce262138f232ded0924820526d9ac405c (diff) |
Build 1.14.1 release1.14.1
-rw-r--r-- | meson.build | 11 | ||||
-rw-r--r-- | subprojects/gst-devtools.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-editing-services.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-libav.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-omx.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-plugins-bad.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-plugins-base.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-plugins-good.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-plugins-ugly.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-python.wrap | 2 | ||||
-rw-r--r-- | subprojects/gst-rtsp-server.wrap | 2 | ||||
-rw-r--r-- | subprojects/gstreamer-sharp.wrap | 2 | ||||
-rw-r--r-- | subprojects/gstreamer-vaapi.wrap | 2 | ||||
-rw-r--r-- | subprojects/gstreamer.wrap | 2 |
14 files changed, 21 insertions, 16 deletions
diff --git a/meson.build b/meson.build index 6a13daf..b73d477 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,10 @@ project('All GStreamer modules', 'c', - version : '1.14.0', + version : '1.14.1', meson_version : '>= 0.42.0', default_options : ['buildtype=debugoptimized']) gst_version = '>= @0@'.format(meson.project_version()) -gst_branch = '1.14' +gst_branch = '1.14.1' glib_req = '>= 2.40.0' @@ -123,7 +123,12 @@ foreach subproj: subprojects if get_option('disable_introspection') default_options += ['disable_introspection=true'] endif - subproject(subproj, version: gst_version, default_options: default_options) + if subproj == 'gstreamer-sharp' + req_version = '1.14.0' # there was no 1.14.1 release + else + req_version = gst_version + endif + subproject(subproj, version: req_version, default_options: default_options) cmdres = run_command(python3, '-c', symlink.format(subproj, meson.current_source_dir())) if cmdres.returncode() == 0 diff --git a/subprojects/gst-devtools.wrap b/subprojects/gst-devtools.wrap index 052179c..8c182d6 100644 --- a/subprojects/gst-devtools.wrap +++ b/subprojects/gst-devtools.wrap @@ -2,4 +2,4 @@ directory=gst-devtools url=https://anongit.freedesktop.org/git/gstreamer/gst-devtools.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-devtools -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-editing-services.wrap b/subprojects/gst-editing-services.wrap index ec3c056..f6d9da9 100644 --- a/subprojects/gst-editing-services.wrap +++ b/subprojects/gst-editing-services.wrap @@ -2,4 +2,4 @@ directory=gst-editing-services url=https://anongit.freedesktop.org/git/gstreamer/gst-editing-services.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-editing-services -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-libav.wrap b/subprojects/gst-libav.wrap index e9e8e94..0f05fcb 100644 --- a/subprojects/gst-libav.wrap +++ b/subprojects/gst-libav.wrap @@ -2,4 +2,4 @@ directory=gst-libav url=https://anongit.freedesktop.org/git/gstreamer/gst-libav.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-libav -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-omx.wrap b/subprojects/gst-omx.wrap index f1112ca..c703842 100644 --- a/subprojects/gst-omx.wrap +++ b/subprojects/gst-omx.wrap @@ -2,4 +2,4 @@ directory=gst-omx url=https://anongit.freedesktop.org/git/gstreamer/gst-omx.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-omx -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-plugins-bad.wrap b/subprojects/gst-plugins-bad.wrap index fd28237..c45c706 100644 --- a/subprojects/gst-plugins-bad.wrap +++ b/subprojects/gst-plugins-bad.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-bad url=https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-plugins-bad -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-plugins-base.wrap b/subprojects/gst-plugins-base.wrap index 450b721..49b752f 100644 --- a/subprojects/gst-plugins-base.wrap +++ b/subprojects/gst-plugins-base.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-base url=https://anongit.freedesktop.org/git/gstreamer/gst-plugins-base.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-plugins-good.wrap b/subprojects/gst-plugins-good.wrap index 86f6aff..dac65c1 100644 --- a/subprojects/gst-plugins-good.wrap +++ b/subprojects/gst-plugins-good.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-good url=https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-plugins-ugly.wrap b/subprojects/gst-plugins-ugly.wrap index 6e41ad3..129de5b 100644 --- a/subprojects/gst-plugins-ugly.wrap +++ b/subprojects/gst-plugins-ugly.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-ugly url=https://anongit.freedesktop.org/git/gstreamer/gst-plugins-ugly.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-plugins-ugly -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-python.wrap b/subprojects/gst-python.wrap index e2ffd7f..40649ef 100644 --- a/subprojects/gst-python.wrap +++ b/subprojects/gst-python.wrap @@ -2,4 +2,4 @@ directory=gst-python url=https://anongit.freedesktop.org/git/gstreamer/gst-python.git push-url=ssh://git.freedesktop.org/git/gstreamer/gst-python -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gst-rtsp-server.wrap b/subprojects/gst-rtsp-server.wrap index 5ba26eb..ab1b53f 100644 --- a/subprojects/gst-rtsp-server.wrap +++ b/subprojects/gst-rtsp-server.wrap @@ -2,4 +2,4 @@ directory=gst-rtsp-server url=https://anongit.freedesktop.org/git/gstreamer/gst-rtsp-server push-url=ssh://git.freedesktop.org/git/gstreamer/gst-rtsp-server -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gstreamer-sharp.wrap b/subprojects/gstreamer-sharp.wrap index 6198df1..4c407c0 100644 --- a/subprojects/gstreamer-sharp.wrap +++ b/subprojects/gstreamer-sharp.wrap @@ -2,4 +2,4 @@ directory=gstreamer-sharp url=https://anongit.freedesktop.org/git/gstreamer/gstreamer-sharp.git push-url=ssh://git.freedesktop.org/git/gstreamer/gstreamer-sharp -revision=1.14 +revision=1.14.0 diff --git a/subprojects/gstreamer-vaapi.wrap b/subprojects/gstreamer-vaapi.wrap index 8a00fda..d0ae662 100644 --- a/subprojects/gstreamer-vaapi.wrap +++ b/subprojects/gstreamer-vaapi.wrap @@ -2,4 +2,4 @@ directory=gstreamer-vaapi url=https://anongit.freedesktop.org/git/gstreamer/gstreamer-vaapi.git push-url=ssh://git.freedesktop.org/git/gstreamer/gstreamer-vaapi -revision=1.14 +revision=1.14.1 diff --git a/subprojects/gstreamer.wrap b/subprojects/gstreamer.wrap index 5fcda37..d609eea 100644 --- a/subprojects/gstreamer.wrap +++ b/subprojects/gstreamer.wrap @@ -2,4 +2,4 @@ directory=gstreamer url=https://anongit.freedesktop.org/git/gstreamer/gstreamer.git push-url=ssh://git.freedesktop.org/git/gstreamer/gstreamer -revision=1.14 +revision=1.14.1 |