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

Jump to bottom

libwebsockets 4.3.1 #93354

Closed
wants to merge 3 commits into from
Closed

libwebsockets 4.3.1 #93354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4a3062
libwebsockets 4.3.1
Porkepix Jan 18, 2022
b7952d1
ttyd: revision bump (libwebsockets 4.3.1)
nandahkrishna Jan 18, 2022
fd529a7
libwebsockets: use a tarball instead of a Git clone
carlocab Jan 19, 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
16 changes: 8 additions & 8 deletions Formula/libwebsockets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.0",
revision: "a5aae049b2a386712e1be3b417915c0d44c7e675"
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

Expand All @@ -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
Expand Down
12 changes: 7 additions & 5 deletions Formula/ttyd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"}",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SMillerDev This is the fix. Everything else is just refactoring

*std_cmake_args
system "cmake", "--build", "build"
system "cmake", "--install", "build"
end

test do
Expand Down