mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-29 05:38:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

Bump Meson requirement to >=0.60.0

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1934>
This commit is contained in:
Xavier Claessens 2022-03-14 08:56:16 -04:00
parent 0fa7923937
commit 69863131bd
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -25,9 +25,9 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want.
###
FEDORA_TAG: '2021-12-03.1'
FEDORA_TAG: '2022-03-14.0'
INDENT_TAG: '2021-10-04.0'
WINDOWS_TAG: "2022-03-09.0"
WINDOWS_TAG: "2022-03-14.0"
GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'

2
ci/docker/fedora/prepare.sh
View file

@ -202,7 +202,7 @@ dnf builddep -y gstreamer1 \
python3-gstreamer1
dnf remove -y meson
pip3 install meson==0.59.1 hotdoc python-gitlab
pip3 install meson==0.60.3 hotdoc python-gitlab
# Remove gst-devel packages installed by builddep above

2
ci/docker/windows/Dockerfile
View file

@ -44,7 +44,7 @@ RUN Get-ChildItem C:\BuildTools
RUN Get-ChildItem C:\BuildTools\VC\Tools\MSVC
RUN Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\lib'
RUN pip3 install meson
RUN pip3 install meson==0.60.3
RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'

2
meson.build
View file

@ -1,6 +1,6 @@
project('gstreamer-full', 'c',
version : '1.21.0.1',
meson_version : '>= 0.59',
meson_version : '>= 0.60.0',
default_options : ['buildtype=debugoptimized',
# Needed due to https://github.com/mesonbuild/meson/issues/1889,
# but this can cause problems in the future. Remove it