From ddeba1b93c8210d3bf9b28e5da9490ed163e94a0 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sat, 18 Jan 2020 20:12:48 -0500 Subject: [PATCH 1/6] opencv: update to 4.2.0 and add opencv_contrib. [ci skip] --- common/shlibs | 64 ++++++++++++++++++++++++++++++----------- srcpkgs/opencv/template | 23 +++++++++------ 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/common/shlibs b/common/shlibs index 889115c8112..31986baac36 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1975,23 +1975,53 @@ libcapstone.so.4 capstone-4.0_1 libhavege.so.1 libhaveged-1.9.1_1 libnih.so.1 libnih-1.0.3_1 libnih-dbus.so.1 libnih-1.0.3_1 -libopencv_ml.so.3.4 libopencv-3.4.1_1 -libopencv_objdetect.so.3.4 libopencv-3.4.1_1 -libopencv_dnn.so.3.4 libopencv-3.4.1_1 -libopencv_shape.so.3.4 libopencv-3.4.1_1 -libopencv_stitching.so.3.4 libopencv-3.4.1_1 -libopencv_photo.so.3.4 libopencv-3.4.1_1 -libopencv_video.so.3.4 libopencv-3.4.1_1 -libopencv_calib3d.so.3.4 libopencv-3.4.1_1 -libopencv_features2d.so.3.4 libopencv-3.4.1_1 -libopencv_flann.so.3.4 libopencv-3.4.1_1 -libopencv_highgui.so.3.4 libopencv-3.4.1_1 -libopencv_videoio.so.3.4 libopencv-3.4.1_1 -libopencv_imgcodecs.so.3.4 libopencv-3.4.1_1 -libopencv_imgproc.so.3.4 libopencv-3.4.1_1 -libopencv_core.so.3.4 libopencv-3.4.1_1 -libopencv_superres.so.3.4 libopencv-3.4.1_1 -libopencv_videostab.so.3.4 libopencv-3.4.1_1 +libopencv_quality.so.4.2 libopencv-4.2.0_1 +libopencv_reg.so.4.2 libopencv-4.2.0_1 +libopencv_surface_matching.so.4.2 libopencv-4.2.0_1 +libopencv_xphoto.so.4.2 libopencv-4.2.0_1 +libopencv_freetype.so.4.2 libopencv-4.2.0_1 +libopencv_fuzzy.so.4.2 libopencv-4.2.0_1 +libopencv_hfs.so.4.2 libopencv-4.2.0_1 +libopencv_img_hash.so.4.2 libopencv-4.2.0_1 +libopencv_line_descriptor.so.4.2 libopencv-4.2.0_1 +libopencv_saliency.so.4.2 libopencv-4.2.0_1 +libopencv_structured_light.so.4.2 libopencv-4.2.0_1 +libopencv_aruco.so.4.2 libopencv-4.2.0_1 +libopencv_bgsegm.so.4.2 libopencv-4.2.0_1 +libopencv_bioinspired.so.4.2 libopencv-4.2.0_1 +libopencv_ccalib.so.4.2 libopencv-4.2.0_1 +libopencv_face.so.4.2 libopencv-4.2.0_1 +libopencv_tracking.so.4.2 libopencv-4.2.0_1 +libopencv_xfeatures2d.so.4.2 libopencv-4.2.0_1 +libopencv_optflow.so.4.2 libopencv-4.2.0_1 +libopencv_ximgproc.so.4.2 libopencv-4.2.0_1 +libopencv_plot.so.4.2 libopencv-4.2.0_1 +libopencv_text.so.4.2 libopencv-4.2.0_1 +libopencv_ml.so.4.2 libopencv-4.2.0_1 +libopencv_objdetect.so.4.2 libopencv-4.2.0_1 +libopencv_dnn.so.4.2 libopencv-4.2.0_1 +libopencv_shape.so.4.2 libopencv-4.2.0_1 +libopencv_stitching.so.4.2 libopencv-4.2.0_1 +libopencv_photo.so.4.2 libopencv-4.2.0_1 +libopencv_video.so.4.2 libopencv-4.2.0_1 +libopencv_calib3d.so.4.2 libopencv-4.2.0_1 +libopencv_features2d.so.4.2 libopencv-4.2.0_1 +libopencv_flann.so.4.2 libopencv-4.2.0_1 +libopencv_highgui.so.4.2 libopencv-4.2.0_1 +libopencv_videoio.so.4.2 libopencv-4.2.0_1 +libopencv_imgcodecs.so.4.2 libopencv-4.2.0_1 +libopencv_imgproc.so.4.2 libopencv-4.2.0_1 +libopencv_core.so.4.2 libopencv-4.2.0_1 +libopencv_superres.so.4.2 libopencv-4.2.0_1 +libopencv_videostab.so.4.2 libopencv-4.2.0_1 +libopencv_gapi.so.4.2 libopencv-4.2.0_1 +libopencv_xobjdetect.so.4.2 libopencv-4.2.0_1 +libopencv_datasets.so.4.2 libopencv-4.2.0_1 +libopencv_dnn_objdetect.so.4.2 libopencv-4.2.0_1 +libopencv_dnn_superres.so.4.2 libopencv-4.2.0_1 +libopencv_dpm.so.4.2 libopencv-4.2.0_1 +libopencv_phase_unwrapping.so.4.2 libopencv-4.2.0_1 +libopencv_stereo.so.4.2 libopencv-4.2.0_1 libcgmanager.so.0 libcgmanager-0.33_1 libuniconf.so.4.6 wvstreams-4.6.1_2 libwvbase.so.4.6 wvstreams-4.6.1_1 diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index fc6e169b413..0d8a0d5fcf7 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,22 +1,27 @@ # Template file for 'opencv' pkgname=opencv -version=3.4.8 -revision=3 +version=4.2.0 +revision=1 build_style=cmake -configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON - -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON +configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON + -DOPENCV_GENERATE_PKGCONFIG=YES + -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON -DOPENCV_PYTHON3_INSTALL_PATH=${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib}" + -DOPENCV_PYTHON_INSTALL_PATH=${py2_sitelib} + -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules + -DBUILD_opencv_rgbd=OFF" hostmakedepends="pkg-config eigen" makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel libgphoto2-devel gst-plugins-base1-devel openblas-devel" short_desc="Computer vision and machine learning software library" -maintainer="Orphaned " +maintainer="Hazel Levine " license="BSD-3-Clause" homepage="https://opencv.org" -distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" -checksum=f0901648a1db3dc3af30e65082665921dbe998673137380450bdd91e8251b567 +distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz + https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" +checksum="9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec + 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020" case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) makedepends+=" libatomic-devel";; @@ -40,7 +45,7 @@ libopencv-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/share/OpenCV + vmove usr/share/opencv4 } } From 13be0816db242078100ef2abe7c54a429843194a Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sun, 19 Jan 2020 15:53:26 -0500 Subject: [PATCH 2/6] actiona: patch for opencv 4.x --- srcpkgs/actiona/patches/opencv4-compat.patch | 86 ++++++++++++++++++++ srcpkgs/actiona/template | 2 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/actiona/patches/opencv4-compat.patch diff --git a/srcpkgs/actiona/patches/opencv4-compat.patch b/srcpkgs/actiona/patches/opencv4-compat.patch new file mode 100644 index 00000000000..35166f88859 --- /dev/null +++ b/srcpkgs/actiona/patches/opencv4-compat.patch @@ -0,0 +1,86 @@ +--- actiona.pro 2018-07-17 14:29:12.000000000 -0400 ++++ actiona.pro 2020-01-21 16:25:05.202902174 -0500 +@@ -11,7 +11,7 @@ + !system(pkg-config --exists 'xtst') { + error(Please install libxtst-dev) + } +- !system(pkg-config --exists 'opencv') { ++ !system(pkg-config --exists 'opencv4') { + error(Please install libopencv-dev) + } + } +--- actiontools/actiontools.pro 2018-07-17 14:29:12.000000000 -0400 ++++ actiontools/actiontools.pro 2020-01-21 16:25:34.842901171 -0500 +@@ -6,7 +6,7 @@ + TEMPLATE = lib + CONFIG += dll + unix:CONFIG += link_pkgconfig +-unix:PKGCONFIG += opencv ++unix:PKGCONFIG += opencv4 + DEFINES += ACTIONTOOLS_LIBRARY + TARGET = actiontools + DESTDIR = .. +--- actiontools/opencvalgorithms.cpp 2018-07-17 14:29:12.000000000 -0400 ++++ actiontools/opencvalgorithms.cpp 2020-01-21 16:27:45.586896745 -0500 +@@ -350,7 +350,7 @@ + + #if CV_MAJOR_VERSION == 2 + const Mat &matImage = image; +-#elif CV_MAJOR_VERSION == 3 ++#elif CV_MAJOR_VERSION >= 3 + cv::Mat matImage = image.getMat(cv::ACCESS_READ); + #endif + +@@ -394,7 +394,7 @@ + { + #if CV_MAJOR_VERSION == 2 + const cv::Mat &matImage = image; +-#elif CV_MAJOR_VERSION == 3 ++#elif CV_MAJOR_VERSION >= 3 + cv::Mat matImage = image.getMat(cv::ACCESS_READ); + #endif + +@@ -411,7 +411,7 @@ + + #if CV_MAJOR_VERSION == 2 + return back; +-#elif CV_MAJOR_VERSION == 3 ++#elif CV_MAJOR_VERSION >= 3 + return back.getUMat(cv::ACCESS_RW); + #endif + } +@@ -420,6 +420,7 @@ + { + switch(method) + { ++#if CV_MAJOR_VERSION < 4 + default: + case ActionTools::OpenCVAlgorithms::CorrelationCoefficientMethod: + return CV_TM_CCOEFF_NORMED; +@@ -427,6 +428,15 @@ + return CV_TM_CCORR_NORMED; + case ActionTools::OpenCVAlgorithms::SquaredDifferenceMethod: + return CV_TM_SQDIFF_NORMED; ++#else ++ default: ++ case ActionTools::OpenCVAlgorithms::CorrelationCoefficientMethod: ++ return cv::TM_CCOEFF_NORMED; ++ case ActionTools::OpenCVAlgorithms::CrossCorrelationMethod: ++ return cv::TM_CCORR_NORMED; ++ case ActionTools::OpenCVAlgorithms::SquaredDifferenceMethod: ++ return cv::TM_SQDIFF_NORMED; ++#endif + } + } + } +--- actiontools/opencvalgorithms_private.h 2018-07-17 14:29:12.000000000 -0400 ++++ actiontools/opencvalgorithms_private.h 2020-01-21 16:28:03.656896134 -0500 +@@ -33,7 +33,7 @@ + } + + using Mat = cv::Mat; +-#elif CV_MAJOR_VERSION == 3 ++#elif CV_MAJOR_VERSION >= 3 + namespace cv + { + class UMat; diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template index e90d9c6e013..035be1f3366 100644 --- a/srcpkgs/actiona/template +++ b/srcpkgs/actiona/template @@ -1,7 +1,7 @@ # Template file for 'actiona' pkgname=actiona version=3.10.0 -revision=1 +revision=2 build_style=qmake hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake" makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel From 9ba351124a822c41205e2f90b10c0226322758e9 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sun, 19 Jan 2020 15:53:53 -0500 Subject: [PATCH 3/6] digikam: bump revision for opencv 4.2.0 --- srcpkgs/digikam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index fa581ed3b74..47da2c674da 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam version=6.4.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config bison flex" makedepends="qt5-devel libjpeg-turbo-devel qt5-plugin-mysql qt5-plugin-odbc From 1bd457a74f4e9eae396fb5f7490216d2592b81c7 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sun, 19 Jan 2020 15:54:17 -0500 Subject: [PATCH 4/6] gmic: bump revision for opencv 4.2.0 --- srcpkgs/gmic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 58498e25ea0..8170219885d 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,7 +1,7 @@ # Template file for 'gmic' pkgname=gmic version=2.8.0 -revision=1 +revision=2 build_wrksrc="src" build_style=gnu-makefile hostmakedepends="pkg-config gimp" From d8aa8ea9004162764ad0b2c5a8549eb928a3c115 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sun, 19 Jan 2020 15:54:36 -0500 Subject: [PATCH 5/6] nomacs: bump revision for opencv 4.2.0 --- srcpkgs/nomacs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 7f825a118c7..8af0362de89 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,7 +1,7 @@ # Template file for 'nomacs' pkgname=nomacs version=3.12 -revision=3 +revision=4 build_wrksrc=ImageLounge build_style=cmake configure_args="-DENABLE_TRANSLATIONS=1 -DUSE_SYSTEM_QUAZIP=1" From 973f9bda2bc8f9885746d00013db1316b2369a69 Mon Sep 17 00:00:00 2001 From: Hazel Levine Date: Sun, 19 Jan 2020 15:54:52 -0500 Subject: [PATCH 6/6] waifu2x-converter-cpp: bump revision for opencv 4.2.0 [ci skip] --- srcpkgs/waifu2x-converter-cpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template index 70d4a134836..20bb49fdf5f 100644 --- a/srcpkgs/waifu2x-converter-cpp/template +++ b/srcpkgs/waifu2x-converter-cpp/template @@ -1,7 +1,7 @@ # Template file for 'waifu2x-converter-cpp' pkgname=waifu2x-converter-cpp version=5.2.4 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_MODELS=ON" hostmakedepends="pkg-config"