Merge pull request #158712 from timsutton/bump-opencv-4.9.0

opencv 4.9.0

Formula/m/mlt.rb

@@ -4,16 +4,17 @@ class Mlt < Formula
   url "https://github.com/mltframework/mlt/releases/download/v7.22.0/mlt-7.22.0.tar.gz"
   sha256 "7cf4d9573a061d76902c6e12a2f09f5f461e7c697635233df82a63a3fe4d6da6"
   license "LGPL-2.1-only"
+  revision 1
   head "https://github.com/mltframework/mlt.git", branch: "master"
 
   bottle do
-    sha256 arm64_sonoma:   "2d53a87659cb1ab91f4d26c5300ec2c31596c319d3316eb51b409a1bf040af24"
-    sha256 arm64_ventura:  "9995a145304b07405cace3670f52004ab6799a58b3919a83335681e85c63c8c8"
-    sha256 arm64_monterey: "0851982a20f6e3ca69cecda78fa401a74bf1aa28fac297113517c54cb22e0096"
-    sha256 sonoma:         "5378fc27f1e03873e45eced86bcb519077849cf414802f91872855be2ae652af"
-    sha256 ventura:        "adc6c07b2d4c2a99e868d3cf11b858723d4dc4911d1dfa51a1373f93d9125f4c"
-    sha256 monterey:       "89f16b6677b4529ccfe0d060da473cce664ba08ee5817a688c3d308ae7404c21"
-    sha256 x86_64_linux:   "eae8840dbd4594948716a9358da63dad0fabae6f528c02959ef707c93857b93d"
+    sha256 arm64_sonoma:   "b68d3e75ce464d07df784ce792a4b1705fa554329d6d2e8769612265c177122c"
+    sha256 arm64_ventura:  "6dad882486d787d034595de0d1cdce9ff3e19b25c4f9cace7f881daf3fb1d738"
+    sha256 arm64_monterey: "361f633a056714a0273fc7624d0354c350e58c5c0c3dc99f72003c416fc8fdb4"
+    sha256 sonoma:         "34d3ec34ee74cda44f313f85547a7d2c0ecd0b44fbaa639a223acccf342b5ba0"
+    sha256 ventura:        "39a6d9f6bf6970ca17fb08542c102dd7db6fb5c52960d41235e01bdc20550a31"
+    sha256 monterey:       "0a7cf3cf38073a79e0f0944844efd4962592f832c5c5e1460a8c839335e5a8f6"
+    sha256 x86_64_linux:   "fb50992d0ffc75c4f330ca03261c614705fb4705b89e92082740796de178654e"
   end
 
   depends_on "cmake" => :build

Formula/o/opencv.rb

@@ -1,24 +1,23 @@
 class Opencv < Formula
   desc "Open source computer vision library"
   homepage "https://opencv.org/"
-  url "https://github.com/opencv/opencv/archive/refs/tags/4.8.1.tar.gz"
-  sha256 "62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5"
+  url "https://github.com/opencv/opencv/archive/refs/tags/4.9.0.tar.gz"
+  sha256 "ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c"
   license "Apache-2.0"
-  revision 5
 
   livecheck do
     url :stable
     regex(/^v?(\d+(?:\.\d+)+)$/i)
   end
 
   bottle do
-    sha256 arm64_sonoma:   "33b2905571a9a6624d53fd1bcc48a673fefe6843d91f21a55ca38401acfa7ab7"
-    sha256 arm64_ventura:  "f0ad0908bb6d97e9652a6c2fabe8e9a316e37d95ff8b7cf09b5ebf3b2ae9034d"
-    sha256 arm64_monterey: "8b120a6e623e17f401c118fc91c70027358acdef32d710cce06d55cfddd80651"
-    sha256 sonoma:         "78941a476242058d3e855f79a0b584212e2ede324d4c38ee15217417fe9c2109"
-    sha256 ventura:        "92e0a1564b79391461734f454587279d300c6513d3939fc6362f59eadd9765cf"
-    sha256 monterey:       "9f39c525eb04ff6226d6fcf50dec6e5c9afef562254a8ffa2b38a45a2fad253d"
-    sha256 x86_64_linux:   "0bda4f8d5062b03b9882911f872110f7090bd380f2cb23f1f131b71be97d7370"
+    sha256 arm64_sonoma:   "1bcdd3ab55f658cee05307c5ad2bbe4686bd91a5539ea8bebc1395b725c25027"
+    sha256 arm64_ventura:  "701c5e0b53ca2cb040f82304a0e41a0a936755277bc5c68d3fee97e35e0a8c21"
+    sha256 arm64_monterey: "f928849559374c48068bc73564813191663a5898a278b789ffea42fa98e22fcc"
+    sha256 sonoma:         "83b5d417b2b12bd6efdfbafed0a19e3e15a05f822bb583d28472475e5e9d563e"
+    sha256 ventura:        "ac6f5f421f9b8d443ad4783aaa2a35736e9c6a7715254f0d3a99d65efe513fe3"
+    sha256 monterey:       "c8cf105237cdce8b10af25255b7376b70cc309af6c7690f733245c730824f785"
+    sha256 x86_64_linux:   "328ce5a871aa72c8cbda5512df34a9932a1cd175445870c41d6c535ac89cf69f"
   end
 
   depends_on "cmake" => :build
@@ -48,15 +47,8 @@ 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.8.1.tar.gz"
-    sha256 "0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e"
-  end
-
-  # Fix static build with OpenVINO (https://github.com/opencv/opencv/pull/23963)
-  # Remove patch when available in release.
-  patch do
-    url "https://github.com/opencv/opencv/commit/ef9d14f181ad8cca71443beaf3874de3197d4e47.patch?full_index=1"
-    sha256 "efdf5534479af2e246c162215d5cbc2ae49e962ca58ccd9fef610fa40ee4a4ed"
+    url "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.9.0.tar.gz"
+    sha256 "8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae"
   end
 
   def python3

Formula/s/siril.rb

@@ -2,7 +2,7 @@ class Siril < Formula
   desc "Astronomical image processing tool"
   homepage "https://www.siril.org"
   license "GPL-3.0-or-later"
-  revision 2
+  revision 3
   head "https://gitlab.com/free-astro/siril.git", branch: "master"
 
   stable do
@@ -17,13 +17,13 @@ class Siril < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "33922c686ad84821d5bc1a04a5c540725f0dfc77d0a4cdce27beb961c5949509"
-    sha256 arm64_ventura:  "8a4a6d473b8b693e79f706df3f9e36dd98a775c98f32d6e42fb87b10de2c44a9"
-    sha256 arm64_monterey: "c3ae5b816fe7a495308f6757a0efd7cea863d00adc4183e34e21b014529315e2"
-    sha256 sonoma:         "db52eb9a39ea334070995d0b21c1c36d8e2010f664988ae766909e0470c5e4ff"
-    sha256 ventura:        "7c37c42106b9914cebe8b2b5587074ff5b4b0ff5c51bebaa20b4258e02d40a94"
-    sha256 monterey:       "7e3ef4144957b19c986e3aa1c3192e45936d8b14b0cb446cfa9218e5a2b485a2"
-    sha256 x86_64_linux:   "12a108862be66ec25ec158ad9831619ee70fd3809af5860d8a23ad4066b54653"
+    sha256 arm64_sonoma:   "eb9487135cc6b10a91c44ab8ca3efb9bce19d80b069897bf22b3ca7edbc66b39"
+    sha256 arm64_ventura:  "2e92f421d3cf23ae45a455a2f6a6c6b63a53fba710d9038f52891e570db5e8b0"
+    sha256 arm64_monterey: "306fc615674ad2c494b806590250a1187b34fb8222be8ddc36f18bfb682c88d5"
+    sha256 sonoma:         "94e87f2e43a26dab579f6a53dfe3aeb6b86d6c62754c2f0af48b5668a20de449"
+    sha256 ventura:        "0dcf222209a7173b1d31e44b32056fe96b225b2143d171925a457e76c293483c"
+    sha256 monterey:       "73ffc24d76f9cbd7da62b054ea4a8ae5829c7a68d873c6fedad70e902a8441bc"
+    sha256 x86_64_linux:   "3c44a843b64f49cd9e4ffa398da0b9de14a57a986186c89de84213ae4689d4a8"
   end
 
   depends_on "cmake" => :build

Formula/s/synfig.rb

@@ -2,7 +2,7 @@ class Synfig < Formula
   desc "Command-line renderer"
   homepage "https://synfig.org/"
   license "GPL-3.0-or-later"
-  revision 4
+  revision 5
 
   stable do
     url "https://downloads.sourceforge.net/project/synfig/development/1.5.1/synfig-1.5.1.tar.gz"
@@ -21,14 +21,12 @@ class Synfig < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "520d323c0fdb386bd769011af17711c7fc3fd6e3929813ba1085700f54a5dc6f"
-    sha256 arm64_ventura:  "d17f3ffb7e718898662d455bfa14c1493462ec0e01b60800ce7ed1194c0589f7"
-    sha256 arm64_monterey: "9118742cf845b52411ce0fb9a22bebd8dd30ac124ba6707d3326f68eebc18204"
-    sha256 arm64_big_sur:  "ebd59a7ccb2a6e003d5079757d779807ddd146d5c9e81ff424f54b57e8d847b5"
-    sha256 sonoma:         "692bac9db3198434a950e4d8843bfe54f0068c228a63f5b447b52884dd3cc768"
-    sha256 ventura:        "31040af0bd5b4eec3eed0823d93db03ba31e4b4be1296450261f5172ea7e41d7"
-    sha256 monterey:       "e7a2acdce2bc98ad75b64ae561d28e1f983f2b7d0136c98c1642326c85e54413"
-    sha256 big_sur:        "599ff944113b4955aa4f82c3390f598f7611ec222ca56fb79755370ed3d16638"
+    sha256 arm64_sonoma:   "89336d7cb554c06d3b0e0b2059079b1de1277b701eeeb404051e3b2def48049b"
+    sha256 arm64_ventura:  "74cc38efd1e57bdc6242908f669ec4ccb6e93da16c39c21fff48eb02694c8827"
+    sha256 arm64_monterey: "ea164ae8aef7ce870fa9f7904165e69d29bc1d77dc1d1d01a167e972f952395b"
+    sha256 sonoma:         "167e9ea7c9e1305a1a560378e989e89d45e4acfed784fefbe89a23898540e54d"
+    sha256 ventura:        "7ad5a761350437d2915cf28464ab0d2c25442749689d90e70873419fb441d822"
+    sha256 monterey:       "327d8c9af58617dc0fdb79cf590f95214718eef8696de51c30c4ccb647096f76"
   end
 
   head do

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 2
+  revision 3
 
   livecheck do
     url "https://visp.inria.fr/download/"
     regex(/href=.*?visp[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "2fa4057ae2962f36b06e95acde4272cc3baa36153203ff138c4fa8132b261ed4"
-    sha256 cellar: :any,                 arm64_ventura:  "e3b36c4385af2c3b126a2bcf13d9baf7acb315647628f9da0bacd04cb48b25ac"
-    sha256 cellar: :any,                 arm64_monterey: "2177ed813158414e18588468eb2b3159a74bfd37d3c0a13e32bd95a107e7a1be"
-    sha256 cellar: :any,                 sonoma:         "4b6b81f707bbb08e6a6cc31922f1cc3e036dab8b94fc820aa4904c9dd932d201"
-    sha256 cellar: :any,                 ventura:        "b4620408848aff38c74cec1dd4b57477618a95d0aa03b1086fa80de05f83b668"
-    sha256 cellar: :any,                 monterey:       "65dc6434cb725f919949e5ec74c49767c255758efef24d40623a0883a44dea33"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "c6e236da65dd3f3caaedb5fbe986658ffe570cfbf3ef4ac2dc5b7f613d5099bb"
+    sha256 cellar: :any,                 arm64_sonoma:   "d93518ea5414c4aa840a7907fb7d95cba0d59a395fcc60750e839933be88e4a6"
+    sha256 cellar: :any,                 arm64_ventura:  "c85a167caf67cd5656ee083daff897a7c321f3e0e8012a66c0eabec48df83fc2"
+    sha256 cellar: :any,                 arm64_monterey: "439dcf5a4c9708c2e6e3fc9900ede114918029de72f7e80dd987508f65091863"
+    sha256 cellar: :any,                 sonoma:         "1ae8fd8777454c15cb1228348773ea4c2bf66d8d705e171f5b2edb5cd29a1f21"
+    sha256 cellar: :any,                 ventura:        "ee54db90499d8344e29ed206aeb469aefb0b78e10f2854cca13e0fc61cbe7428"
+    sha256 cellar: :any,                 monterey:       "9cb2ee515990c573f6a134659b1ade1214f389baef6790589bd4f78c386a3579"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "1a57aaf636d683040f9dc92d074f6e5dd78e1945a6f754930a347d362d67eb5e"
   end
 
   depends_on "cmake" => :build
@@ -41,6 +41,12 @@ class Visp < Formula
 
   fails_with gcc: "5"
 
+  # One usage of OpenCV Universal Intrinsics API altered starting from 4.9.0
+  # Remove this patch if it's merged into a future version
+  # https://github.com/lagadic/visp/issues/1309
+  # Patch source: https://github.com/lagadic/visp/pull/1310
+  patch :DATA
+
   def install
     ENV.cxx11
 
@@ -125,3 +131,37 @@ def install
     assert_equal version.to_s, shell_output("./test").chomp
   end
 end
+__END__
+diff --git a/modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp b/modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp
+index 8a47b5d437..c6d636bc9e 100644
+--- a/modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp
++++ b/modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp
+@@ -606,9 +606,15 @@ void vpMbtFaceDepthDense::computeInteractionMatrixAndResidu(const vpHomogeneousM
+         cv::v_float64x2 vx, vy, vz;
+         cv::v_load_deinterleave(ptr_point_cloud, vx, vy, vz);
+
++#if (VISP_HAVE_OPENCV_VERSION >= 0x040900)
++        cv::v_float64x2 va1 = cv::v_sub(cv::v_mul(vnz, vy), cv::v_mul(vny, vz)); // vnz*vy - vny*vz
++        cv::v_float64x2 va2 = cv::v_sub(cv::v_mul(vnx, vz), cv::v_mul(vnz, vx)); // vnx*vz - vnz*vx
++        cv::v_float64x2 va3 = cv::v_sub(cv::v_mul(vny, vx), cv::v_mul(vnx, vy)); // vny*vx - vnx*vy
++#else
+         cv::v_float64x2 va1 = vnz*vy - vny*vz;
+         cv::v_float64x2 va2 = vnx*vz - vnz*vx;
+         cv::v_float64x2 va3 = vny*vx - vnx*vy;
++#endif
+
+         cv::v_float64x2 vnxy = cv::v_combine_low(vnx, vny);
+         cv::v_store(ptr_L, vnxy);
+@@ -630,7 +636,12 @@ void vpMbtFaceDepthDense::computeInteractionMatrixAndResidu(const vpHomogeneousM
+         cv::v_store(ptr_L, vnxy);
+         ptr_L += 2;
+
++#if (VISP_HAVE_OPENCV_VERSION >= 0x040900)
++        cv::v_float64x2 verr = cv::v_add(vd, cv::v_muladd(vnx, vx, cv::v_muladd(vny, vy, cv::v_mul(vnz, vz))));
++#else
+         cv::v_float64x2 verr = vd + cv::v_muladd(vnx, vx, cv::v_muladd(vny, vy, vnz*vz));
++#endif
++
+         cv::v_store(ptr_error, verr);
+         ptr_error += 2;
+ #elif USE_SSE