Merge pull request #176666 from branchvincent/bump-opencv-4.10.0

opencv 4.10.0
Homebrew · Jul 11, 2024 · 46a29ec · 46a29ec
2 parents b7fc8e9 + 5e9081b
commit 46a29ec
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 60 deletions.
diff --git a/Formula/m/mlt.rb b/Formula/m/mlt.rb
@@ -4,16 +4,17 @@ class Mlt < Formula
  url "https://github.com/mltframework/mlt/releases/download/v7.24.0/mlt-7.24.0.tar.gz"
  sha256 "8cde7c22a1a5395abe913976c2edafb498f81ed81a5f49dd0e6e2d86d68bcec0"
  license "LGPL-2.1-only"
+ revision 1
  head "https://github.com/mltframework/mlt.git", branch: "master"
 
  bottle do
- sha256 arm64_sonoma: "3485b8a1722356ee8d3793d8af6a811b206d5aae8a08643b1b9fd4e65e1abf1a"
- sha256 arm64_ventura: "c942d5f913b82087da5eccf1452543c1a9c608af92572f50e54f12590fa0a927"
- sha256 arm64_monterey: "7a98f0c4a9078c2fef892d4277055e01c48c40130cbcb540e44d5c3a92a14bca"
- sha256 sonoma: "fa96023d1218e33b038a561781e6bbc4db1cc97428b46fb02d614c9b21698e6e"
- sha256 ventura: "902f2db879ce420f63b623eecdfa702677c16e24ce67ed2d85b5aaba3b79fa43"
- sha256 monterey: "3ad62a1fe23b950cfabca2075c6676e437e0ab60fadb03e93265223e3f825414"
- sha256 x86_64_linux: "ecaa345a86798a5a5a4600807481decf70f2904502ca4ef98f41144fb373ee9c"
+ sha256 arm64_sonoma: "e059360652d0d922307d8ac9fa183322dee526d50ae1c9efe31d99e535b99d88"
+ sha256 arm64_ventura: "f1b617de121e9e9aca3ba3da5d349d5752574995c22f51e4f26e501ec91224fe"
+ sha256 arm64_monterey: "76e3e6d5b1cf2a9f3005990f38f79b12948920990cdd18502079200ead1a6dec"
+ sha256 sonoma: "39fc84f9e283e7db8b2d97d3d373751ea208aa7248d71b2fb40653a9ddc7fe4c"
+ sha256 ventura: "487a3f84f939bc29c8ed2391741cee07f6c9dba31b718c701aa205526d3efad7"
+ sha256 monterey: "6458f0bcf36f5b7fecd0f089734ed49f35141ee68062b5b131d0e56a81e1fac0"
+ sha256 x86_64_linux: "fc30f4414d09163aad57fae6702b01ca86098e265c1ba437692419717ff844d5"
  end
 
  depends_on "cmake" => :build

diff --git a/Formula/o/opencv.rb b/Formula/o/opencv.rb
@@ -1,24 +1,24 @@
 class Opencv < Formula
  desc "Open source computer vision library"
  homepage "https://opencv.org/"
- url "https://github.com/opencv/opencv/archive/refs/tags/4.9.0.tar.gz"
- sha256 "ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c"
+ url "https://github.com/opencv/opencv/archive/refs/tags/4.10.0.tar.gz"
+ sha256 "b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9"
  license "Apache-2.0"
- revision 12
+ head "https://github.com/opencv/opencv.git", branch: "4.x"
 
  livecheck do
  url :stable
  regex(/^v?(\d+(?:\.\d+)+)$/i)
  end
 
  bottle do
- sha256 arm64_sonoma: "912667fc2a05cb49ae5727564f76f7489277947335ee245f73496fe3fc92b0ac"
- sha256 arm64_ventura: "696ad3154be36061b812a900822b163008d2bb2a115e9d72c1e6b98cfdfff756"
- sha256 arm64_monterey: "ce84c65b02a9291010934a33d9053821e7bf9ed32addd287d0587c39e524578e"
- sha256 sonoma: "5b3020942612a977b2cb0ea36e9c502190005ed1bc462c561b3c8425cb3100b7"
- sha256 ventura: "73ff2d1a229aaad8f4d6e9cc8e706d3d3bfcd61a2ed0f4379c4f996c25c81784"
- sha256 monterey: "be179de9a4dafbff1d72497b47c764a3fb77751cfbddf4ef9314d86dface91c6"
- sha256 x86_64_linux: "0655d0d978edc75e0d37954d6edefabf1f5b587cf8c6c7c6c1e9a554625edef0"
+ sha256 arm64_sonoma: "8031982299b0e441f71a44410029bf22b6808a366ecd30f23b9811d42fab521d"
+ sha256 arm64_ventura: "fa9251fa7a911abd017421ba0c51dee7397b7a18e0aefccc2dc18964546c2120"
+ sha256 arm64_monterey: "f1bbb6747490a4f6674fddab6d344d4304297712e209ea51d13e6d30213263c7"
+ sha256 sonoma: "7f8dc0a72cf52b1373d80a6a7c659f7ad8158cdeeb830167c5a2690c329829be"
+ sha256 ventura: "4b05d990ad1a3b8a68ec0e2b635ac910db07d96b6c2860a9289f9204246f0897"
+ sha256 monterey: "50936e22b41f5d386fa282177fc2d50600396f879dcb7f4af479051422a9f0c0"
+ sha256 x86_64_linux: "8167249db3953cf746015391fbb29b7513c2d36085f6f712050098abfca371de"
  end
 
  depends_on "cmake" => :build
@@ -66,32 +66,14 @@ class Opencv < Formula
  fails_with gcc: "5" # ffmpeg is compiled with GCC
 
  resource "contrib" do
- url "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.9.0.tar.gz"
- sha256 "8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae"
-
- # TODO: remove with next OpenCV release. Fix https://github.com/opencv/opencv_contrib/pull/3624
- patch do
- url "https://github.com/opencv/opencv_contrib/commit/46fb893f9a632012990713c4003d7d3cab4f2f25.patch?full_index=1"
- sha256 "8f89f3db9fd022ffbb30dd1992df6d20603980fadfe090384e12c57731a9e062"
- end
+ url "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.10.0.tar.gz"
+ sha256 "65597f8fb8dc2b876c1b45b928bbcc5f772ddbaf97539bf1b737623d0604cba1"
  end
 
  def python3
  "python3.12"
  end
 
- # Patch for DNN module to work with OpenVINO API 2.0(enabled starting OV 2022.1 release)
- patch do
- url "https://raw.githubusercontent.com/Homebrew/formula-patches/a10057a843de773896a50e9b18f4559a8bbc4d27/opencv/openvino-api2.0.patch"
- sha256 "08f918fa762715d0fbc558baee9867be8f059ee3008831dc0a09af63404a9048"
- end
-
- # Patch for G-API to work with OpenVINO API 2.0(enabled starting OV 2022.1 release)
- patch do
- url "https://raw.githubusercontent.com/Homebrew/formula-patches/a10057a843de773896a50e9b18f4559a8bbc4d27/opencv/gapi-openvino-api2.0.patch"
- sha256 "b67aa8882559858824c5841ba3d0746078273be081540b0d339c0ff58dc9452d"
- end
-
  def install
  resource("contrib").stage buildpath/"opencv_contrib"
 
@@ -189,6 +171,9 @@ def install
 
  # Prevent dependents from using fragile Cellar paths
  inreplace lib/"pkgconfig/opencv#{version.major}.pc", prefix, opt_prefix
+
+ # Replace universal binaries with their native slices
+ deuniversalize_machos
  end
 
  test do

diff --git a/Formula/r/rtabmap.rb b/Formula/r/rtabmap.rb
@@ -4,7 +4,7 @@ class Rtabmap < Formula
  url "https://github.com/introlab/rtabmap/archive/refs/tags/0.21.4.tar.gz"
  sha256 "242f8da7c5d20f86a0399d6cfdd1a755e64e9117a9fa250ed591c12f38209157"
  license "BSD-3-Clause"
- revision 3
+ revision 4
  head "https://github.com/introlab/rtabmap.git", branch: "master"
 
  # Upstream doesn't create releases for all tagged versions, so we use the
@@ -15,13 +15,13 @@ class Rtabmap < Formula
  end
 
  bottle do
- sha256 arm64_sonoma: "7ded9e75cd1ec90eff980ea4e6c0521b36589017bf0acb62217333e13587b6c1"
- sha256 arm64_ventura: "7a754f0c9a97663b06b2e6d4d1981466d9be5d53e05944907d45566374c501ef"
- sha256 arm64_monterey: "90b2c03985689419a44adf25624956659fdbcb0a24fd270ec8d860ee6e270ec6"
- sha256 sonoma: "be3dd2bdc5e8f370e6ff645d79c388fc94297e79b8cedf7371efa85a56d0a989"
- sha256 ventura: "6ad77bc214708a2f7f75bf98196bf88f44ef4933a130a3d1604d91ec36e5e910"
- sha256 monterey: "35a17b327683a640aeda1b244500e24e97f06b0fd4670f2a8876c08d5cfc9bc1"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "f78d18274347eb17d660b304b9a5be507bf7c3b33f8388bdb9c08ad06c02bd91"
+ sha256 arm64_sonoma: "044f39b72e342d5ed111d3a06b22ec22a4ce1b52a2c459d2424b11555a7510b7"
+ sha256 arm64_ventura: "2b82214040e0a479fa20b045257bbc25d8e2434e8e16d09fd2822aa4355bf607"
+ sha256 arm64_monterey: "1ab33bdfd3292254434fabeffe0b4134604a577b640a1d172b48b0de37e6bc95"
+ sha256 sonoma: "c893cd17fde510783585075e15f39bf133680fd88714edc554a0192eaf570df8"
+ sha256 ventura: "47f0709305ba421ddbca0353ec414045e4b8f751d331419712b8010754f78127"
+ sha256 monterey: "d0089f725c5712c3e4f06d625eeab2590712390d72ea95bf10307d93fc759189"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "a66f6cb1a14b01eaf94fa9fe15b28645ead7246d98e10cd2713a1a166f78cbe0"
  end
 
  depends_on "cmake" => [:build, :test]

diff --git a/Formula/s/siril.rb b/Formula/s/siril.rb
@@ -4,16 +4,17 @@ class Siril < Formula
  url "https://free-astro.org/download/siril-1.2.3.tar.bz2"
  sha256 "8ac660542d2bec5d608eaf9bf25a25e6ba574b58b5410bdb6ad401e1f86fa756"
  license "GPL-3.0-or-later"
+ revision 1
  head "https://gitlab.com/free-astro/siril.git", branch: "master"
 
  bottle do
- sha256 arm64_sonoma: "b0ecf526c4bd4fc258a03f7316cc896b0ea9996bdced559a5dfbdf1bf8822723"
- sha256 arm64_ventura: "840090f76fcf6e786ad3ab2356a4616f52fb6f1a7b63cd9a6f1a697e5493aacb"
- sha256 arm64_monterey: "581a64e9176fca55ce5fc15dddb42db5c100caa5388337cc3f5dcd87404d2355"
- sha256 sonoma: "59890c8760f2905f785ce8000977a559c41a88593a97e2afe272064b8b8e8631"
- sha256 ventura: "81fc996bb795d254d6c5afa53f632690fb5b9fc7700edbf3d8078ef07d8b5c5b"
- sha256 monterey: "480c579065368a1cdb464e1fa48cce7fc3c217215236c992e8a8669873c2f507"
- sha256 x86_64_linux: "8db594c978770f948f34651e1e7d14ec105c364bbc331ceef41d7e81a4405d76"
+ sha256 arm64_sonoma: "f4049c40c420b8174844ba34b785415e5018116244e4b28ca558d2864c7674c5"
+ sha256 arm64_ventura: "4f5bc9ae544f1afa038e851e6f166b9d4c1e614d5234a901a370269670746842"
+ sha256 arm64_monterey: "92a0d0e303aaad93236f7b24a7e6d2cdca3b8599632314edafed042349530eee"
+ sha256 sonoma: "ccdbec9841ca4ea9288451aaee4db372f83b5ecb2545915c43560002122e290c"
+ sha256 ventura: "fd680dfe41bf64caabcad453873e48ea04dca6ce0b2d92dfc3a2e9db6a6ac854"
+ sha256 monterey: "318344d5a3a07f6d6ac4deaaa89f5bb5dd4d3058cd02890c4b1a03ecb362bddd"
+ sha256 x86_64_linux: "e059dbcf1530ca4e6981213c00604acea83879e071cc5a24272b60174347ab3f"
  end
 
  depends_on "cmake" => :build

diff --git a/Formula/v/visp.rb b/Formula/v/visp.rb
@@ -4,21 +4,21 @@ class Visp < Formula
  url "https://visp-doc.inria.fr/download/releases/visp-3.6.0.tar.gz"
  sha256 "eec93f56b89fd7c0d472b019e01c3fe03a09eda47f3903c38dc53a27cbfae532"
  license "GPL-2.0-or-later"
- revision 5
+ revision 6
 
  livecheck do
  url "https://visp.inria.fr/download/"
  regex(/href=.*?visp[._-]v?(\d+(?:\.\d+)+)\.t/i)
  end
 
  bottle do
- sha256 cellar: :any, arm64_sonoma: "aefbb29ddf9b04bb066d9c204ff0aa543613e621f4a92c03695b7131324abea2"
- sha256 cellar: :any, arm64_ventura: "ed9745df38cf5b9b6c709215c4570f5bf377adcf6dd229ac7615e7ffcc1e6d53"
- sha256 cellar: :any, arm64_monterey: "8a8ec734e686eea880816aaaa361b12506a6b0a99539f9d35d6a1180fb457d85"
- sha256 cellar: :any, sonoma: "e78c8d941c97159f1d01b131e0c867e79ccb896afb77f5a6925b746b1b88e1fc"
- sha256 cellar: :any, ventura: "53ded94c21564a1508a31cb91f0a7adfdb06ea9859a8bb05b7eb39f751585d93"
- sha256 cellar: :any, monterey: "9ee6ba617a25ea4c6fd5a011e3be303b7f4b185accb7290ca0b290a7ec9aefa9"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "7f47d63677bc7b78d8cb3d3a900540b53579b35f575c9fded216c52c82f14195"
+ sha256 cellar: :any, arm64_sonoma: "aa2ae8cfa6a139b9789cff6b0c91a10cea7b1c854d4d23073bbca8ac53bbb4b4"
+ sha256 cellar: :any, arm64_ventura: "afa24d7d2774a8a53ef166bb1d00cdf81b56b4ad6f71441fc9660f67af93a698"
+ sha256 cellar: :any, arm64_monterey: "1a0a7b8cd994f5d302d2f5693071a6c17ec93a4edab19691867e12dc20278911"
+ sha256 cellar: :any, sonoma: "fee41cb44c0c51d1942ae451d8bb2079d2c96e994f341f201fb1b403faf4c274"
+ sha256 cellar: :any, ventura: "a4a5b98f1546f90c563ca8ffef2cf86912a92acdd39965fa8c81a3b1ba52898d"
+ sha256 cellar: :any, monterey: "754fccdcd34b588341ae8a6d846bd500f443a23f3485910a301b2af62dcf0d5f"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "8ae66b7767af5ceb8ad682c3328aa9dc6bca569e4705641d45c161e199ff0a55"
  end
 
  depends_on "cmake" => :build