Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnfs 6.0.0 #200785

Merged
merged 4 commits into from
Dec 13, 2024
Merged

libnfs 6.0.0 #200785

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae89a84
libnfs 6.0.0
bevanjkay Dec 11, 2024
558d952
mpd: revision bump (libnfs 6.0.0)
chenrui333 Dec 13, 2024
060d0a5
libnfs: update 6.0.0 bottle.
BrewTestBot Dec 13, 2024
425377a
mpd: update 0.23.16_1 bottle.
BrewTestBot Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions Formula/lib/libnfs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Libnfs < Formula

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / Linux

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)

Check notice on line 1 in Formula/lib/libnfs.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

Bottle cache hit 

Bottle for libnfs built at 619ae4b0da5 (Merge ae89a846f0b6aa056df65288666b29fcddda13dd into f6f4a0cbaab84c9448058fc4e1da3fe3f07b0ec1, 2024-12-13)
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
Expand All @@ -16,20 +16,34 @@
sha256 cellar: :any_skip_relocation, x86_64_linux: "da4022b87ad4d500dafafeccbf35e4bebcf2bbbcf23bb47a37c0b35edec09ec5"
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>
Expand Down
15 changes: 13 additions & 2 deletions Formula/m/mpd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
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"
Expand Down Expand Up @@ -71,6 +81,7 @@ def install
ENV.libcxx

args = %W[
-Dcpp_std=c++20
--sysconfdir=#{etc}
-Dmad=disabled
-Dmpcdec=disabled
Expand Down
Loading