meson.recipe: Bump to 1.1.1

Needed for: https://github.com/mesonbuild/meson/pull/11804

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

2 files changed, 2 insertions, 36 deletions

diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe
index 8c352a26..c1b77c2c 100644
--- a/recipes/build-tools/meson.recipe
+++ b/recipes/build-tools/meson.recipe
@@ -6,7 +6,7 @@ from pathlib import PurePath, Path
 
 class Recipe(recipe.Recipe):
     name = 'meson'
-    version = '1.1.0'
+    version = '1.1.1'
     licenses = [License.Apachev2]
     btype = BuildType.CUSTOM
 
@@ -18,7 +18,7 @@ class Recipe(recipe.Recipe):
     else:
         stype = SourceType.TARBALL
         url = 'https://github.com/mesonbuild/meson/releases/download/%(version)s/meson-%(version)s.tar.gz'
-        tarball_checksum = 'd9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f'
+        tarball_checksum = 'd04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c'
 
     deps = ['ninja']
 
@@ -28,8 +28,6 @@ class Recipe(recipe.Recipe):
     patches = [
         # https://github.com/mesonbuild/meson/pull/11101
         'meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch',
-        # https://github.com/mesonbuild/meson/pull/11749
-        'meson/0001-wrap-Always-pass-posix-paths-to-patch.patch',
     ]
 
     async def install(self):
diff --git a/recipes/build-tools/meson/0001-wrap-Always-pass-posix-paths-to-patch.patch b/recipes/build-tools/meson/0001-wrap-Always-pass-posix-paths-to-patch.patch
deleted file mode 100644
index c3849a5d..00000000
--- a/recipes/build-tools/meson/0001-wrap-Always-pass-posix-paths-to-patch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3fffae513aa51231d39a342566a40d178295cebd Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Sat, 29 Apr 2023 16:24:18 +0530
-Subject: [PATCH] wrap: Always pass posix paths to patch
-
-patch on Windows is provided by MSYS, which only understands POSIX
-paths, with `/`. Using Windows paths with `\` results in a "file not
-found" error.
-
-We got a little lucky here because the path is relative, so the drive
-letter difference doesn't affect us.
----
- mesonbuild/wrap/wrap.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
-index d1ed31246..b63d7a43e 100644
---- a/mesonbuild/wrap/wrap.py
-+++ b/mesonbuild/wrap/wrap.py
-@@ -794,7 +794,8 @@ class Resolver:
-                 raise WrapException(f'Diff file "{path}" does not exist')
-             relpath = os.path.relpath(str(path), self.dirname)
-             if PATCH:
--                cmd = [PATCH, '-f', '-p1', '-i', relpath]
-+                # Always pass a POSIX path to patch, because on Windows it's MSYS
-+                cmd = [PATCH, '-f', '-p1', '-i', str(Path(relpath).as_posix())]
-             elif GIT:
-                 # If the `patch` command is not available, fall back to `git
-                 # apply`. The `--work-tree` is necessary in case we're inside a
--- 
-2.39.2
-