Skip to content

Commit

Permalink
Merge pull request #197973 from Homebrew/bump-librist-0.2.11
Browse files Browse the repository at this point in the history
librist 0.2.11
  • Loading branch information
BrewTestBot authored Nov 17, 2024
2 parents 3861005 + 4225f86 commit 6562ffa
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 28 deletions.
1 change: 1 addition & 0 deletions .github/autobump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,7 @@ libre
librealsense
librespot
libressl
librist
librsvg
librtlsdr
libsail
Expand Down
53 changes: 25 additions & 28 deletions Formula/lib/librist.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Librist < Formula
desc "Reliable Internet Stream Transport (RIST)"
homepage "https://code.videolan.org/rist/"
url "https://code.videolan.org/rist/librist/-/archive/v0.2.10/librist-v0.2.10.tar.gz"
sha256 "797e486961cd09bc220c5f6561ca5a08e7747b313ec84029704d39cbd73c598c"
url "https://code.videolan.org/rist/librist/-/archive/v0.2.11/librist-v0.2.11.tar.gz"
sha256 "84e413fa9a1bc4e2607ecc0e51add363e1bc5ad42f7cc5baec7b253e8f685ad3"
license "BSD-2-Clause"
revision 1
head "https://code.videolan.org/rist/librist.git", branch: "master"

livecheck do
Expand All @@ -13,14 +12,12 @@ class Librist < Formula
end

bottle do
sha256 cellar: :any, arm64_sequoia: "9cfc0d6d15b04984a38c13a4fb4c1e8991858b0d41da5f8bef16b6c5a5fc46cf"
sha256 cellar: :any, arm64_sonoma: "a008dc6bced0ba4ac31a79da417afa539d4ab0d25b9d22769ea396a17b355c8c"
sha256 cellar: :any, arm64_ventura: "0033aff814342a0a4900ea6914411e7a9b506c938038017aa49f197c33283bd2"
sha256 cellar: :any, arm64_monterey: "2604a28b6b7cec24badaf0ea472cae1b3524fcf1a082098394279867e5ad30ee"
sha256 cellar: :any, sonoma: "323c1b0e5a44a85657052208a0ed481a0a7aba20ab8e2d06c7e3fb5593c4cc4e"
sha256 cellar: :any, ventura: "cb36444b6c786bcfbbe40af9579f68a88e153e5d8192b8f55a8a8d6f0d5b4c4f"
sha256 cellar: :any, monterey: "c89029f1a47bae2ef37f7488942a86da57e2d49048f385df1442ee666f90a24e"
sha256 cellar: :any_skip_relocation, x86_64_linux: "d94498117f55c482ad621f50696c9592e8d7226ed92ef8d3028faf0afd3a69fc"
sha256 cellar: :any, arm64_sequoia: "5d585b8708b16c93ce9923a1ac8c1b8ce94e581c66966675b482da7464fee2ea"
sha256 cellar: :any, arm64_sonoma: "5492e570120f87b3e8729e200304be55c2af9c20163b0292f8db746ae132aee9"
sha256 cellar: :any, arm64_ventura: "891def5dc77ba1e982ab1cb27efe8f47383988e7f503b91d844ceab49a3bac5a"
sha256 cellar: :any, sonoma: "e3d7ba37bcb616c8e01ec27539761d081b734a33ea109ae7cb40a0794c97e4da"
sha256 cellar: :any, ventura: "6c5a48f683db99c537f41f16056a48a645487e3f6c49742a68d9beafc8e7fb98"
sha256 cellar: :any_skip_relocation, x86_64_linux: "16cee2bf08b7c7a1ac67d23025f25c71ca5af8fa2a6627376eb6cecd4cb26323"
end

depends_on "meson" => :build
Expand All @@ -29,7 +26,7 @@ class Librist < Formula
depends_on "libmicrohttpd"
depends_on "mbedtls"

# Add build macos build patch
# remove brew setup
patch :DATA

def install
Expand All @@ -46,19 +43,19 @@ def install
end

__END__
diff --git a/tools/srp_shared.c b/tools/srp_shared.c
index f782126..900db41 100644
--- a/tools/srp_shared.c
+++ b/tools/srp_shared.c
@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
if (stat(srpfile, &buf) != 0)
return;

+#ifdef __APPLE__
+ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
+#else
*generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
+#endif
#endif

if (!lookup_data || !hashversion)
diff --git a/meson.build b/meson.build
index 05d00b3..254d0ab 100755
--- a/meson.build
+++ b/meson.build
@@ -39,11 +39,6 @@ deps = []
platform_files = []
inc = []
inc += include_directories('.', 'src', 'include/librist', 'include', 'contrib')
-if (host_machine.system() == 'darwin')
- r = run_command('brew', '--prefix', check: true)
- brewoutput = r.stdout().strip()
- inc += include_directories(brewoutput + '/include')
-endif

#builtin_lz4 = get_option('builtin_lz4')
builtin_cjson = get_option('builtin_cjson')

0 comments on commit 6562ffa

Please sign in to comment.