From nobody Thu May 02 17:42:18 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VVh8W1CCsz5Jjwx; Thu, 2 May 2024 17:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVh8W0tnBz4fF0; Thu, 2 May 2024 17:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714671739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7R1+lnqgamFWtdceDYZWX34TUsxFr28HVtuqIqSVBtM=; b=hyTGsjMe2/VPHQgbPdZSILgnPUT1lajuJtK0THUVPwJHhEzZ2vcZTlQgIvCkrNG4ErDW5Q uECLQvsdFLnTylSsAkbzYHqCmzv/l/lHsGtL8TQ1qg+/RH9ymEHJnohls0mnLP/aZ4jm8u bfQK5BXYMYgHy6SgMq4AF6/eBOctSGjZNIQzMHWGFk/6mysLAiKCmHD0j0XYVsZ0HsEqGm I3qNxuLd5FpCEcAP18ZM1cfS5WhQsUG4/VF44YocM643Fy/D7wlixsSur/FB6Z6fk2zDlh HJzYagmkj5k2aS3vZcLlmx/XjqB9mlHJWe0/lNnztZFBHA0fOl5z8EcISdM8Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714671739; a=rsa-sha256; cv=none; b=PNCff7WWLuyaHmltK0sUnnig5ua4J+tfdFnZdx6z7ZhUZeA6I5ogQcu466l5KRa8xvkUAI ECIq9Tx4j8Q5p9yuyc2b9pItDQabtcHviV1vyhhkSxdOCkBmxdFsFWCbr77970chaVCtRa VMyYWECcecTx6NZxogZPddBNFQqkFgCOcCfAu+lDB0e7k5EQ5dXKCzk0D0XgM+Op9zGdac nVM/7ZfM3ySo54HokeSOSWhPwYgBYUxZirPJAEyJ855GV+O/8+I0h+xdr/iFnE/4c95NX1 q4JeJN4cEyq7fXki5nzr+DgBpMQjL6n9ybjVx8h61fLxuUeunuzVBqycOYInbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714671739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7R1+lnqgamFWtdceDYZWX34TUsxFr28HVtuqIqSVBtM=; b=fzc9iljKA69d45lHinJDc3tuX910jF+b82u4bSXVT8M8KbImTMvl2VdZgTlajuvXRF87w7 kaC1rUQexRm/M2Vz3X14BuUtxhe6U/hLMyVFZU25pFwhCgtvhnijLoXDvF6mxr8H5/vRCU KL0v+ttXnsu1F5R82vH9lnmvd4FapkTZ8Nn5QYvh1NEW6P39enBCs9aETrysVUDM12wCIw Iol1XGN3vF+2oxZDTAmjFtmOIfGAKvFZbZaZ5se4ZdqT16iq0MwJxbJLNAPedxg+p2TjI7 EDlMN9kKfjTpj3mbec1opBjPaW8yc49G2kUUffBYPkkFpTTsPUOPHI877fsgxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVh8W0VCdz1C3b; Thu, 2 May 2024 17:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442HgJS4018997; Thu, 2 May 2024 17:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442HgIJl018994; Thu, 2 May 2024 17:42:18 GMT (envelope-from git) Date: Thu, 2 May 2024 17:42:18 GMT Message-Id: <202405021742.442HgIJl018994@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0a2c5ca042fd - main - graphics/opencv: update 4.6.0 =?utf-8?Q?=E2=86=92?= 4.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a2c5ca042fda31ac37c629793420d7035502e01 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a2c5ca042fda31ac37c629793420d7035502e01 commit 0a2c5ca042fda31ac37c629793420d7035502e01 Author: Yuri Victorovich AuthorDate: 2024-05-02 14:58:23 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-02 17:42:04 +0000 graphics/opencv: update 4.6.0 → 4.9.0 PR: 275977 Approved by: desktop@FreeBSD.org (maintainers timeout; 4+ months) --- astro/siril/Makefile | 2 +- graphics/dbow2/Makefile | 2 +- graphics/digikam/Makefile | 1 + graphics/facedetect/Makefile | 2 +- graphics/frei0r-plugins-opencv/Makefile | 2 +- graphics/gmic/Makefile | 2 +- graphics/gstreamer1-plugins-opencv/Makefile | 2 +- graphics/nomacs/Makefile | 2 +- graphics/opencolorio-tools/Makefile | 2 +- graphics/opencv/Makefile | 13 +- graphics/opencv/distinfo | 10 +- .../files/patch-cmake_OpenCVFindLibsGrfmt.cmake | 14 -- ...es_sfm_src_libmv__light_libmv_numeric_numeric.h | 6 +- .../opencv/files/patch-modules_core_src_system.cpp | 20 ++ .../patch-modules_gapi_cmake_DownloadADE.cmake | 22 +- .../patch-modules_imgcodecs_src_grfmt__png.cpp | 11 - graphics/opencv/pkg-plist | 231 +++++++-------------- graphics/openmvs/Makefile | 2 +- graphics/php-facedetect/Makefile | 2 +- graphics/py-imageio/Makefile | 1 + graphics/py-imutils/Makefile | 1 + graphics/py-qudida/Makefile | 1 + graphics/waifu2x-converter-cpp/Makefile | 2 +- graphics/yafaray/Makefile | 2 +- misc/actiona/Makefile | 2 +- misc/caffe/Makefile | 2 +- misc/darknet/Makefile | 2 +- misc/mxnet/Makefile | 2 +- misc/visp/Makefile | 1 + multimedia/chilitags/Makefile | 2 +- multimedia/libopenshot/Makefile | 2 +- multimedia/lives/Makefile | 2 +- multimedia/opentoonz/Makefile | 2 +- multimedia/py-PySceneDetect/Makefile | 1 + multimedia/zart/Makefile | 2 +- security/howdy/Makefile | 2 +- textproc/py-pdf2docx/Makefile | 1 + 37 files changed, 144 insertions(+), 234 deletions(-) diff --git a/astro/siril/Makefile b/astro/siril/Makefile index 7fb5acc9eaaf..e53a9d9ce4b3 100644 --- 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 index e313466ebf22..ae98df7d387c 100644 --- 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 index 92a2c555127e..251f6b68ea79 100644 --- 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 index 60d81ff8af3e..547e4e32ef69 100644 --- 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 index 2de52ca243eb..5682aa685045 100644 --- 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 index 8d7ec8478f5e..9f59f8a9f31e 100644 --- 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 index 744260b86f67..3ecde1b6d687 100644 --- 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 index 8f37a0dcd6e8..0f83170e1ec2 100644 --- 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 index 814408902f33..b8f0eb0819ae 100644 --- 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 index a9e257085dac..56019e633b35 100644 --- 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 index 35a189ff7ab3..e3d18f6f42b0 100644 --- 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 deleted file mode 100644 index 6371feb89063..000000000000 --- a/graphics/opencv/files/patch-cmake_OpenCVFindLibsGrfmt.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/OpenCVFindLibsGrfmt.cmake.orig 2022-06-05 15:32:44 UTC -+++ cmake/OpenCVFindLibsGrfmt.cmake -@@ -230,9 +230,9 @@ if(WITH_PNG) - include(FindPNG) - if(PNG_FOUND) - include(CheckIncludeFile) -- check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -+ check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG_PNG_H) - if(HAVE_LIBPNG_PNG_H) -- ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) -+ ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) - else() - ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) - endif() 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 index 47f4a8c59730..bcd147a49436 100644 --- 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 new file mode 100644 index 000000000000..6174bfb0fd6b --- /dev/null +++ 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 index 45fcc5ea32ec..7643e2a237c4 100644 --- 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 deleted file mode 100644 index 1ded70237237..000000000000 --- a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__png.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/imgcodecs/src/grfmt_png.cpp.orig 2021-07-18 11:13:32 UTC -+++ modules/imgcodecs/src/grfmt_png.cpp -@@ -59,7 +59,7 @@ - #endif - - #ifdef HAVE_LIBPNG_PNG_H --#include -+#include - #else - #include - #endif diff --git a/graphics/opencv/pkg-plist b/graphics/opencv/pkg-plist index f4e2fa75cf25..cbfc7246738b 100644 --- a/graphics/opencv/pkg-plist +++ b/graphics/opencv/pkg-plist @@ -6,9 +6,8 @@ bin/opencv_visualisation bin/opencv_waldboost_detector %%EIGEN%%include/opencv4/opencv2/alphamat.hpp include/opencv4/opencv2/aruco.hpp +include/opencv4/opencv2/aruco/aruco_calib.hpp include/opencv4/opencv2/aruco/charuco.hpp -include/opencv4/opencv2/aruco/dictionary.hpp -%%PROTOBUF%%include/opencv4/opencv2/barcode.hpp include/opencv4/opencv2/bgsegm.hpp include/opencv4/opencv2/bioinspired.hpp include/opencv4/opencv2/bioinspired/bioinspired.hpp @@ -86,10 +85,17 @@ include/opencv4/opencv2/core/hal/intrin_avx.hpp include/opencv4/opencv2/core/hal/intrin_avx512.hpp include/opencv4/opencv2/core/hal/intrin_cpp.hpp include/opencv4/opencv2/core/hal/intrin_forward.hpp +include/opencv4/opencv2/core/hal/intrin_lasx.hpp +include/opencv4/opencv2/core/hal/intrin_lsx.hpp include/opencv4/opencv2/core/hal/intrin_msa.hpp include/opencv4/opencv2/core/hal/intrin_neon.hpp include/opencv4/opencv2/core/hal/intrin_rvv.hpp include/opencv4/opencv2/core/hal/intrin_rvv071.hpp +include/opencv4/opencv2/core/hal/intrin_rvv_010_compat_non-policy.hpp +include/opencv4/opencv2/core/hal/intrin_rvv_010_compat_overloaded-non-policy.hpp +include/opencv4/opencv2/core/hal/intrin_rvv_011_compat.hpp +include/opencv4/opencv2/core/hal/intrin_rvv_compat_overloaded.hpp +include/opencv4/opencv2/core/hal/intrin_rvv_scalable.hpp include/opencv4/opencv2/core/hal/intrin_sse.hpp include/opencv4/opencv2/core/hal/intrin_sse_em.hpp include/opencv4/opencv2/core/hal/intrin_vsx.hpp @@ -254,96 +260,6 @@ include/opencv4/opencv2/fuzzy/fuzzy_F0_math.hpp include/opencv4/opencv2/fuzzy/fuzzy_F1_math.hpp include/opencv4/opencv2/fuzzy/fuzzy_image.hpp include/opencv4/opencv2/fuzzy/types.hpp -include/opencv4/opencv2/gapi.hpp -include/opencv4/opencv2/gapi/core.hpp -include/opencv4/opencv2/gapi/cpu/core.hpp -include/opencv4/opencv2/gapi/cpu/gcpukernel.hpp -include/opencv4/opencv2/gapi/cpu/imgproc.hpp -include/opencv4/opencv2/gapi/cpu/stereo.hpp -include/opencv4/opencv2/gapi/cpu/video.hpp -include/opencv4/opencv2/gapi/fluid/core.hpp -include/opencv4/opencv2/gapi/fluid/gfluidbuffer.hpp -include/opencv4/opencv2/gapi/fluid/gfluidkernel.hpp -include/opencv4/opencv2/gapi/fluid/imgproc.hpp -include/opencv4/opencv2/gapi/garg.hpp -include/opencv4/opencv2/gapi/garray.hpp -include/opencv4/opencv2/gapi/gasync_context.hpp -include/opencv4/opencv2/gapi/gcall.hpp -include/opencv4/opencv2/gapi/gcommon.hpp -include/opencv4/opencv2/gapi/gcompiled.hpp -include/opencv4/opencv2/gapi/gcompiled_async.hpp -include/opencv4/opencv2/gapi/gcompoundkernel.hpp -include/opencv4/opencv2/gapi/gcomputation.hpp -include/opencv4/opencv2/gapi/gcomputation_async.hpp -include/opencv4/opencv2/gapi/gframe.hpp -include/opencv4/opencv2/gapi/gkernel.hpp -include/opencv4/opencv2/gapi/gmat.hpp -include/opencv4/opencv2/gapi/gmetaarg.hpp -include/opencv4/opencv2/gapi/gopaque.hpp -include/opencv4/opencv2/gapi/gproto.hpp -include/opencv4/opencv2/gapi/gpu/core.hpp -include/opencv4/opencv2/gapi/gpu/ggpukernel.hpp -include/opencv4/opencv2/gapi/gpu/imgproc.hpp -include/opencv4/opencv2/gapi/gscalar.hpp -include/opencv4/opencv2/gapi/gstreaming.hpp -include/opencv4/opencv2/gapi/gtransform.hpp -include/opencv4/opencv2/gapi/gtype_traits.hpp -include/opencv4/opencv2/gapi/gtyped.hpp -include/opencv4/opencv2/gapi/imgproc.hpp -include/opencv4/opencv2/gapi/infer.hpp -include/opencv4/opencv2/gapi/infer/bindings_ie.hpp -include/opencv4/opencv2/gapi/infer/ie.hpp -include/opencv4/opencv2/gapi/infer/onnx.hpp -include/opencv4/opencv2/gapi/infer/parsers.hpp -include/opencv4/opencv2/gapi/media.hpp -include/opencv4/opencv2/gapi/oak/infer.hpp -include/opencv4/opencv2/gapi/oak/oak.hpp -include/opencv4/opencv2/gapi/ocl/core.hpp -include/opencv4/opencv2/gapi/ocl/goclkernel.hpp -include/opencv4/opencv2/gapi/ocl/imgproc.hpp -include/opencv4/opencv2/gapi/opencv_includes.hpp -include/opencv4/opencv2/gapi/operators.hpp -include/opencv4/opencv2/gapi/own/assert.hpp -include/opencv4/opencv2/gapi/own/convert.hpp -include/opencv4/opencv2/gapi/own/cvdefs.hpp -include/opencv4/opencv2/gapi/own/exports.hpp -include/opencv4/opencv2/gapi/own/mat.hpp -include/opencv4/opencv2/gapi/own/saturate.hpp -include/opencv4/opencv2/gapi/own/scalar.hpp -include/opencv4/opencv2/gapi/own/types.hpp -include/opencv4/opencv2/gapi/plaidml/core.hpp -include/opencv4/opencv2/gapi/plaidml/gplaidmlkernel.hpp -include/opencv4/opencv2/gapi/plaidml/plaidml.hpp -include/opencv4/opencv2/gapi/python/python.hpp -include/opencv4/opencv2/gapi/render.hpp -include/opencv4/opencv2/gapi/render/render.hpp -include/opencv4/opencv2/gapi/render/render_types.hpp -include/opencv4/opencv2/gapi/rmat.hpp -include/opencv4/opencv2/gapi/s11n.hpp -include/opencv4/opencv2/gapi/s11n/base.hpp -include/opencv4/opencv2/gapi/stereo.hpp -include/opencv4/opencv2/gapi/streaming/cap.hpp -include/opencv4/opencv2/gapi/streaming/desync.hpp -include/opencv4/opencv2/gapi/streaming/format.hpp -include/opencv4/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp -include/opencv4/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp -include/opencv4/opencv2/gapi/streaming/meta.hpp -include/opencv4/opencv2/gapi/streaming/onevpl/accel_types.hpp -include/opencv4/opencv2/gapi/streaming/onevpl/cfg_params.hpp -include/opencv4/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp -include/opencv4/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp -include/opencv4/opencv2/gapi/streaming/onevpl/source.hpp -include/opencv4/opencv2/gapi/streaming/source.hpp -include/opencv4/opencv2/gapi/streaming/sync.hpp -include/opencv4/opencv2/gapi/util/any.hpp -include/opencv4/opencv2/gapi/util/compiler_hints.hpp -include/opencv4/opencv2/gapi/util/copy_through_move.hpp -include/opencv4/opencv2/gapi/util/optional.hpp -include/opencv4/opencv2/gapi/util/throw.hpp -include/opencv4/opencv2/gapi/util/type_traits.hpp -include/opencv4/opencv2/gapi/util/util.hpp -include/opencv4/opencv2/gapi/util/variant.hpp -include/opencv4/opencv2/gapi/video.hpp include/opencv4/opencv2/hdf.hpp include/opencv4/opencv2/hdf/hdf5.hpp include/opencv4/opencv2/hfs.hpp @@ -384,8 +300,14 @@ include/opencv4/opencv2/ml.hpp include/opencv4/opencv2/ml/ml.hpp include/opencv4/opencv2/ml/ml.inl.hpp include/opencv4/opencv2/objdetect.hpp +include/opencv4/opencv2/objdetect/aruco_board.hpp +include/opencv4/opencv2/objdetect/aruco_detector.hpp +include/opencv4/opencv2/objdetect/aruco_dictionary.hpp +include/opencv4/opencv2/objdetect/barcode.hpp +include/opencv4/opencv2/objdetect/charuco_detector.hpp include/opencv4/opencv2/objdetect/detection_based_tracker.hpp include/opencv4/opencv2/objdetect/face.hpp +include/opencv4/opencv2/objdetect/graphical_code_detector.hpp include/opencv4/opencv2/objdetect/objdetect.hpp include/opencv4/opencv2/opencv.hpp include/opencv4/opencv2/opencv_modules.hpp @@ -544,6 +466,7 @@ include/opencv4/opencv2/ximgproc/edgepreserving_filter.hpp include/opencv4/opencv2/ximgproc/estimated_covariance.hpp include/opencv4/opencv2/ximgproc/fast_hough_transform.hpp include/opencv4/opencv2/ximgproc/fast_line_detector.hpp +include/opencv4/opencv2/ximgproc/find_ellipses.hpp include/opencv4/opencv2/ximgproc/fourier_descriptors.hpp include/opencv4/opencv2/ximgproc/lsc.hpp include/opencv4/opencv2/ximgproc/paillou_filter.hpp @@ -572,182 +495,175 @@ lib/cmake/opencv4/OpenCVModules-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/opencv4/OpenCVModules.cmake %%EIGEN%%lib/libopencv_alphamat.so %%EIGEN%%lib/libopencv_alphamat.so.%%SHLIB_VER%% -%%EIGEN%%lib/libopencv_alphamat.so.406 +%%EIGEN%%lib/libopencv_alphamat.so.409 lib/libopencv_aruco.so lib/libopencv_aruco.so.%%SHLIB_VER%% -lib/libopencv_aruco.so.406 -%%PROTOBUF%%lib/libopencv_barcode.so -%%PROTOBUF%%lib/libopencv_barcode.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_barcode.so.406 +lib/libopencv_aruco.so.409 lib/libopencv_bgsegm.so lib/libopencv_bgsegm.so.%%SHLIB_VER%% -lib/libopencv_bgsegm.so.406 +lib/libopencv_bgsegm.so.409 lib/libopencv_bioinspired.so lib/libopencv_bioinspired.so.%%SHLIB_VER%% -lib/libopencv_bioinspired.so.406 +lib/libopencv_bioinspired.so.409 lib/libopencv_calib3d.so lib/libopencv_calib3d.so.%%SHLIB_VER%% -lib/libopencv_calib3d.so.406 +lib/libopencv_calib3d.so.409 lib/libopencv_ccalib.so lib/libopencv_ccalib.so.%%SHLIB_VER%% -lib/libopencv_ccalib.so.406 +lib/libopencv_ccalib.so.409 lib/libopencv_core.so lib/libopencv_core.so.%%SHLIB_VER%% -lib/libopencv_core.so.406 +lib/libopencv_core.so.409 lib/libopencv_datasets.so lib/libopencv_datasets.so.%%SHLIB_VER%% -lib/libopencv_datasets.so.406 +lib/libopencv_datasets.so.409 %%PROTOBUF%%lib/libopencv_dnn.so %%PROTOBUF%%lib/libopencv_dnn.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_dnn.so.406 +%%PROTOBUF%%lib/libopencv_dnn.so.409 %%PROTOBUF%%lib/libopencv_dnn_objdetect.so %%PROTOBUF%%lib/libopencv_dnn_objdetect.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.406 +%%PROTOBUF%%lib/libopencv_dnn_objdetect.so.409 %%PROTOBUF%%lib/libopencv_dnn_superres.so %%PROTOBUF%%lib/libopencv_dnn_superres.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_dnn_superres.so.406 +%%PROTOBUF%%lib/libopencv_dnn_superres.so.409 lib/libopencv_dpm.so lib/libopencv_dpm.so.%%SHLIB_VER%% -lib/libopencv_dpm.so.406 +lib/libopencv_dpm.so.409 lib/libopencv_face.so lib/libopencv_face.so.%%SHLIB_VER%% -lib/libopencv_face.so.406 +lib/libopencv_face.so.409 lib/libopencv_features2d.so lib/libopencv_features2d.so.%%SHLIB_VER%% -lib/libopencv_features2d.so.406 +lib/libopencv_features2d.so.409 lib/libopencv_flann.so lib/libopencv_flann.so.%%SHLIB_VER%% -lib/libopencv_flann.so.406 +lib/libopencv_flann.so.409 lib/libopencv_freetype.so lib/libopencv_freetype.so.%%SHLIB_VER%% -lib/libopencv_freetype.so.406 +lib/libopencv_freetype.so.409 lib/libopencv_fuzzy.so lib/libopencv_fuzzy.so.%%SHLIB_VER%% -lib/libopencv_fuzzy.so.406 -lib/libopencv_gapi.so -lib/libopencv_gapi.so.%%SHLIB_VER%% -lib/libopencv_gapi.so.406 +lib/libopencv_fuzzy.so.409 lib/libopencv_hdf.so lib/libopencv_hdf.so.%%SHLIB_VER%% -lib/libopencv_hdf.so.406 +lib/libopencv_hdf.so.409 lib/libopencv_hfs.so lib/libopencv_hfs.so.%%SHLIB_VER%% -lib/libopencv_hfs.so.406 +lib/libopencv_hfs.so.409 lib/libopencv_highgui.so lib/libopencv_highgui.so.%%SHLIB_VER%% -lib/libopencv_highgui.so.406 +lib/libopencv_highgui.so.409 lib/libopencv_img_hash.so lib/libopencv_img_hash.so.%%SHLIB_VER%% -lib/libopencv_img_hash.so.406 +lib/libopencv_img_hash.so.409 lib/libopencv_imgcodecs.so lib/libopencv_imgcodecs.so.%%SHLIB_VER%% -lib/libopencv_imgcodecs.so.406 +lib/libopencv_imgcodecs.so.409 lib/libopencv_imgproc.so lib/libopencv_imgproc.so.%%SHLIB_VER%% -lib/libopencv_imgproc.so.406 +lib/libopencv_imgproc.so.409 lib/libopencv_intensity_transform.so lib/libopencv_intensity_transform.so.%%SHLIB_VER%% -lib/libopencv_intensity_transform.so.406 +lib/libopencv_intensity_transform.so.409 lib/libopencv_line_descriptor.so lib/libopencv_line_descriptor.so.%%SHLIB_VER%% -lib/libopencv_line_descriptor.so.406 +lib/libopencv_line_descriptor.so.409 %%PROTOBUF%%lib/libopencv_mcc.so %%PROTOBUF%%lib/libopencv_mcc.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_mcc.so.406 +%%PROTOBUF%%lib/libopencv_mcc.so.409 lib/libopencv_ml.so lib/libopencv_ml.so.%%SHLIB_VER%% -lib/libopencv_ml.so.406 +lib/libopencv_ml.so.409 lib/libopencv_objdetect.so lib/libopencv_objdetect.so.%%SHLIB_VER%% -lib/libopencv_objdetect.so.406 +lib/libopencv_objdetect.so.409 lib/libopencv_optflow.so lib/libopencv_optflow.so.%%SHLIB_VER%% -lib/libopencv_optflow.so.406 +lib/libopencv_optflow.so.409 lib/libopencv_phase_unwrapping.so lib/libopencv_phase_unwrapping.so.%%SHLIB_VER%% -lib/libopencv_phase_unwrapping.so.406 +lib/libopencv_phase_unwrapping.so.409 lib/libopencv_photo.so lib/libopencv_photo.so.%%SHLIB_VER%% -lib/libopencv_photo.so.406 +lib/libopencv_photo.so.409 lib/libopencv_plot.so lib/libopencv_plot.so.%%SHLIB_VER%% -lib/libopencv_plot.so.406 +lib/libopencv_plot.so.409 lib/libopencv_quality.so lib/libopencv_quality.so.%%SHLIB_VER%% -lib/libopencv_quality.so.406 +lib/libopencv_quality.so.409 lib/libopencv_rapid.so lib/libopencv_rapid.so.%%SHLIB_VER%% -lib/libopencv_rapid.so.406 +lib/libopencv_rapid.so.409 lib/libopencv_reg.so lib/libopencv_reg.so.%%SHLIB_VER%% -lib/libopencv_reg.so.406 +lib/libopencv_reg.so.409 lib/libopencv_rgbd.so lib/libopencv_rgbd.so.%%SHLIB_VER%% -lib/libopencv_rgbd.so.406 +lib/libopencv_rgbd.so.409 lib/libopencv_saliency.so lib/libopencv_saliency.so.%%SHLIB_VER%% -lib/libopencv_saliency.so.406 +lib/libopencv_saliency.so.409 %%EIGEN%%lib/libopencv_sfm.so %%EIGEN%%lib/libopencv_sfm.so.%%SHLIB_VER%% -%%EIGEN%%lib/libopencv_sfm.so.406 +%%EIGEN%%lib/libopencv_sfm.so.409 lib/libopencv_shape.so lib/libopencv_shape.so.%%SHLIB_VER%% -lib/libopencv_shape.so.406 +lib/libopencv_shape.so.409 lib/libopencv_stereo.so lib/libopencv_stereo.so.%%SHLIB_VER%% -lib/libopencv_stereo.so.406 +lib/libopencv_stereo.so.409 lib/libopencv_stitching.so lib/libopencv_stitching.so.%%SHLIB_VER%% -lib/libopencv_stitching.so.406 +lib/libopencv_stitching.so.409 lib/libopencv_structured_light.so lib/libopencv_structured_light.so.%%SHLIB_VER%% -lib/libopencv_structured_light.so.406 +lib/libopencv_structured_light.so.409 lib/libopencv_superres.so lib/libopencv_superres.so.%%SHLIB_VER%% -lib/libopencv_superres.so.406 +lib/libopencv_superres.so.409 lib/libopencv_surface_matching.so lib/libopencv_surface_matching.so.%%SHLIB_VER%% -lib/libopencv_surface_matching.so.406 +lib/libopencv_surface_matching.so.409 %%PROTOBUF%%lib/libopencv_text.so %%PROTOBUF%%lib/libopencv_text.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_text.so.406 +%%PROTOBUF%%lib/libopencv_text.so.409 lib/libopencv_tracking.so lib/libopencv_tracking.so.%%SHLIB_VER%% -lib/libopencv_tracking.so.406 +lib/libopencv_tracking.so.409 lib/libopencv_video.so lib/libopencv_video.so.%%SHLIB_VER%% -lib/libopencv_video.so.406 +lib/libopencv_video.so.409 lib/libopencv_videoio.so lib/libopencv_videoio.so.%%SHLIB_VER%% -lib/libopencv_videoio.so.406 +lib/libopencv_videoio.so.409 lib/libopencv_videostab.so lib/libopencv_videostab.so.%%SHLIB_VER%% -lib/libopencv_videostab.so.406 +lib/libopencv_videostab.so.409 %%VTK%%lib/libopencv_viz.so %%VTK%%lib/libopencv_viz.so.%%SHLIB_VER%% -%%VTK%%lib/libopencv_viz.so.406 +%%VTK%%lib/libopencv_viz.so.409 %%PROTOBUF%%lib/libopencv_wechat_qrcode.so %%PROTOBUF%%lib/libopencv_wechat_qrcode.so.%%SHLIB_VER%% -%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.406 +%%PROTOBUF%%lib/libopencv_wechat_qrcode.so.409 lib/libopencv_xfeatures2d.so lib/libopencv_xfeatures2d.so.%%SHLIB_VER%% -lib/libopencv_xfeatures2d.so.406 +lib/libopencv_xfeatures2d.so.409 lib/libopencv_ximgproc.so lib/libopencv_ximgproc.so.%%SHLIB_VER%% -lib/libopencv_ximgproc.so.406 +lib/libopencv_ximgproc.so.409 lib/libopencv_xobjdetect.so lib/libopencv_xobjdetect.so.%%SHLIB_VER%% -lib/libopencv_xobjdetect.so.406 +lib/libopencv_xobjdetect.so.409 lib/libopencv_xphoto.so lib/libopencv_xphoto.so.%%SHLIB_VER%% -lib/libopencv_xphoto.so.406 +lib/libopencv_xphoto.so.409 %%EIGEN%%lib/opencv4/3rdparty/libcorrespondence.a %%EIGEN%%lib/opencv4/3rdparty/libmultiview.a %%EIGEN%%lib/opencv4/3rdparty/libnumeric.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config-%%PYTHON_VER%%.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/config.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/gapi/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py2.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/load_config_py3.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/mat_wrapper/__init__.py @@ -756,6 +672,8 @@ lib/libopencv_xphoto.so.406 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/python-%%PYTHON_VER%%/cv2%%PYTHON_EXT_SUFFIX%%.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/cv2/utils/__init__.py libdata/pkgconfig/opencv4.pc +%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java490.so +%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-490.jar %%DATADIR%%/haarcascades/haarcascade_eye.xml %%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml %%DATADIR%%/haarcascades/haarcascade_frontalcatface.xml @@ -766,7 +684,7 @@ libdata/pkgconfig/opencv4.pc %%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml %%DATADIR%%/haarcascades/haarcascade_fullbody.xml %%DATADIR%%/haarcascades/haarcascade_lefteye_2splits.xml -%%DATADIR%%/haarcascades/haarcascade_licence_plate_rus_16stages.xml +%%DATADIR%%/haarcascades/haarcascade_license_plate_rus_16stages.xml %%DATADIR%%/haarcascades/haarcascade_lowerbody.xml %%DATADIR%%/haarcascades/haarcascade_profileface.xml %%DATADIR%%/haarcascades/haarcascade_righteye_2splits.xml @@ -782,5 +700,4 @@ libdata/pkgconfig/opencv4.pc %%DATADIR%%/quality/brisque_range_live.yml %%DATADIR%%/valgrind.supp %%DATADIR%%/valgrind_3rdparty.supp -%%JAVA%%%%JAVASHAREDIR%%/opencv4/libopencv_java460.so -%%JAVA%%%%JAVASHAREDIR%%/opencv4/opencv-460.jar +%%PYTHON%%@dir %%PYTHON_SITELIBDIR%%/cv2/typing diff --git a/graphics/openmvs/Makefile b/graphics/openmvs/Makefile index d80a12b00e86..9b427bbb4b4c 100644 --- a/graphics/openmvs/Makefile +++ b/graphics/openmvs/Makefile @@ -1,7 +1,7 @@ PORTNAME= openmvs DISTVERSIONPREFIX= v DISTVERSION= 2.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile index 4149580fd2f4..8bf0c873f024 100644 --- a/graphics/php-facedetect/Makefile +++ b/graphics/php-facedetect/Makefile @@ -1,6 +1,6 @@ PORTNAME= facedetect PORTVERSION= 1.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile index d7e7d5a7b155..209d63f81b94 100644 --- a/graphics/py-imageio/Makefile +++ b/graphics/py-imageio/Makefile @@ -1,5 +1,6 @@ PORTNAME= imageio PORTVERSION= 2.34.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= PYPI \ https://github.com/imageio/imageio/releases/download/v${PORTVERSION}/ diff --git a/graphics/py-imutils/Makefile b/graphics/py-imutils/Makefile index 926deb6136b1..746c083a5133 100644 --- a/graphics/py-imutils/Makefile +++ b/graphics/py-imutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= imutils PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-qudida/Makefile b/graphics/py-qudida/Makefile index 9eddc5686a02..77486f6814b3 100644 --- a/graphics/py-qudida/Makefile +++ b/graphics/py-qudida/Makefile @@ -1,5 +1,6 @@ PORTNAME= qudida DISTVERSION= 0.0.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile index add6d3798570..0bda0423ca30 100644 --- a/graphics/waifu2x-converter-cpp/Makefile +++ b/graphics/waifu2x-converter-cpp/Makefile @@ -1,7 +1,7 @@ PORTNAME= waifu2x-converter-cpp DISTVERSIONPREFIX= v DISTVERSION= 5.3.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile index 7604daca49dd..5fff80140058 100644 --- a/graphics/yafaray/Makefile +++ b/graphics/yafaray/Makefile @@ -1,7 +1,7 @@ PORTNAME= yafaray DISTVERSIONPREFIX= v DISTVERSION= 3.5.1 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/misc/actiona/Makefile b/misc/actiona/Makefile index 07b76fa69663..1327afb28cf6 100644 --- a/misc/actiona/Makefile +++ b/misc/actiona/Makefile @@ -1,7 +1,7 @@ PORTNAME= actiona DISTVERSIONPREFIX= v DISTVERSION= 3.10.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/caffe/Makefile b/misc/caffe/Makefile index dad6a4a66330..fd6274883b1b 100644 --- a/misc/caffe/Makefile +++ b/misc/caffe/Makefile @@ -1,7 +1,7 @@ PORTNAME= caffe DISTVERSION= 1.0-136 DISTVERSIONSUFFIX= -g9b891540 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc # machine-learning PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/misc/darknet/Makefile b/misc/darknet/Makefile index 04d7ef1d7541..4b0768607c60 100644 --- a/misc/darknet/Makefile +++ b/misc/darknet/Makefile @@ -1,7 +1,7 @@ PORTNAME= darknet DISTVERSIONPREFIX= darknet_yolo_v DISTVERSION= 4_pre -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= misc # machine-learning diff --git a/misc/mxnet/Makefile b/misc/mxnet/Makefile index 6ef7146572aa..8e999ab47355 100644 --- a/misc/mxnet/Makefile +++ b/misc/mxnet/Makefile @@ -1,6 +1,6 @@ PORTNAME= mxnet DISTVERSION= 1.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org diff --git a/misc/visp/Makefile b/misc/visp/Makefile index d8a5ceb922b6..a999e1f23540 100644 --- a/misc/visp/Makefile +++ b/misc/visp/Makefile @@ -1,5 +1,6 @@ PORTNAME= visp DISTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= https://visp-doc.inria.fr/download/releases/ diff --git a/multimedia/chilitags/Makefile b/multimedia/chilitags/Makefile index 93a0059f5e6a..e405c543ee76 100644 --- a/multimedia/chilitags/Makefile +++ b/multimedia/chilitags/Makefile @@ -1,7 +1,7 @@ PORTNAME= chilitags DISTVERSION= 2.0.0-169 DISTVERSIONSUFFIX= -g0d9854f -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index 0319826dc5df..2be0f3ecb6ae 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -1,7 +1,7 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index de7f0c471061..eee9638e1763 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -1,6 +1,6 @@ PORTNAME= lives DISTVERSION= 3.2.0 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} diff --git a/multimedia/opentoonz/Makefile b/multimedia/opentoonz/Makefile index fa65703e24e8..863de3a1ade2 100644 --- a/multimedia/opentoonz/Makefile +++ b/multimedia/opentoonz/Makefile @@ -1,7 +1,7 @@ PORTNAME= opentoonz DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MAINTAINER= rozhuk.im@gmail.com diff --git a/multimedia/py-PySceneDetect/Makefile b/multimedia/py-PySceneDetect/Makefile index 0894cbbc1fcd..86d726b8ac50 100644 --- a/multimedia/py-PySceneDetect/Makefile +++ b/multimedia/py-PySceneDetect/Makefile @@ -1,5 +1,6 @@ PORTNAME= PySceneDetect DISTVERSION= 0.6.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -release CATEGORIES= multimedia python diff --git a/multimedia/zart/Makefile b/multimedia/zart/Makefile index 8f826cb06101..647bb3c0d624 100644 --- a/multimedia/zart/Makefile +++ b/multimedia/zart/Makefile @@ -1,6 +1,6 @@ PORTNAME= zart PORTVERSION= g20191124 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= https://gmic.eu/files/source/:gmic DISTFILES= gmic_${GMIC_VERSION}.tar.gz:gmic diff --git a/security/howdy/Makefile b/security/howdy/Makefile index abee4b0d7016..34d39f49194a 100644 --- a/security/howdy/Makefile +++ b/security/howdy/Makefile @@ -1,6 +1,6 @@ PORTNAME= howdy *** 17 LINES SKIPPED ***