From b4a3062dd49bfcc04085afc2fe23903e6b7f1e66 Mon Sep 17 00:00:00 2001 From: Porkepix Date: Tue, 18 Jan 2022 18:46:19 +0100 Subject: [PATCH 1/3] libwebsockets 4.3.1 --- Formula/libwebsockets.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/libwebsockets.rb b/Formula/libwebsockets.rb index c315276cf8bfc2..6af174ebf1ec0b 100644 --- a/Formula/libwebsockets.rb +++ b/Formula/libwebsockets.rb @@ -2,8 +2,8 @@ class Libwebsockets < Formula desc "C websockets server library" homepage "https://libwebsockets.org" url "https://github.com/warmcat/libwebsockets.git", - tag: "v4.3.0", - revision: "a5aae049b2a386712e1be3b417915c0d44c7e675" + tag: "v4.3.1", + revision: "91f0b3bc0f6530f74e4961b9ae49fba6bee8f7b6" license "MIT" head "https://github.com/warmcat/libwebsockets.git", branch: "main" From b7952d188a58c442b6afb0f5206d33b6bc6327e2 Mon Sep 17 00:00:00 2001 From: Nanda H Krishna Date: Tue, 18 Jan 2022 13:52:42 -0500 Subject: [PATCH 2/3] ttyd: revision bump (libwebsockets 4.3.1) --- Formula/ttyd.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Formula/ttyd.rb b/Formula/ttyd.rb index a80ec280efcc5a..2b28be8f155fad 100644 --- a/Formula/ttyd.rb +++ b/Formula/ttyd.rb @@ -4,7 +4,7 @@ class Ttyd < Formula url "https://github.com/tsl0922/ttyd/archive/1.6.3.tar.gz" sha256 "1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9" license "MIT" - revision 4 + revision 5 head "https://github.com/tsl0922/ttyd.git", branch: "main" bottle do @@ -27,10 +27,12 @@ class Ttyd < Formula uses_from_macos "vim" # needed for xxd def install - system "cmake", ".", - *std_cmake_args, - "-DOPENSSL_ROOT_DIR=#{Formula["openssl@1.1"].opt_prefix}" - system "make", "install" + system "cmake", "-S", ".", "-B", "build", + "-DOPENSSL_ROOT_DIR=#{Formula["openssl@1.1"].opt_prefix}", + "-Dlibwebsockets_DIR=#{Formula["libwebsockets"].opt_lib/"cmake/libwebsockets"}", + *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do From fd529a79712d714d393cd85dc24f5cfb7c95625a Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 19 Jan 2022 20:51:28 +0800 Subject: [PATCH 3/3] libwebsockets: use a tarball instead of a Git clone Also, let's use more modern `cmake` syntax. --- Formula/libwebsockets.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Formula/libwebsockets.rb b/Formula/libwebsockets.rb index 6af174ebf1ec0b..0a78427057b100 100644 --- a/Formula/libwebsockets.rb +++ b/Formula/libwebsockets.rb @@ -1,14 +1,13 @@ class Libwebsockets < Formula desc "C websockets server library" homepage "https://libwebsockets.org" - url "https://github.com/warmcat/libwebsockets.git", - tag: "v4.3.1", - revision: "91f0b3bc0f6530f74e4961b9ae49fba6bee8f7b6" + url "https://github.com/warmcat/libwebsockets/archive/v4.3.1.tar.gz" + sha256 "8fdb1454a1b34cd9a6351beaab237a485e6853806101de7e62bd2bc250bb50af" license "MIT" head "https://github.com/warmcat/libwebsockets.git", branch: "main" livecheck do - url "https://github.com/warmcat/libwebsockets" + url :stable regex(/^v?(\d+(?:\.\d+)+)$/i) end @@ -30,16 +29,17 @@ class Libwebsockets < Formula uses_from_macos "zlib" def install - system "cmake", ".", *std_cmake_args, + system "cmake", "-S", ".", "-B", "build", "-DLWS_IPV6=ON", "-DLWS_WITH_HTTP2=ON", "-DLWS_WITH_LIBEVENT=ON", "-DLWS_WITH_LIBUV=ON", "-DLWS_WITH_PLUGINS=ON", "-DLWS_WITHOUT_TESTAPPS=ON", - "-DLWS_UNIX_SOCK=ON" - system "make" - system "make", "install" + "-DLWS_UNIX_SOCK=ON", + *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do