Merge pull request #200785 from Homebrew/bump-libnfs-6.0.0

libnfs 6.0.0
Homebrew · Dec 13, 2024 · 9fa6ce8 · 9fa6ce8
2 parents 7ae3f0d + 425377a
commit 9fa6ce8
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 26 deletions.
diff --git a/Formula/lib/libnfs.rb b/Formula/lib/libnfs.rb
@@ -1,35 +1,47 @@
 class Libnfs < Formula
   desc "C client library for NFS"
   homepage "https://github.com/sahlberg/libnfs"
-  url "https://github.com/sahlberg/libnfs/archive/refs/tags/libnfs-5.0.3.tar.gz"
-  sha256 "d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e"
+  url "https://github.com/sahlberg/libnfs/archive/refs/tags/libnfs-6.0.0.tar.gz"
+  sha256 "6fe64b5a47b2558484c8beb05819c1f1f3e52cc52a7b3a8b805faf398e9a9c24"
   license "LGPL-2.1-or-later"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia:  "e758339be8153e070291e70acb20491ef97d2f1c56a2778e11f356ffcefc60ff"
-    sha256 cellar: :any,                 arm64_sonoma:   "7a52ed77480250f7f6503c89b55939851022fda4b557723df98ee14572900003"
-    sha256 cellar: :any,                 arm64_ventura:  "dff7c08f835774d855710f8195b3fa53d38b4a0d89a1277f8e422d2de6117e21"
-    sha256 cellar: :any,                 arm64_monterey: "06f16c29ed988b38d91ee5f800b93116b41288f993a694603f0af3584f59fdb9"
-    sha256 cellar: :any,                 sonoma:         "165309bcf7d58c4bbe4c62889d8de976b85e01102e1e49eb4a7d84632b35ef13"
-    sha256 cellar: :any,                 ventura:        "00999f67b246396751e8fd9137cb057bf14b2b99f0d059fdaf6e2cb0fa25998f"
-    sha256 cellar: :any,                 monterey:       "1df9d2c2a44214573663eff072d237b090d297ceadca7ab2923daca3cabc6a99"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "da4022b87ad4d500dafafeccbf35e4bebcf2bbbcf23bb47a37c0b35edec09ec5"
+    sha256 cellar: :any,                 arm64_sequoia: "fcb8f457b3c931062da17f2b03dc212cac367b2c03bc62b2b74cdffc6c5e6df4"
+    sha256 cellar: :any,                 arm64_sonoma:  "21ce9df74b1ef7002f78d97a6fd03ed5e7d14f16649a415fa3fcebda67ccbf28"
+    sha256 cellar: :any,                 arm64_ventura: "a528cf7f37ed7c7372cf2af7ea4ce62898fc47b711a30d0f0ec9382c0808f828"
+    sha256 cellar: :any,                 sonoma:        "1137695cb76bf3596ce1f1ed1ddbc6027c588555eeb6f017c2c3f052bab1a04b"
+    sha256 cellar: :any,                 ventura:       "7260fb1a04639b3c2c4b1e8967a8b75ec012540d9de6d612079749799f42021c"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "c526e05b0f69358b24b175a100e4ddfae37f82a747286c6c1d0580731ce259e8"
   end
 
-  depends_on "autoconf" => :build
-  depends_on "automake" => :build
-  depends_on "libtool" => :build
+  depends_on "cmake" => :build
+  depends_on "docbook" => :build
+  depends_on "docbook-xsl" => :build
+
+  # Ref: https://github.com/sahlberg/libnfs/commit/2044497b7faba9404a3a17e81cbfdeb5e8aaaa9c
+  # Remove on next release
+  patch do
+    url "https://github.com/sahlberg/libnfs/commit/2044497b7faba9404a3a17e81cbfdeb5e8aaaa9c.patch?full_index=1"
+    sha256 "b31e61faa640ea1c5b590bc884c57fef2d6c40e9ee94596353648d057026bc1b"
+  end
+
+  # rpath config patch, upstream pr ref, https://github.com/sahlberg/libnfs/pull/502
+  patch do
+    url "https://github.com/sahlberg/libnfs/commit/2db7ebd9e15b4fedd2750af1a3d66b146c1da3b7.patch?full_index=1"
+    sha256 "eed5d8f35742278b74c2592473554a0050da9105432028e82f5b13d32e52d8b8"
+  end
 
   def install
