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.

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

fmt 9.0.0 #105132

Closed
wants to merge 28 commits into from
Closed

fmt 9.0.0 #105132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0fcbc7e
fmt 9.0.0
owine Jul 5, 2022
69fb95d
fmt: Remove patch
owine Jul 5, 2022
61d5110
bear: revision bump (fmt 9.0.0)
carlocab Aug 16, 2022
ac3c102
cherrytree: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
43d72b1
clip: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
36bb99c
easyrpg-player: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
9c8d4db
fb303: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
c8aeedc
fbthrift: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
1564968
fizz: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
a4e3696
folly: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
6a05b53
gnuradio: revision bump (fmt 9.0.0)
carlocab Aug 16, 2022
262d334
mkvtoolnix: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
49f64a1
mpd: revision bump (fmt 9.0.0)
carlocab Jul 24, 2022
41b5915
poac: revision bump (fmt 9.0.0)
carlocab Aug 16, 2022
ac37dda
spdlog: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
c0e66e2
vcpkg: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
f8ae752
vowpal-wabbit: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
4f52872
wangle: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
f077656
watchman: revision bump (fmt 9.0.0)
carlocab Jul 5, 2022
dccc369
fb303 2022.08.15.00
chenrui333 Aug 15, 2022
6e5b3bd
fbthrift 2022.08.15.00
chenrui333 Aug 15, 2022
51b81df
fizz 2022.08.15.00
chenrui333 Aug 15, 2022
dba532a
folly 2022.08.15.00
chenrui333 Aug 15, 2022
77a3dbe
wangle 2022.08.15.00
chenrui333 Aug 15, 2022
b7f6739
watchman 2022.08.15.00
chenrui333 Aug 15, 2022
055fb15
watchman: remove comment
chenrui333 Aug 15, 2022
c197178
fizz: disable `liboqs`
carlocab Aug 16, 2022
e138cda
fbthrift: fix build failure
carlocab Aug 16, 2022
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
2 changes: 1 addition & 1 deletion Formula/bear.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Bear < Formula
url "https://github.com/rizsotto/Bear/archive/3.0.20.tar.gz"
sha256 "45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7"
license "GPL-3.0-or-later"
revision 1
revision 2
head "https://github.com/rizsotto/Bear.git", branch: "master"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/cherrytree.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Cherrytree < Formula
url "https://www.giuspen.com/software/cherrytree_0.99.48.tar.xz"
sha256 "4bba4f19d23560e8aa59f2ab1e76f128f7f02adaebb5813e826e1753ee5d81fa"
license "GPL-3.0-or-later"
revision 1

livecheck do
url :homepage
Expand Down
2 changes: 1 addition & 1 deletion Formula/clip.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Clip < Formula
url "https://github.com/asmuth/clip/archive/v0.7.tar.gz"
sha256 "f38f455cf3e9201614ac71d8a871e4ff94a6e4cf461fd5bf81bdf457ba2e6b3e"
license "Apache-2.0"
revision 1
revision 2

bottle do
sha256 cellar: :any, arm64_monterey: "02d8da157f889f384abb2900d10ead88cc6bfaba984165e78a92f6fbce100f6e"
Expand Down
2 changes: 1 addition & 1 deletion Formula/easyrpg-player.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class EasyrpgPlayer < Formula
url "https://easyrpg.org/downloads/player/0.7.0/easyrpg-player-0.7.0.tar.xz"
sha256 "12149f89cc84f3a7f1b412023296cf42041f314d73f683bc6775e7274a1c9fbc"
license "GPL-3.0-or-later"
revision 1
revision 2

livecheck do
url "https://github.com/EasyRPG/Player.git"
Expand Down
4 changes: 2 additions & 2 deletions Formula/fb303.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Fb303 < Formula
desc "Thrift functions for querying information from a service"
homepage "https://github.com/facebook/fb303"
url "https://github.com/facebook/fb303/archive/v2022.08.08.00.tar.gz"
sha256 "5235b7c96a72c40b081a2a8cb6f4fd61b03e0f3d868ea34a417456bb210e562a"
url "https://github.com/facebook/fb303/archive/v2022.08.15.00.tar.gz"
sha256 "4d9e652f5a2ff9b06dfd519b0b9f0903dad4e88cc41ac696cee523abe6cfbf6a"
license "Apache-2.0"
head "https://github.com/facebook/fb303.git", branch: "main"

Expand Down
11 changes: 9 additions & 2 deletions Formula/fbthrift.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Fbthrift < Formula
desc "Facebook's branch of Apache Thrift, including a new C++ server"
homepage "https://github.com/facebook/fbthrift"
url "https://github.com/facebook/fbthrift/archive/v2022.08.08.00.tar.gz"
sha256 "6b5165b4f5115f3537b9b5843f2dec21cd4836e6d69d8562dcdfae13ca8ff322"
url "https://github.com/facebook/fbthrift/archive/v2022.08.15.00.tar.gz"
sha256 "511734c1371d5ac2a7d05d50dde77cc04bd6b80ea824bcfbf065c9b298c24936"
license "Apache-2.0"
head "https://github.com/facebook/fbthrift.git", branch: "main"

Expand Down Expand Up @@ -47,6 +47,13 @@ class Fbthrift < Formula

fails_with gcc: "5" # C++ 17

# Fix missing `#include`. Can likely be removed in the next release.
# https://github.com/facebook/fbthrift/pull/513
patch do
url "https://github.com/facebook/fbthrift/commit/cda0b24feb1cb93e177473ec6ca2e4714c14c931.patch?full_index=1"
sha256 "ff03957befef34ee90270dd81b3bdff4dadc1aa0bd0a0d618882dc1a17dc7edc"
end

def install
ENV.llvm_clang if OS.mac? && (DevelopmentTools.clang_build_version <= 1100)

Expand Down
11 changes: 9 additions & 2 deletions Formula/fizz.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Fizz < Formula
desc "C++14 implementation of the TLS-1.3 standard"
homepage "https://github.com/facebookincubator/fizz"
url "https://github.com/facebookincubator/fizz/releases/download/v2022.08.08.00/fizz-v2022.08.08.00.tar.gz"
sha256 "74cf7c76289f0eed76e6a000b6161d9e7ef27264f7d05d6bd3c2597313d68e03"
url "https://github.com/facebookincubator/fizz/releases/download/v2022.08.15.00/fizz-v2022.08.15.00.tar.gz"
sha256 "580c784f9302814daa2bab9e5fa68c29751470b4d95a65dd36f6b2b70f3d7ad4"
license "BSD-2-Clause"
head "https://github.com/facebookincubator/fizz.git", branch: "main"

Expand Down Expand Up @@ -35,6 +35,13 @@ class Fizz < Formula

fails_with gcc: "5"

# Disable `liboqs` requirement. Remove in next release.
# https://github.com/facebookincubator/fizz/issues/79
patch do
url "https://github.com/facebookincubator/fizz/commit/6e237b10a58a8d90ed5f1819abd7842c423fb956.patch?full_index=1"
sha256 "d9eda54340d4f61641c8f19974ffa51417871ca2f7a0bd581818fa5560860117"
end

def install
args = []
args << "-DLIBRT_LIBRARY=/usr/lib/x86_64-linux-gnu/librt.so" if OS.linux?
Expand Down
12 changes: 2 additions & 10 deletions Formula/fmt.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Fmt < Formula
desc "Open-source formatting library for C++"
homepage "https://fmt.dev/"
url "https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz"
sha256 "3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346"
url "https://github.com/fmtlib/fmt/archive/9.0.0.tar.gz"
sha256 "9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5"
license "MIT"
revision 1
head "https://github.com/fmtlib/fmt.git", branch: "master"

bottle do
Expand All @@ -18,13 +17,6 @@ class Fmt < Formula

depends_on "cmake" => :build

# Fix Watchman build.
# https://github.com/fmtlib/fmt/issues/2717
patch do
url "https://github.com/fmtlib/fmt/commit/8f8a1a02d5c5cb967d240feee3ffac00d66f22a2.patch?full_index=1"
sha256 "ac5d7a8f9eabd40e34f21b1e0034fbc4147008f13b7bf2314131239fb3a7bdab"
end

def install
system "cmake", ".", "-DBUILD_SHARED_LIBS=TRUE", *std_cmake_args
system "make", "install"
Expand Down
13 changes: 2 additions & 11 deletions Formula/folly.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
class Folly < Formula
desc "Collection of reusable C++ library artifacts developed at Facebook"
homepage "https://github.com/facebook/folly"
url "https://github.com/facebook/folly/archive/v2022.08.15.00.tar.gz"
sha256 "6cc4a357779c1ceac4b855946651903068d1bbcf057f560946a418bb8d399ee0"
license "Apache-2.0"
head "https://github.com/facebook/folly.git", branch: "main"

