chore: upgrade dependencies
This commit is contained in:
		
							
								
								
									
										10
									
								
								vendor/gocv.io/x/gocv/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/gocv.io/x/gocv/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -2,10 +2,10 @@
 | 
			
		||||
.PHONY: test deps download build clean astyle cmds docker
 | 
			
		||||
 | 
			
		||||
# GoCV version to use.
 | 
			
		||||
GOCV_VERSION?="v0.30.0"
 | 
			
		||||
GOCV_VERSION?="v0.31.0"
 | 
			
		||||
 | 
			
		||||
# OpenCV version to use.
 | 
			
		||||
OPENCV_VERSION?=4.5.5
 | 
			
		||||
OPENCV_VERSION?=4.6.0
 | 
			
		||||
 | 
			
		||||
# Go version to use when building Docker image
 | 
			
		||||
GOVERSION?=1.16.2
 | 
			
		||||
@@ -250,7 +250,7 @@ install_cuda: deps download sudo_pre_install_clean build_cuda sudo_install clean
 | 
			
		||||
install_openvino: deps download download_openvino sudo_pre_install_clean build_openvino_package sudo_install_openvino build_openvino sudo_install clean verify_openvino
 | 
			
		||||
 | 
			
		||||
# Do everything statically.
 | 
			
		||||
install_static: deps download sudo_pre_install_clean build_static sudo_install clean verify
 | 
			
		||||
install_static: deps download sudo_pre_install_clean build_static sudo_install clean verify_static
 | 
			
		||||
 | 
			
		||||
# Do everything with non-free modules from cpencv_contrib.
 | 
			
		||||
install_nonfree: deps download sudo_pre_install_clean build_nonfree sudo_install clean verify
 | 
			
		||||
@@ -276,6 +276,10 @@ sudo_install_openvino:
 | 
			
		||||
verify:
 | 
			
		||||
	go run ./cmd/version/main.go
 | 
			
		||||
 | 
			
		||||
# Build a minimal Go app to confirm gocv works with statically built OpenCV.
 | 
			
		||||
verify_static:
 | 
			
		||||
	go run -tags static ./cmd/version/main.go
 | 
			
		||||
 | 
			
		||||
# Build a minimal Go app to confirm gocv cuda works.
 | 
			
		||||
verify_cuda:
 | 
			
		||||
	go run ./cmd/cuda/main.go
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user