-    system "./bootstrap"
-    system "./configure", "--disable-dependency-tracking",
-                          "--disable-silent-rules",
-                          "--prefix=#{prefix}"
+    ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog"
 
-    system "make", "install"
+    system "cmake", "-S", ".", "-B", "build", "-DENABLE_DOCUMENTATION=ON", "-DENABLE_UTILS=ON", *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
   end
 
   test do
+    assert_match "No URL specified", shell_output("#{bin}/nfs-ls 2>&1", 1)
+
     (testpath/"test.c").write <<~C
       #if defined(__linux__)
       # include <sys/time.h>

diff --git a/Formula/m/mpd.rb b/Formula/m/mpd.rb
@@ -1,18 +1,28 @@
 class Mpd < Formula
   desc "Music Player Daemon"
   homepage "https://github.com/MusicPlayerDaemon/MPD"
-  url "https://github.com/MusicPlayerDaemon/MPD/archive/refs/tags/v0.23.16.tar.gz"
-  sha256 "a3ba8a4ef53c681ae5d415a79fbd1409d61cb3d03389a51595af24b330ecbb61"
   license "GPL-2.0-or-later"
+  revision 1
   head "https://github.com/MusicPlayerDaemon/MPD.git", branch: "master"
 
+  stable do
+    url "https://github.com/MusicPlayerDaemon/MPD/archive/refs/tags/v0.23.16.tar.gz"
+    sha256 "a3ba8a4ef53c681ae5d415a79fbd1409d61cb3d03389a51595af24b330ecbb61"
+
+    # support libnfs 6.0.0, upstream commit ref, https://github.com/MusicPlayerDaemon/MPD/commit/31e583e9f8d14b9e67eab2581be8e21cd5712b47
+    patch do
+      url "https://raw.githubusercontent.com/Homebrew/formula-patches/557ad661621fa81b5e6ff92ab169ba40eba58786/mpd/0.23.16-libnfs-6.patch"
+      sha256 "e0f2e6783fbb92d9850d31f245044068dc0614721788d16ecfa8aacfc5c27ff3"
+    end
+  end
+
   bottle do
-    sha256 cellar: :any, arm64_sequoia: "1006ec44f5c3e1552377a51b5248771289e1771a2b31a70413afe24f2b3afdd5"
-    sha256 cellar: :any, arm64_sonoma:  "52b6640e47e904a95131c300f18c65bf61c2bd267c68d57d692bd9ff8a5f08e4"
-    sha256 cellar: :any, arm64_ventura: "61b804812874fd1cb7bfac014e5d7ffc266d836a8efa294f38ed2cc61dc6768f"
-    sha256 cellar: :any, sonoma:        "dbabcb12a9e9322aa1c86c4c1987e737b73b7c984381b570702ddbc8e85952b1"
-    sha256 cellar: :any, ventura:       "7ee23cae927105128197d77fa7cd800253ca9c13c56def3883452b9182da4343"
-    sha256               x86_64_linux:  "0abc08fe20c596d3747c99905001e0319412848cbdd466b40a8dc6d55fb2ece4"
+    sha256 cellar: :any, arm64_sequoia: "3af030e17bd7433e049c2341b7f3f321e0965c27252655b69b18306d8d992c6d"
+    sha256 cellar: :any, arm64_sonoma:  "cabab5a22d663c2e833fe58fddbdcb03cfbb62a84e4cd107fa5dec021c7a9302"
+    sha256 cellar: :any, arm64_ventura: "369c7be3485037c3acb899eb458379d242eb8a08fe1cd22f16cc6f91d4f8015b"
+    sha256 cellar: :any, sonoma:        "f8fd84ded5edf6e72cb449f7a497af00cc5dd79f8726c5b623a982de9ed37bf8"
+    sha256 cellar: :any, ventura:       "4b5f3543fc9c7ecf05c159e4493698b2e2258c7e4b26f0097508c92484963323"
+    sha256               x86_64_linux:  "4002b2017b63e8f966c7bb9002f89cd8f1009e2fd4fff956bcc5ea39305c274a"
   end
 
   depends_on "boost" => :build
@@ -71,6 +81,7 @@ def install
     ENV.libcxx
 
     args = %W[
+      -Dcpp_std=c++20
       --sysconfdir=#{etc}
       -Dmad=disabled
       -Dmpcdec=disabled