stable do
url "https://github.com/facebook/folly/archive/v2022.08.08.00.tar.gz"
sha256 "ad27468c3c8dddacd592baa688b5d9b0a1de30c8f57e959fb88ba68a231f853d"

# Fix CMake bugs for x86_64 builds. Remove in the next release.
patch do
url "https://github.com/facebook/folly/commit/10fc2e449038d9ffda5cd53999edb9875c4cb151.patch?full_index=1"
sha256 "23b7a26530d83b391a5e587e5ba6c88c2831dc516b2438a99eb27c6d1b9e7e1d"
end
end

bottle do
sha256 cellar: :any, arm64_monterey: "c1362885393d8e5d552b360cc59a2128e95f003309bb933da6310c14d041e9fe"
sha256 cellar: :any, arm64_big_sur: "872870fa85cbe47023b145c7ac63fad7ebe5cbe984152121aeb0fb693c870ec5"
Expand Down
12 changes: 10 additions & 2 deletions Formula/gnuradio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Gnuradio < Formula
url "https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.3.0.tar.gz"
sha256 "957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75"
license "GPL-3.0-or-later"
revision 1
revision 2
head "https://github.com/gnuradio/gnuradio.git", branch: "main"

livecheck do
Expand Down Expand Up @@ -97,9 +97,17 @@ class Gnuradio < Formula
sha256 "7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"
end

# Fix upstreamed here: https://github.com/gnuradio/gnuradio/pull/6002.
# Fix build with newer GCC
# https://github.com/gnuradio/gnuradio/pull/6002.
patch :DATA

# Fix build with fmt 9+
# https://github.com/gnuradio/gnuradio/pull/6053
patch do
url "https://github.com/gnuradio/gnuradio/commit/e63ee41fd455cdd39ae983c258d8632c3ea57fc6.patch?full_index=1"
sha256 "be4373f13ffe8ae8ddc7216eb2b7ddb436b7be345cc0e108ae60b5010935a859"
end

def install
python = "python3.10"
ENV.cxx11
Expand Down
1 change: 1 addition & 0 deletions Formula/mkvtoolnix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Mkvtoolnix < Formula
mirror "https://fossies.org/linux/misc/mkvtoolnix-70.0.0.tar.xz"
sha256 "64324b7ee6b4aa6fab5f517ca93667d12260a4ea92ea80b97575beda3a91693a"
license "GPL-2.0-or-later"
revision 1

livecheck do
url "https://mkvtoolnix.download/sources/"
Expand Down
26 changes: 26 additions & 0 deletions Formula/mpd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Mpd < Formula
url "https://www.musicpd.org/download/mpd/0.23/mpd-0.23.8.tar.xz"
sha256 "86bb569bf3b519821f36f6bb5564e484e85d2564411b34b200fe2cd3a04e78cf"
license "GPL-2.0-or-later"
revision 1
head "https://github.com/MusicPlayerDaemon/MPD.git", branch: "master"

livecheck do
Expand Down Expand Up @@ -54,6 +55,10 @@ class Mpd < Formula

fails_with gcc: "5"

# Fix build with FFmpeg 5.1. Backported from
# https://github.com/MusicPlayerDaemon/MPD/commit/59792cb0b801854ee41be72d33db9542735df754
patch :DATA

def install
# mpd specifies -std=gnu++0x, but clang appears to try to build
# that against libstdc++ anyway, which won't work.
Expand Down Expand Up @@ -142,3 +147,24 @@ def caveats
end
end
end

__END__
diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
index 2e22d9599102ac445fc269c69863f4c2c34bfe1c..5b5c8b40e3a0b95fbf5e75a0cf9b53e2c416a36f 100644
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -21,10 +21,13 @@
#define __STDC_CONSTANT_MACROS

#include "FfmpegIo.hxx"
-#include "libavutil/mem.h"
#include "../DecoderAPI.hxx"
#include "input/InputStream.hxx"

