graphics/opencv: update 4.6.0 → 4.9.0

PR: 275977 Approved by: desktop@FreeBSD.org (maintainers timeout; 4+ months)
freebsd · May 2, 2024 · 0a2c5ca · 0a2c5ca
1 parent 9640572
commit 0a2c5ca
Show file tree

Hide file tree

Showing 37 changed files with 144 additions and 234 deletions.
diff --git a/astro/siril/Makefile b/astro/siril/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	siril
 DISTVERSION=	1.0.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro graphics
 MASTER_SITES=	https://free-astro.org/download/
 

diff --git a/graphics/dbow2/Makefile b/graphics/dbow2/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	dbow2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1-free-23
 DISTVERSIONSUFFIX=	-g3924753
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	digikam
 DISTVERSION=	8.3.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION} \

diff --git a/graphics/facedetect/Makefile b/graphics/facedetect/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	facedetect
 PORTVERSION=	0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 
 MAINTAINER=	ehaupt@FreeBSD.org

diff --git a/graphics/frei0r-plugins-opencv/Makefile b/graphics/frei0r-plugins-opencv/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-plugins-${SLAVE_PORT:tl}
 
 COMMENT=	Frei0r ${SLAVE_PORT} plugins

diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gmic
 DISTVERSION=	3.1.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	https://gmic.eu/files/source/
 DISTNAME=	${PORTNAME}_${DISTVERSION}

diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	GStreamer opencv real time computer vision plugin

diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nomacs
 PORTVERSION=	3.16
 DISTVERSIONSUFFIX=	.224
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/nomacs/nomacs/commit/

diff --git a/graphics/opencolorio-tools/Makefile b/graphics/opencolorio-tools/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	4
+PORTREVISION=	5
 PKGNAMESUFFIX=	-tools
 
 COMMENT=	Tools to work with OpenColorIO profiles

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	opencv
-DISTVERSION=	4.6.0
-PORTREVISION=	18
+DISTVERSION=	4.9.0
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch:-p1
-
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 WWW=		https://www.opencv.org/
@@ -36,10 +32,12 @@ GH_TAGNAME=	v0.1.1f:ade \
 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
 
-CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG
+CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG \
+		OPENCV_SKIP_CMAKE_CXX_STANDARD
 CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
 		BUILD_opencv_python2 \
 		BUILD_TESTS
+CMAKE_OFF+=	WITH_OBSENSOR # linux/uvcvideo.h is included when WITH_OBSENSOR is enabled
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
@@ -101,8 +99,7 @@ PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
 PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
 
 PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
-PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
-PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
+PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF # by default the bundled protobuf is built
 
 PYTHON_DESC=		Enable Python Support 3.6 or greater
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}

diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1682799940
-SHA256 (opencv-opencv-4.6.0_GH0.tar.gz) = 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-SIZE (opencv-opencv-4.6.0_GH0.tar.gz) = 90208971
+TIMESTAMP = 1703737939
+SHA256 (opencv-opencv-4.9.0_GH0.tar.gz) = ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c
+SIZE (opencv-opencv-4.9.0_GH0.tar.gz) = 92788647
 SHA256 (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 7a16ad6ca511c620c2a4cbef2c7cf1ff5c31bd530ac7b43ee2ea8481683df20a
 SIZE (WeChatCV-opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252_GH0.tar.gz) = 920403
-SHA256 (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7
-SIZE (opencv-opencv_contrib-4.6.0_GH0.tar.gz) = 59667769
+SHA256 (opencv-opencv_contrib-4.9.0_GH0.tar.gz) = 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae
+SIZE (opencv-opencv_contrib-4.9.0_GH0.tar.gz) = 59803362
 SHA256 (opencv-ade-v0.1.1f_GH0.tar.gz) = c316680efbb5dd3ac4e10bb8cea345cf26a6a25ebc22418f8f0b8ca931a550e9
 SIZE (opencv-ade-v0.1.1f_GH0.tar.gz) = 116074
 SHA256 (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = d93c783cdf799da7e4a9209d169390424c4c198c1c9b5eeb78ffc890afe5f332

diff --git a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake b/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake
diff --git a/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h b/graphics/opencv/files/patch-contrib_modules_sfm_src_libmv__light_libmv_numeric_numeric.h
@@ -1,8 +1,8 @@
---- contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig	2021-01-30 07:20:50 UTC
+--- contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h.orig	2023-12-26 21:24:58 UTC
 +++ contrib/modules/sfm/src/libmv_light/libmv/numeric/numeric.h
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
 
- #if !defined(__MINGW64__)
+ #if !defined(__MINGW32__)
  #  if defined(_WIN32) || defined(__APPLE__) || \
 -      defined(__FreeBSD__) || defined(__NetBSD__)
 +      defined(__NetBSD__)

diff --git a/graphics/opencv/files/patch-modules_core_src_system.cpp b/graphics/opencv/files/patch-modules_core_src_system.cpp
@@ -0,0 +1,20 @@
+- workaround for https://github.com/opencv/opencv/issues/25527
+
+--- modules/core/src/system.cpp.orig	2024-05-02 16:10:07 UTC
++++ modules/core/src/system.cpp
+@@ -566,6 +566,7 @@ struct HWFeatures
+     #ifdef __aarch64__
+         have[CV_CPU_NEON] = true;
+         have[CV_CPU_FP16] = true;
++#if 0 // disable until https://github.com/opencv/opencv/issues/25527 is fixed
+         int cpufile = open("/proc/self/auxv", O_RDONLY);
+
+         if (cpufile >= 0)
+@@ -589,6 +590,7 @@ struct HWFeatures
+
+             close(cpufile);
+         }
++#endif
+     #elif defined __arm__ && defined __ANDROID__
+       #if defined HAVE_CPUFEATURES
+         CV_LOG_INFO(NULL, "calling android_getCpuFeatures() ...");
diff --git a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
@@ -1,12 +1,12 @@
 The ade distdata is downloaded and moved to the proper location by the ports 
 framework.
 
---- modules/gapi/cmake/DownloadADE.cmake.orig	2021-07-05 12:03:22 UTC
+--- modules/gapi/cmake/DownloadADE.cmake.orig	2023-12-27 16:46:55 UTC
 +++ modules/gapi/cmake/DownloadADE.cmake
-@@ -2,22 +2,18 @@ set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade")
- set(ade_filename "v0.1.1f.zip")
- set(ade_subdir "ade-0.1.1f")
- set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2")
+@@ -2,18 +2,12 @@ set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
+ set(ade_filename "v0.1.2d.zip")
+ set(ade_subdir "ade-0.1.2d")
+ set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
 -ocv_download(FILENAME ${ade_filename}
 -             HASH ${ade_md5}
 -             URL
@@ -17,20 +17,14 @@ framework.
 -             ID ADE
 -             STATUS res
 -             UNPACK RELATIVE_URL)
- 
+-
 -if (NOT res)
-+set(file_id ade-0.1.1f/CMakeLists.txt)
++set(file_id ade-0.1.2d/CMakeLists.txt)
 +set(FILENAME ${ade_src_dir}/${file_id})
 +if(EXISTS ${FILENAME})
 +    message("++ ade: Using prefetched ${file_id}")
 +else()
 +    message(WARNING "++ ade: Could not find ${file_id} in ${FILENAME}")
      return()
--endif()
-+ endif()
+ endif()
 
- set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade")
-+
- file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp")
- file(GLOB_RECURSE ADE_include "${ADE_root}/include/ade/*.hpp")
- add_library(ade STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL}
diff --git a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp b/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp