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

opencv 4.5.4 #89948

Closed
wants to merge 9 commits into from
Closed

opencv 4.5.4 #89948

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3599f34
opencv 4.5.4
cclauss Nov 25, 2021
9788e0a
Delete openalpr.rb
cclauss Nov 25, 2021
12dc2d4
Revert delete openalpr.rb
cclauss Nov 25, 2021
5071bb3
openalpr.rb: Test with a lower resolution image
cclauss Nov 27, 2021
3664066
openalpr.rb: Downgrade depends_on "opencv@3"
cclauss Nov 27, 2021
63175fc
Revert b005c357c3846dd6f380e4e2e61d305f007429fd
cclauss Nov 27, 2021
1a09919
Revert b005c357c3846dd6f380e4e2e61d305f007429fd
cclauss Nov 27, 2021
f8890da
Update resource opencv_contrib to v4.5.4
cclauss Nov 27, 2021
065ed47
Revert all openalpr mods
cclauss Nov 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 7 additions & 73 deletions Formula/openalpr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,101 +4,35 @@ class Openalpr < Formula
url "https://github.com/openalpr/openalpr/archive/v2.3.0.tar.gz"
sha256 "1cfcaab6f06e9984186ee19633a949158c0e2aacf9264127e2f86bd97641d6b9"
license "AGPL-3.0-or-later"
revision 2
revision 3

bottle do
sha256 arm64_big_sur: "4413a608d96584a63180fcb7a8d1c794ef8277010b9bd76f03c3bdfd60e3fe5a"
sha256 big_sur: "a686b58100f9c397a2be1eb70595c773440e26e652a8539745bcfebd38359b12"
sha256 catalina: "c1ba59a1d018a65f019ea162dd44efefc28ef54720f5b702c3763f21b5bdbb65"
sha256 mojave: "6b61f23a1832eaea3acebf2ac5333d96eaa2ac9f978b8c1dbe6cfabadf0e980c"
sha256 x86_64_linux: "a37d2f029a47097ea7c81936ed0400451780ae75594cf4aae10cc1647e5bc93e"
sha256 big_sur: "32953a90e352cc25eea99daad7fac67c7ce11f042fe366af029b16cc3f372c07"
sha256 catalina: "0a05746932c63e1d0dd1749a7213ed0a9cff7d7da2cdfe49e032aeb1b1da56ad"
sha256 mojave: "64dd8cef3f2fe311304e0fffae5ed50dd37123d6611aae751ba272be956bf334"
Copy link
Member

Choose a reason for hiding this comment

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

Please don't touch the bottle block.

end

depends_on "cmake" => :build
depends_on "leptonica"
depends_on "libtiff"
depends_on "log4cplus"
depends_on "opencv"
depends_on "python@3.9"
depends_on "opencv@2"
depends_on "tesseract"

uses_from_macos "curl"

# A photo of licence plate from https://commons.wikimedia.org/wiki/File:California_2018_license_plate_(USA).jpg
resource "testdata" do
url "https://upload.wikimedia.org/wikipedia/commons/b/b0/California_2018_license_plate_%28USA%29.jpg"
sha256 "dd58b62f4f75690280dd0b021b19422cef7f4f4381664d3ee512106e6f491e5c"
end

# Make compatible with opencv 4
# See https://github.com/openalpr/openalpr/pull/878
# Remove in the next release
patch do
url "https://github.com/openalpr/openalpr/commit/a35f0d688e546392bf15e0d1d4ef73b6bc8d179d.patch?full_index=1"
sha256 "c22c0773182badc6ff7a65c0a423b7a01d722788be192f1b4245b1bad8d15089"
end

# Fix compatibility with tesseract 4
# See https://github.com/openalpr/openalpr/pull/693
# Remove in the next release
patch do
url "https://github.com/openalpr/openalpr/commit/28e0b0fa95c12923138768d670b852242a750d0c.patch?full_index=1"
sha256 "3c99b8fe00f7fbdc3840cdf0453154fd8d88bba90de7636137697194b9632b30"
end

# Fix Alpr#is_loaded segfault in python bindings
# Remove in the next release
patch do
url "https://github.com/openalpr/openalpr/commit/479aa4edbfd3cd0062d73fd2e0457367b3dc522f.patch?full_index=1"
sha256 "c08c4be680825e97f165500290eb387a37fb5569cd01cb1e6ed42991dabee920"
end

def install
mkdir "src/build" do
args = std_cmake_args
args << "-DCMAKE_INSTALL_SYSCONFDIR=#{etc}"
args << "-DCMAKE_CXX_FLAGS=-std=c++11"
args << "-DCMAKE_INSTALL_SYSCONFDIR:PATH=#{etc}"
args << "-DWITH_BINDING_PYTHON=ON"
args << "-DWITH_BINDING_JAVA=OFF"
args << "-DWITH_BINDING_GO=OFF"
args << "-DWITH_TESTS=OFF"
args << "-DTesseract_PKGCONF_INCLUDE_DIRS=#{Formula["tesseract"].opt_include}/tesseract"
args << "-DTesseract_PKGCONF_LIBRARY_DIRS=#{Formula["tesseract"].opt_lib}/tesseract"

system "cmake", "..", *args
system "make", "install"
end

(lib/"python2.7/dist-packages").rmtree
cd "src/bindings/python" do
system Formula["python@3.9"].opt_bin/"python3", *Language::Python.setup_install_args(prefix)
end
end

test do
resource("testdata").stage { testpath.install Dir["*.jpg"].first => "plate.jpg" }
plate_number = "7TRR812"

assert_match plate_number, shell_output("#{bin}/alpr plate.jpg")

(testpath/"test.py").write <<~EOS
from openalpr import Alpr

try:
alpr = Alpr("us", "#{etc}/openalpr/openalpr.conf", "#{share}/openalpr/runtime_data")
if not alpr.is_loaded():
raise RuntimeError("Error loading OpenALPR")
alpr.set_top_n(7)
alpr.set_default_region("ca")
alpr.set_detect_region(False)
with open("#{testpath}/plate.jpg", "rb") as f:
print(alpr.recognize_array(f.read()))
finally:
if alpr:
alpr.unload()
EOS
output = shell_output("#{Formula["python@3"].opt_bin}/python3 #{testpath}/test.py")
assert_match plate_number, output
output = shell_output("#{bin}/alpr #{test_fixtures("test.jpg")}")
assert_equal "No license plates found.", output.chomp
end
end
8 changes: 3 additions & 5 deletions Formula/opencv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Opencv < Formula
desc "Open source computer vision library"
homepage "https://opencv.org/"
url "https://github.com/opencv/opencv/archive/4.5.3.tar.gz"
sha256 "77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab"
url "https://github.com/opencv/opencv/archive/4.5.4.tar.gz"
sha256 "c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d"
license "Apache-2.0"
revision 3

livecheck do
url :stable
Expand Down Expand Up @@ -40,8 +39,7 @@ class Opencv < Formula
uses_from_macos "zlib"

resource "contrib" do
url "https://github.com/opencv/opencv_contrib/archive/4.5.3.tar.gz"
sha256 "73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc"
url "https://github.com/opencv/opencv_contrib/archive/4.5.4.tar.gz"
end

def install
Expand Down