Bump Meson requirement to >=0.60.0

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1934>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 731a6a8..0d6e3c5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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'

diff --git a/ci/docker/fedora/prepare.sh b/ci/docker/fedora/prepare.sh
index 5e0563f..0ed4cb6 100644 (file)
--- a/ci/docker/fedora/prepare.sh
+++ b/ci/docker/fedora/prepare.sh
@@ -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

diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile
index 59ebf79..83fbca5 100644 (file)
--- a/ci/docker/windows/Dockerfile
+++ b/ci/docker/windows/Dockerfile
@@ -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"'
 

diff --git a/meson.build b/meson.build
index 6d363fd..ace91f1 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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