+extern "C" {
+#include <libavutil/mem.h>
+}
+
AvioStream::~AvioStream()
{
if (io != nullptr) {
2 changes: 1 addition & 1 deletion Formula/poac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Poac < Formula
url "https://github.com/poacpm/poac/archive/refs/tags/0.4.1.tar.gz"
sha256 "3717a873120a7125fcdcc99227f5c7d42c4e170f7572feee19ab458d657f9451"
license "Apache-2.0"
revision 1
revision 2
head "https://github.com/poacpm/poac.git", branch: "main"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/spdlog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Spdlog < Formula
url "https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz"
sha256 "697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224"
license "MIT"
revision 1
head "https://github.com/gabime/spdlog.git", branch: "v1.x"

bottle do
Expand Down
8 changes: 8 additions & 0 deletions Formula/vcpkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Vcpkg < Formula
version "2022.07.21"
sha256 "44085e694a913d529d8f16d03cb9d3c7ba614e82452fc0156bb075f7f6df5920"
license "MIT"
revision 1
head "https://github.com/microsoft/vcpkg-tool.git", branch: "main"

# The source repository has pre-release tags with the same
Expand Down Expand Up @@ -34,6 +35,13 @@ class Vcpkg < Formula

fails_with gcc: "5"

# Fix build with fmt 9+
# https://github.com/microsoft/vcpkg-tool/pull/634
patch do
url "https://github.com/microsoft/vcpkg-tool/commit/5fba654cc47c175202491a5d80f280c0e39b364d.patch?full_index=1"
sha256 "e9a61b8fc8e2ce21ae5eae36bf36b5e5214b0a624ef7c938ddea0e739a61340a"
end

def install
# Improve error message when user fails to set `VCPKG_ROOT`.
inreplace ["include/vcpkg/base/messages.h", "locales/messages.json", "locales/messages.en.json"],
Expand Down
1 change: 1 addition & 0 deletions Formula/vowpal-wabbit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class VowpalWabbit < Formula
url "https://github.com/VowpalWabbit/vowpal_wabbit/archive/9.3.0.tar.gz"
sha256 "e7ffda2782bb2f0bdf8235db3e9655c71e005d762cab0fa19d260fe672c6104b"
license "BSD-3-Clause"
revision 1
head "https://github.com/VowpalWabbit/vowpal_wabbit.git", branch: "master"

bottle do
Expand Down
4 changes: 2 additions & 2 deletions Formula/wangle.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Wangle < Formula
desc "Modular, composable client/server abstractions framework"
homepage "https://github.com/facebook/wangle"
url "https://github.com/facebook/wangle/releases/download/v2022.08.08.00/wangle-v2022.08.08.00.tar.gz"
sha256 "b0e4f1beda451e3a35547d250531eb40950fe1d376dd6dc0282e21b1709eb4d8"
url "https://github.com/facebook/wangle/releases/download/v2022.08.15.00/wangle-v2022.08.15.00.tar.gz"
sha256 "23b11749b9e66453b7ca327324aaba6c7611bf22cd092f017589693a334fbb0b"
license "Apache-2.0"
head "https://github.com/facebook/wangle.git", branch: "master"

Expand Down
17 changes: 6 additions & 11 deletions Formula/watchman.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ class Watchman < Formula
desc "Watch files and take action when they change"
homepage "https://github.com/facebook/watchman"
license "MIT"
revision 1

stable do
url "https://github.com/facebook/watchman/archive/v2022.08.08.00.tar.gz"
sha256 "216cd998559f1799012c362468e4e8cd7beadebd71aceb4c2d1e475770ce72a4"
url "https://github.com/facebook/watchman/archive/v2022.08.15.00.tar.gz"
sha256 "8b95b0ac3de81bd7bc7d243e4785d4e9f8e8c41d70a0fb8b03425c078bdcc434"

# `edencommon` currently doesn't provide tagged releases, so we just use a commit
# around release time of `watchman`. For example, we can use the `edencommon` commit
# that updates folly-rev.txt file to match `folly` formula version release commit.
# TODO: Once tags are available, either switch to tag or create a dedicated formula.
resource "edencommon" do
url "https://github.com/facebookexperimental/edencommon/archive/d356bb7a9a28f09f00d72a81f7b60f8f27ce249c.tar.gz"
sha256 "d5c5277bb697f131abd591d52d8b9cb905309d516fd767a4d6cdf3b156659060"
url "https://github.com/facebookexperimental/edencommon/archive/refs/tags/v2022.08.15.00.tar.gz"
sha256 "5e04fc7a0577160f5736a411097086bd85eeef5066f44387b00305b107b0563a"
end
end

Expand Down Expand Up @@ -90,8 +85,8 @@ def install
system "cmake", "--install", "build"

path = Pathname.new(File.join(prefix, HOMEBREW_PREFIX))
bin.install Dir[path/"bin/*"]
lib.install Dir[path/"lib/*"]
bin.install (path/"bin").children
lib.install (path/"lib").children
path.rmtree
end

Expand Down