From d93098b9c0559233106ff5754c960fd197700607 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Sat, 13 Mar 2021 11:47:15 -0500
Subject: [PATCH] Upgrade meson and ninja

---
 Brewfile.lock.json | 62 ++++++++++++++++++++++++++++++----------------
 bin/setup          |  1 +
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/Brewfile.lock.json b/Brewfile.lock.json
index 0880bf8..14f66e5 100644
--- a/Brewfile.lock.json
+++ b/Brewfile.lock.json
@@ -2,43 +2,55 @@
   "entries": {
     "brew": {
       "meson": {
-        "version": "0.53.2",
+        "version": "0.57.1",
         "bottle": {
+          "rebuild": 0,
           "cellar": ":any_skip_relocation",
-          "prefix": "/usr/local",
+          "prefix": "/opt/homebrew",
+          "root_url": "https://homebrew.bintray.com/bottles",
           "files": {
+            "arm64_big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/meson-0.57.1.arm64_big_sur.bottle.tar.gz",
+              "sha256": "27cfeb861038b0c1928e2301bc3caf6dc4ed26bc7b353d796cd546b97099894b"
+            },
+            "big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/meson-0.57.1.big_sur.bottle.tar.gz",
+              "sha256": "f798ac28df81a00f561310c0586952a41634536953e31e8b313aadf54de7a975"
+            },
             "catalina": {
-              "url": "https://homebrew.bintray.com/bottles/meson-0.53.2.catalina.bottle.tar.gz",
-              "sha256": "b2855c6300305417e6b709f9f4a197b6b9905255d947dd8263b14443c18a64a6"
+              "url": "https://homebrew.bintray.com/bottles/meson-0.57.1.catalina.bottle.tar.gz",
+              "sha256": "617a2f8071127e097fe39d2cbeb92fbd2074ed0f38a9883f84e0ddc1449726da"
             },
             "mojave": {
-              "url": "https://homebrew.bintray.com/bottles/meson-0.53.2.mojave.bottle.tar.gz",
-              "sha256": "b2855c6300305417e6b709f9f4a197b6b9905255d947dd8263b14443c18a64a6"
-            },
-            "high_sierra": {
-              "url": "https://homebrew.bintray.com/bottles/meson-0.53.2.high_sierra.bottle.tar.gz",
-              "sha256": "b2855c6300305417e6b709f9f4a197b6b9905255d947dd8263b14443c18a64a6"
+              "url": "https://homebrew.bintray.com/bottles/meson-0.57.1.mojave.bottle.tar.gz",
+              "sha256": "eb3e4ffa73b41573c7c09a2ea44deefa4a8bcc512e1e5d0ebcac8d45f0c1bb77"
             }
           }
         }
       },
       "ninja": {
-        "version": "1.10.0",
+        "version": "1.10.2",
         "bottle": {
-          "cellar": ":any_skip_relocation",
-          "prefix": "/usr/local",
+          "rebuild": 0,
+          "cellar": "/opt/homebrew/Cellar",
+          "prefix": "/opt/homebrew",
+          "root_url": "https://homebrew.bintray.com/bottles",
           "files": {
+            "arm64_big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.2.arm64_big_sur.bottle.tar.gz",
+              "sha256": "8be5a50d0bfe6bae6f920def1273bc0da888a5eef7304303888b1a5929bd517e"
+            },
+            "big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.2.big_sur.bottle.tar.gz",
+              "sha256": "e5e8174fb4bce324cfb42226d46ce1433f34866f0c06ce930a3bbdb40cadd395"
+            },
             "catalina": {
-              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.0.catalina.bottle.tar.gz",
-              "sha256": "b536415ef20ab14e808ef3fe558bbcd4c86de048d7e47cc86906fed4e1507fdc"
+              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.2.catalina.bottle.tar.gz",
+              "sha256": "5eb553057f7595f0c607b100ac263ab5834a057b11e8aca512555f5129f6d544"
             },
             "mojave": {
-              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.0.mojave.bottle.tar.gz",
-              "sha256": "07c7d5eab06643969950a168b7a4ce34a39d236869e909942294eb136dfe3063"
-            },
-            "high_sierra": {
-              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.0.high_sierra.bottle.tar.gz",
-              "sha256": "e413c88eed509424d118a0b61b7b3c63535fc7c8c92cd336322db7a8af9cf6e0"
+              "url": "https://homebrew.bintray.com/bottles/ninja-1.10.2.mojave.bottle.tar.gz",
+              "sha256": "8d7775944ef67e3f8884bff5ea0013a80c4811be8c268fdd9b37cc377eb9ec1b"
             }
           }
         }
@@ -54,6 +66,14 @@
         "CLT": "11.0.33.8",
         "Xcode": "11.4",
         "macOS": "10.15.4"
+      },
+      "big_sur": {
+        "HOMEBREW_VERSION": "3.0.5",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "d7f9e2148446c5889aaf8f2b1c88657d748820be",
+        "CLT": "12.4.0.0.1.1610135815",
+        "Xcode": "12.4",
+        "macOS": "11.2.1"
       }
     }
   }
diff --git a/bin/setup b/bin/setup
index 4940996..0938508 100755
--- a/bin/setup
+++ b/bin/setup
@@ -7,6 +7,7 @@ git apply --directory=libmpdclient/ libmpdclient.patch
 
 pushd libmpdclient
 
+meson setup --wipe output
 meson . output
 ninja -C output