From 85cff900f8f0d230fce8b0203b7cdf00c734a361 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 18 Nov 2024 13:01:56 -0500 Subject: [PATCH 1/4] uhd: use `boost@1.85` --- Formula/u/uhd.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/u/uhd.rb b/Formula/u/uhd.rb index ce3b44d821802..7fa694da3ecc2 100644 --- a/Formula/u/uhd.rb +++ b/Formula/u/uhd.rb @@ -6,7 +6,7 @@ class Uhd < Formula url "https://github.com/EttusResearch/uhd/archive/refs/tags/v4.7.0.0.tar.gz" sha256 "afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10" license all_of: ["GPL-3.0-or-later", "LGPL-3.0-or-later", "MIT", "BSD-3-Clause", "Apache-2.0"] - revision 1 + revision 2 head "https://github.com/EttusResearch/uhd.git", branch: "master" livecheck do @@ -27,7 +27,7 @@ class Uhd < Formula depends_on "cmake" => :build depends_on "doxygen" => :build depends_on "pkgconf" => :build - depends_on "boost" + depends_on "boost@1.85" depends_on "libusb" depends_on "python@3.13" From 122cd4131111495167cbb695fca18f977b30da37 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 18 Nov 2024 13:00:53 -0500 Subject: [PATCH 2/4] gnuradio: use `boost@1.85` --- Formula/g/gnuradio.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Formula/g/gnuradio.rb b/Formula/g/gnuradio.rb index 69aad56e96353..3c0e62b9cc33d 100644 --- a/Formula/g/gnuradio.rb +++ b/Formula/g/gnuradio.rb @@ -6,7 +6,7 @@ class Gnuradio < Formula url "https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.11.0.tar.gz" sha256 "9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29" license "GPL-3.0-or-later" - revision 2 + revision 3 head "https://github.com/gnuradio/gnuradio.git", branch: "main" livecheck do @@ -30,7 +30,7 @@ class Gnuradio < Formula depends_on "pybind11" => :build depends_on "rust" => :build # for rpds-py depends_on "adwaita-icon-theme" - depends_on "boost" + depends_on "boost@1.85" # Boost 1.87+ PR ref: https://github.com/gnuradio/gnuradio/pull/7554 depends_on "cppzmq" depends_on "fftw" depends_on "fmt" @@ -245,9 +245,11 @@ class top_block : public gr::top_block { top.run(); } CPP - system ENV.cxx, testpath/"test.c++", "-std=c++17", "-L#{lib}", + + boost = Formula["boost@1.85"] + system ENV.cxx, testpath/"test.c++", "-std=c++17", "-I#{boost.opt_include}", "-L#{lib}", "-lgnuradio-blocks", "-lgnuradio-runtime", "-lgnuradio-pmt", - "-L#{Formula["boost"].opt_lib}", "-lboost_system", + "-L#{boost.opt_lib}", "-lboost_system", "-L#{Formula["log4cpp"].opt_lib}", "-llog4cpp", "-L#{Formula["fmt"].opt_lib}", "-lfmt", "-o", testpath/"test" From d41424ce5558b9d28c646e90b27d0ae67e516d83 Mon Sep 17 00:00:00 2001 From: Michael Cho <20700669+cho-m@users.noreply.github.com> Date: Fri, 13 Dec 2024 21:45:52 +0000 Subject: [PATCH 3/4] gnuradio: update 3.10.11.0_3 bottle. --- Formula/g/gnuradio.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Formula/g/gnuradio.rb b/Formula/g/gnuradio.rb index 3c0e62b9cc33d..7014c9a166996 100644 --- a/Formula/g/gnuradio.rb +++ b/Formula/g/gnuradio.rb @@ -15,13 +15,12 @@ class Gnuradio < Formula end bottle do - rebuild 1 - sha256 cellar: :any, arm64_sequoia: "cc2920b812f869ce7ae7dadfb5f4e935c0f767daedb39c63be2f4b5642f93bcb" - sha256 cellar: :any, arm64_sonoma: "a7ab144c92dbd276675a04afd5874ce7551c4bfcb7f788ebac5053443a830c63" - sha256 cellar: :any, arm64_ventura: "5eefced18063bd7b5465a610b7298fe4162a33f7255703d5d08de4fdb629469e" - sha256 cellar: :any, sonoma: "b9ae21b19ab539278a7be28eea3670f680f6ce61aaa2fa3aa5cc87e7f4762c7b" - sha256 cellar: :any, ventura: "2d0300058c8ba864cf4e0effc9b7b980b7f42da63999970dbb4d017245ca8cc6" - sha256 cellar: :any_skip_relocation, x86_64_linux: "b767e98850b1c572a026e81c042bc7114a2ea047d2e2811bb25696e29a860b76" + sha256 cellar: :any, arm64_sequoia: "a68e237184aa8e654424dd61570157af0138a27a3587ef4e7d0b8b51a3c6b2fb" + sha256 cellar: :any, arm64_sonoma: "f45f2a919d9c8000066544cd1db5c51cd9cba53f25ca06ccf398b2ecfd7d92d2" + sha256 cellar: :any, arm64_ventura: "35c82a2d51b34b910d1565e60032670f959893e6e601af3a2d02c1a9f6c0753f" + sha256 cellar: :any, sonoma: "f9cc9c15c92e57a380e6b838dd711b2bfd8b5be965c0f15f166f452028f0bdc9" + sha256 cellar: :any, ventura: "61f35bb7a8fca7206675c77e4476757b78fc167b5858cb2b6ee5c697a54e8292" + sha256 cellar: :any_skip_relocation, x86_64_linux: "26a41ea0945823d919a08988b7a02851f4f993e5239c3af216272003e38d6573" end depends_on "cmake" => :build From 33c4e34f6ebfe3c2579d81b45e35680eb6b48c84 Mon Sep 17 00:00:00 2001 From: Michael Cho <20700669+cho-m@users.noreply.github.com> Date: Fri, 13 Dec 2024 21:45:53 +0000 Subject: [PATCH 4/4] uhd: update 4.7.0.0_2 bottle. --- Formula/u/uhd.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Formula/u/uhd.rb b/Formula/u/uhd.rb index 7fa694da3ecc2..bed7f966a7815 100644 --- a/Formula/u/uhd.rb +++ b/Formula/u/uhd.rb @@ -15,13 +15,12 @@ class Uhd < Formula end bottle do - rebuild 1 - sha256 arm64_sequoia: "8af487212569ce117181b6bb884536580a701a581823cd615168e8fc5b1699e0" - sha256 arm64_sonoma: "87477b72f2b117d10c580fdc2812e3e1c032309e4e2ce86836cc5250655ef03f" - sha256 arm64_ventura: "86904ebacfd828a291f1f205df0859de71bc412527270400c6eac5df69dfb43d" - sha256 sonoma: "4a9799003cc7f032a630c857d17a6c970de02beb7f5778c143aa955df670b654" - sha256 ventura: "43358e6612f828c025c1c7b2e6f00785546f33ab84d4b6c9bf7f4ea850d60947" - sha256 cellar: :any_skip_relocation, x86_64_linux: "a8be6e51f1458a8f8ac8d85ab25e00e7d064fb6bbdc23c9abf62890a43cc45fc" + sha256 arm64_sequoia: "4a05fe3cf7631907bef6a416e3a5e1b76ee7c9590e6c02a2194b66b7c5c79292" + sha256 arm64_sonoma: "ea007011a24d72f1f3ff2d05b1e509d6a0b4bf79fc358117c1ce02714540ebb3" + sha256 arm64_ventura: "047350eee3e26cdb321be13ab062adb73d15690ccd6142456db1bc57c8296b4d" + sha256 sonoma: "7f649d23d094b511b032788e8d67ea726c4ab394a9e30b2a8c42760aee1bf004" + sha256 ventura: "aea0fe40b4c6a1a530ad5e57cf4296cdd82345b03730737852451401faea7a66" + sha256 cellar: :any_skip_relocation, x86_64_linux: "e367b389872d8029334fad40c27e6567d17a3a2bab731c3f7a54c626af7cc617" end depends_on "cmake" => :build