From 93d1ef5f521d04bcc05d9ce30a2e210f9230eec4 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 20 Sep 2023 11:24:31 +0300 Subject: [PATCH] import changed/i9/opencv-4.6.0-7.el9 --- .gitignore | 7 +- .opencv.metadata | 7 +- SOURCES/opencv-3.4.6-cvSaveImage.patch | 31 - ...ncv-4.1.0-install_3rdparty_licenses.patch} | 0 SOURCES/opencv.python.patch | 11 + SOURCES/xorg.conf | 98 +++ SPECS/opencv.spec | 822 +++++++++++++----- 7 files changed, 745 insertions(+), 231 deletions(-) delete mode 100644 SOURCES/opencv-3.4.6-cvSaveImage.patch rename SOURCES/{opencv-3.4.6-install_3rdparty_licenses.patch => opencv-4.1.0-install_3rdparty_licenses.patch} (100%) create mode 100644 SOURCES/opencv.python.patch create mode 100644 SOURCES/xorg.conf diff --git a/.gitignore b/.gitignore index 5b46bd8..3562b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -SOURCES/opencv-clean-3.4.6.tar.gz -SOURCES/opencv_contrib-clean-3.4.6.tar.gz +SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip +SOURCES/face_landmark_model.dat.xz +SOURCES/opencv_extra-clean-4.6.0.tar.gz +SOURCES/opencv-clean-4.6.0.tar.gz +SOURCES/opencv_contrib-clean-4.6.0.tar.gz diff --git a/.opencv.metadata b/.opencv.metadata index becc9d3..c4b14d6 100644 --- a/.opencv.metadata +++ b/.opencv.metadata @@ -1,2 +1,5 @@ -76924263971d8314a4fb8a152cd0c3b3c337ff8f SOURCES/opencv-clean-3.4.6.tar.gz -22c33b7cc5f1c17ccefd9f9a2618afc17289c180 SOURCES/opencv_contrib-clean-3.4.6.tar.gz +80d8ee4757cf3dca0e485ce920d181750b410f31 SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip +b3fe7e6db1f8c77a13fbc4b32ac0e90a443f1d57 SOURCES/face_landmark_model.dat.xz +e74b465c1e0e1d40d78cd968d41135e6ff79b7e0 SOURCES/opencv_extra-clean-4.6.0.tar.gz +93dfb2504d4a82d17d8c7037332d265ca330143d SOURCES/opencv-clean-4.6.0.tar.gz +5ce991a17e61c94ec40d5beff27ecaac6ca5df02 SOURCES/opencv_contrib-clean-4.6.0.tar.gz diff --git a/SOURCES/opencv-3.4.6-cvSaveImage.patch b/SOURCES/opencv-3.4.6-cvSaveImage.patch deleted file mode 100644 index 826d4b0..0000000 --- a/SOURCES/opencv-3.4.6-cvSaveImage.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6e1da2ef91907678159d40f600a56094c4d196b9 Mon Sep 17 00:00:00 2001 -From: Zhuo Zhang -Date: Fri, 25 Dec 2020 00:58:16 +0800 -Subject: [PATCH] Merge pull request #19203 from zchrissirhcz:fix-cvSaveImage - -Fix cvSaveImage( ) function bug - -* fix cvSaveImage crash - -* replace emplace_back with {}, no C++11 required - -* fix MacOSX build with vector's push_back ---- - modules/imgcodecs/src/loadsave.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules/imgcodecs/src/loadsave.cpp b/modules/imgcodecs/src/loadsave.cpp -index 4e626cd2165b..44c458c7273c 100644 ---- a/modules/imgcodecs/src/loadsave.cpp -+++ b/modules/imgcodecs/src/loadsave.cpp -@@ -1001,7 +1001,9 @@ cvSaveImage( const char* filename, const CvArr* arr, const int* _params ) - for( ; _params[i] > 0; i += 2 ) - CV_Assert(static_cast(i) < cv::CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons - } -- return cv::imwrite_(filename, cv::cvarrToMat(arr), -+ std::vector img_vec; -+ img_vec.push_back(cv::cvarrToMat(arr)); -+ return cv::imwrite_(filename, img_vec, - i > 0 ? std::vector(_params, _params+i) : std::vector(), - CV_IS_IMAGE(arr) && ((const IplImage*)arr)->origin == IPL_ORIGIN_BL ); - } diff --git a/SOURCES/opencv-3.4.6-install_3rdparty_licenses.patch b/SOURCES/opencv-4.1.0-install_3rdparty_licenses.patch similarity index 100% rename from SOURCES/opencv-3.4.6-install_3rdparty_licenses.patch rename to SOURCES/opencv-4.1.0-install_3rdparty_licenses.patch diff --git a/SOURCES/opencv.python.patch b/SOURCES/opencv.python.patch new file mode 100644 index 0000000..afe9b11 --- /dev/null +++ b/SOURCES/opencv.python.patch @@ -0,0 +1,11 @@ +--- opencv-4.5.5/modules/python/common.cmake.orig 2022-04-11 18:40:18.925266930 +0100 ++++ opencv-4.5.5/modules/python/common.cmake 2022-04-11 18:42:17.753849346 +0100 +@@ -179,7 +179,7 @@ else() + else() + set(__python_binary_subdir "python-${${PYTHON}_VERSION_MAJOR}.${${PYTHON}_VERSION_MINOR}") + endif() +- set(__python_binary_install_path "${OPENCV_PYTHON_INSTALL_PATH}/${__python_loader_subdir}${__python_binary_subdir}") ++ set(__python_binary_install_path "${OPENCV_PYTHON_INSTALL_PATH}/${__python_loader_subdir}") + endif() + + install(TARGETS ${the_module} diff --git a/SOURCES/xorg.conf b/SOURCES/xorg.conf new file mode 100644 index 0000000..8edc240 --- /dev/null +++ b/SOURCES/xorg.conf @@ -0,0 +1,98 @@ +# This xorg configuration file is meant to be used +# to start a dummy X11 server for graphical testing. + +Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" +EndSection + +Section "InputDevice" + Identifier "dummy_mouse" + Option "CorePointer" "true" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "dummy_keyboard" + Option "CoreKeyboard" "true" + Driver "void" +EndSection + +Section "Device" + Identifier "dummy_videocard" + Driver "dummy" + Option "ConstantDPI" "true" + #VideoRam 4096000 + #VideoRam 256000 + VideoRam 192000 +EndSection + +Section "Monitor" + Identifier "dummy_monitor" + HorizSync 5.0 - 1000.0 + VertRefresh 5.0 - 200.0 + #This can be used to get a specific DPI, but only for the default resolution: + #DisplaySize 508 317 + #NOTE: the highest modes will not work without increasing the VideoRam + # for the dummy video card. + Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953 + Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478 + Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602 + Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301 + Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261 + Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135 + Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261 + Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361 + Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261 + Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025 + Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689 + Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151 + Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093 + Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214 + Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135 + Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151 + Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554 + Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681 + Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513 + Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457 + Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261 + Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135 + Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103 + Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261 + Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946 + Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946 + ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803 + Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076 + Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841 + Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807 + Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807 + Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807 + Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076 +EndSection + +Section "Screen" + Identifier "dummy_screen" + Device "dummy_videocard" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 + Depth 24 + #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" + Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" + #Virtual 32000 32000 + #Virtual 16384 8192 + Virtual 8192 4096 + #Virtual 5120 3200 + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "dummy_layout" + Screen "dummy_screen" + InputDevice "dummy_mouse" + InputDevice "dummy_keyboard" +EndSection diff --git a/SPECS/opencv.spec b/SPECS/opencv.spec index 38d7bc3..416e95e 100644 --- a/SPECS/opencv.spec +++ b/SPECS/opencv.spec @@ -1,22 +1,23 @@ -#global indice a -%undefine _strict_symbol_defs_build -%bcond_with tests +%undefine __cmake_in_source_build +%bcond_without tests +%bcond_without extras +# linters are enabled by default if BUILD_DOCS OR BUILD_EXAMPLES +%bcond_without linters %bcond_with ffmpeg %bcond_without gstreamer %bcond_with eigen2 %bcond_without eigen3 -%ifnarch ppc64le %bcond_without opencl +%if 0%{?rhel} >= 8 +%bcond_with openni %else -# https://bugzilla.redhat.com/show_bug.cgi?id=1487174 -%bcond_with opencl -%endif %ifarch %{ix86} x86_64 %{arm} -%bcond_with openni +%bcond_without openni %else # we dont have openni in other archs %bcond_with openni %endif +%endif %bcond_without tbb %bcond_with cuda %bcond_with xine @@ -25,62 +26,88 @@ # check OpenCVFindLAPACK.cmake %bcond_with atlas %bcond_without openblas -#VTK support disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.7.1.1 + Qt4 +%bcond_without gdcm +%if 0%{?rhel} >= 8 %bcond_with vtk -# gdcm, coin-or-Clp and libmfx packages aren't available on RHEL -%if 0%{?rhel} -%bcond_with gdcm -%bcond_with clp -%bcond_with libmfx %else -%ifarch %{ix86} x86_64 +%bcond_without vtk +%endif + +%ifarch x86_64 %bcond_without libmfx +%bcond_without va %else %bcond_with libmfx %endif -%bcond_without gdcm +%if 0%{?rhel} >= 8 +%bcond_with clp +%else %bcond_without clp %endif -%bcond_without va -%undefine _annotated_build -%global srcname opencv -%global abiver 3.4 +%ifarch %{java_arches} +%bcond_without java +%else +%bcond_with java +%endif + +%bcond_without vulkan + +%define _lto_cflags %{nil} -# Required because opencv-core has lot of spurious dependencies -# (despite supposed to be "-core") -# TODO: to be fixed properly upstream -# https://github.com/opencv/opencv/issues/7001 -%global optflags %(echo %{optflags} -Wl,--as-needed ) +# If _cuda_version is unset +%if 0%{!?_cuda_version:1} && 0%{?with_cuda:1} +%global _cuda_version 11.2 +%global _cuda_rpm_version 11-2 +%global _cuda_prefix /usr/local/cuda-%{_cuda_version} +%bcond_without dnn_cuda +%endif Name: opencv -Version: 3.4.6 -Release: 8%{?dist} +Version: 4.6.0 +%global javaver %(foo=%{version}; echo ${foo//./}) +%global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} ) +%global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} ) +%global padding %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} ) +%global abiver %(echo %{majorver}%{padding}%{minorver} ) +Release: 7%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD -URL: http://opencv.org -# RUN opencv-clean.sh TO PREPARE TARBALLS FOR FEDORA +URL: https://opencv.org +# TO PREPARE TARBALLS FOR FEDORA +# Edit opencv-clean.sh and set VERSION, save file and run opencv-clean.sh # -# Need to remove copyrighted lena.jpg images from tarball (rhbz#1295173) -# and SIFT/SURF from tarball, due to legal concerns. +# Need to remove copyrighted lena.jpg images (rhbz#1295173) +# and SIFT/SURF (module xfeatures2d) from tarball, due to legal concerns. # Source0: %{name}-clean-%{version}.tar.gz Source1: %{name}_contrib-clean-%{version}.tar.gz -# fix/simplify cmake config install location (upstreamable) -# https://bugzilla.redhat.com/1031312 -Patch1: opencv-3.4.6-install_3rdparty_licenses.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2104776 -Patch2: opencv-3.4.6-cvSaveImage.patch -BuildRequires: libtool +%{?with_extras: +Source2: %{name}_extra-clean-%{version}.tar.gz +} +Source3: face_landmark_model.dat.xz +# from https://github.com/opencv/ade/archive/v0.1.1f.zip +Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip +Source5: xorg.conf + +Patch0: opencv-4.1.0-install_3rdparty_licenses.patch +Patch3: opencv.python.patch + +BuildRequires: gcc-c++ BuildRequires: cmake >= 2.6.3 BuildRequires: chrpath - +%{?with_cuda: +BuildRequires: cuda-minimal-build-%{?_cuda_rpm_version} +BuildRequires: pkgconfig(cublas-%{?_cuda_version}) +BuildRequires: pkgconfig(cufft-%{?_cuda_version}) +BuildRequires: pkgconfig(nppc-%{?_cuda_version}) +%{?with_dnn_cuda:BuildRequires: libcudnn8-devel} +} %{?with_eigen2:BuildRequires: eigen2-devel} %{?with_eigen3:BuildRequires: eigen3-devel} -BuildRequires: gtk3-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} %ifnarch s390 s390x BuildRequires: libraw1394-devel BuildRequires: libdc1394-devel @@ -92,6 +119,7 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libGL-devel BuildRequires: libv4l-devel +BuildRequires: OpenEXR-devel %{?with_openni: BuildRequires: openni-devel BuildRequires: openni-primesense @@ -99,9 +127,14 @@ BuildRequires: openni-primesense %{?with_tbb: BuildRequires: tbb-devel } -BuildRequires: zlib-devel pkgconfig +BuildRequires: zlib-devel +BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-numpy +%{?with_linters: +BuildRequires: pylint +BuildRequires: python3-flake8 +} BuildRequires: swig >= 1.3.24 %{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -115,22 +148,35 @@ BuildRequires: libgphoto2-devel BuildRequires: libwebp-devel BuildRequires: tesseract-devel BuildRequires: protobuf-devel +BuildRequires: gdal-devel BuildRequires: glog-devel -BuildRequires: doxygen +#BuildRequires: doxygen +BuildRequires: python3-beautifulsoup4 #for doc/doxygen/bib2xhtml.pl -BuildRequires: perl-open +#BuildRequires: perl-open BuildRequires: gflags-devel -BuildRequires: SFML-devel -BuildRequires: libucil-devel BuildRequires: qt5-qtbase-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGL-devel +BuildRequires: libGLU-devel +BuildRequires: hdf5-devel +BuildRequires: openjpeg2-devel +BuildRequires: freetype-devel +BuildRequires: harfbuzz-devel +# Module opencv_ovis disabled because of incompatible OGRE3D version < 1.10 +# BuildRequires: ogre-devel %{?with_vtk:BuildRequires: vtk-devel} +%{?with_vtk: + %{?with_java: +BuildRequires: vtk-java + } +} %{?with_atlas:BuildRequires: atlas-devel} #ceres-solver-devel push eigen3-devel and tbb-devel %{?with_tbb: %{?with_eigen3: -BuildRequires: ceres-solver-devel +# CERES support is disabled. Ceres Solver for reconstruction API is required. +# seems that ceres-solver is only needed for SFM algorithms but SFM algorithms are disabled because needs xfeatures2d +# BuildRequires: ceres-solver-devel } } %{?with_openblas: @@ -142,10 +188,17 @@ BuildRequires: lapack-devel %{?with_libmfx:BuildRequires: libmfx-devel} %{?with_clp:BuildRequires: coin-or-Clp-devel} %{?with_va:BuildRequires: libva-devel} +%{?with_java: +BuildRequires: ant +BuildRequires: java-devel +} +%{?with_vulkan:BuildRequires: vulkan-headers} +%if %{with tests} +BuildRequires: xorg-x11-drv-dummy +BuildRequires: mesa-dri-drivers +%endif -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-contrib%{?_isa} = %{version}-%{release} -BuildRequires: gcc, gcc-c++ +Requires: opencv-core%{_isa} = %{version}-%{release} %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of @@ -155,6 +208,8 @@ and Computer Vision algorithms. %package core Summary: OpenCV core libraries +Provides: bundled(quirc) = 1.0 +Obsoletes: python2-%{name} < %{version}-%{release} %description core This package contains the OpenCV C/C++ core libraries. @@ -162,9 +217,8 @@ This package contains the OpenCV C/C++ core libraries. %package devel Summary: Development files for using the OpenCV library -Requires: cmake-filesystem -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-contrib%{?_isa} = %{version}-%{release} +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: %{name}-contrib%{_isa} = %{version}-%{release} %description devel This package contains the OpenCV C/C++ library and header files, as well as @@ -174,9 +228,10 @@ package. %package doc -Summary: docs files -Requires: %{name}-devel = %{version}-%{release} -BuildArch: noarch +Summary: Documentation files +Requires: opencv-devel = %{version}-%{release} +# Doc dependes on architecture, specifically whether the va_intel sample is installed depends on HAVE_VA +# BuildArch: noarch Provides: %{name}-devel-docs = %{version}-%{release} Obsoletes: %{name}-devel-docs < %{version}-%{release} @@ -184,24 +239,28 @@ Obsoletes: %{name}-devel-docs < %{version}-%{release} This package contains the OpenCV documentation, samples and examples programs. -%package -n python3-%{name} +%package -n python3-opencv Summary: Python3 bindings for apps which use OpenCV -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-contrib%{?_isa} = %{version}-%{release} +Requires: opencv%{_isa} = %{version}-%{release} Requires: python3-numpy -%{?python_provide:%python_provide python3-%{srcname}} -# Remove before F30 -Provides: %{name}-python3 = %{version}-%{release} -Provides: %{name}-python3%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python3 < %{version}-%{release} +%{?%py_provides:%py_provides python3-%{name}} -%description -n python3-%{name} +%description -n python3-opencv This package contains Python3 bindings for the OpenCV library. +%package java +Summary: Java bindings for apps which use OpenCV +Requires: java-headless +Requires: javapackages-filesystem +Requires: %{name}-core%{_isa} = %{version}-%{release} + +%description java +This package contains Java bindings for the OpenCV library. + + %package contrib Summary: OpenCV contributed functionality -Requires: %{name}-core%{?_isa} = %{version}-%{release} %description contrib This package is intended for development of so-called "extra" modules, contributed @@ -211,88 +270,138 @@ distribution, since the library maintains binary compatibility, and tries to provide decent performance and stability. %prep -%setup -q -a1 -# we don't use pre-built contribs -rm -r 3rdparty/ +%setup -q -a1 %{?with_extras:-a2} +%if 1 +# we don't use pre-built contribs except quirc +pushd 3rdparty +shopt -s extglob +#rm -r !(openexr|openvx|quirc) +rm -r !(openvx|quirc) +shopt -u extglob +popd &>/dev/null +%endif -%patch1 -p1 -b .install_3rdparty_licenses -%patch2 -p1 -b .cvSaveImage +%patch0 -p1 -b .install_3rdparty_licenses +%patch3 -p1 -b .python_install_binary + +pushd %{name}_contrib-%{version} +#patch1 -p1 -b .install_cvv +popd + +# Install face_landmark_model +mkdir -p .cache/data +install -pm 0644 %{SOURCE3} .cache/data +pushd .cache/data + xz -d face_landmark_model.dat.xz + mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat +popd + +# Install ADE, needed for opencv_gapi +mkdir -p .cache/ade +install -pm 0644 %{SOURCE4} .cache/ade/ %build -export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 # enabled by default if libraries are presents at build time: # GTK, GSTREAMER, 1394, V4L, eigen3 # non available on Fedora: FFMPEG, XINE -mkdir -p build -pushd build - # disabling IPP because it is closed source library from intel -%cmake CMAKE_VERBOSE=1 \ +%cmake \ + -DCV_TRACE=OFF \ -DWITH_IPP=OFF \ -DWITH_ITT=OFF \ -DWITH_QT=ON \ -DWITH_OPENGL=ON \ - -DWITH_GDAL=OFF \ - -DWITH_UNICAP=ON \ +%if ! %{with tests} + -DBUILD_TESTS=OFF \ +%endif + -DOpenGL_GL_PREFERENCE=GLVND \ + -DWITH_GDAL=ON \ + -DWITH_OPENEXR=ON \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_CAROTENE=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ +%ifarch x86_64 %{ix86} + -DCPU_BASELINE=SSE2 \ +%endif -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ - -DBUILD_opencv_java=OFF \ + %{?with_java: -DBUILD_opencv_java=ON \ + -DOPENCV_JAR_INSTALL_PATH=%{_jnidir} } \ + %{!?with_java: -DBUILD_opencv_java=OFF } \ %{?with_tbb: -DWITH_TBB=ON } \ %{!?with_gstreamer: -DWITH_GSTREAMER=OFF } \ %{!?with_ffmpeg: -DWITH_FFMPEG=OFF } \ %{?with_cuda: \ -DWITH_CUDA=ON \ - -DCUDA_TOOLKIT_ROOT_DIR=%{?_cuda_topdir} \ + -DCUDA_TOOLKIT_ROOT_DIR=%{?_cuda_prefix} \ -DCUDA_VERBOSE_BUILD=ON \ -DCUDA_PROPAGATE_HOST_FLAGS=OFF \ + -DCUDA_NVCC_FLAGS="-Xcompiler -fPIC" \ + %{?with_dnn_cuda:-DOPENCV_DNN_CUDA=ON} \ } \ %{?with_openni: -DWITH_OPENNI=ON } \ %{!?with_xine: -DWITH_XINE=OFF } \ -DBUILD_DOCS=ON \ -DBUILD_EXAMPLES=ON \ + -DBUILD_opencv_python2=OFF \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ + -DPYTHON3_EXECUTABLE=%{__python3} \ + -DPYTHON3_PACKAGES_PATH=%{python3_sitearch} \ + -DOPENCV_GENERATE_SETUPVARS=OFF \ + %{!?with_linters: \ + -DENABLE_PYLINT=OFF \ + -DENABLE_FLAKE8=OFF \ + } \ -DBUILD_PROTOBUF=OFF \ - -DBUILD_opencv_python3=ON \ - -DBUILD_opencv_python2=OFF \ - -DOPENCV_SKIP_PYTHON_LOADER=ON \ - -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \ + -DPROTOBUF_UPDATE_FILES=ON \ +%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \ +%{!?with_opencl: -DWITH_OPENCL=OFF } \ + -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \ -DWITH_LIBV4L=ON \ -DWITH_OPENMP=ON \ - -DOPENCV_GENERATE_SETUPVARS=OFF \ -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ +%{?with_extras: -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata} \ %{?with_gdcm: -DWITH_GDCM=ON } \ %{?with_libmfx: -DWITH_MFX=ON } \ %{?with_clp: -DWITH_CLP=ON } \ %{?with_va: -DWITH_VA=ON } \ - -DWITH_QUIRC=OFF \ - -DWITH_OPENEXR=OFF \ - .. - -%make_build VERBOSE=1 + %{!?with_vtk: -DWITH_VTK=OFF} \ + %{?with_vulkan: -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan } -popd +%cmake_build %install -export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 -%make_install -C build -find %{buildroot} -name '*.la' -delete +%cmake_install + rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/ +%if %{with java} +ln -s -r %{buildroot}%{_jnidir}/libopencv_java%{javaver}.so %{buildroot}%{_jnidir}/libopencv_java.so +ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/opencv.jar +%endif + +# For compatibility with existing opencv.pc application +%{!?without_compat_openvc_pc: + ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc +} + %check # Check fails since we don't support most video # read/write capability and we don't provide a display # ARGS=-V increases output verbosity -# Make test is unavailble as of 2.3.1 #ifnarch ppc64 %if %{with tests} -pushd build - LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH make test ARGS=-V || : -popd + cp %SOURCE5 . + if [ -x /usr/libexec/Xorg ]; then + Xorg=/usr/libexec/Xorg + else + Xorg=/usr/libexec/Xorg.bin + fi + $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & + export DISPLAY=:99 + LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH %ctest || : %endif #endif @@ -301,134 +410,455 @@ popd %ldconfig_scriptlets contrib +%ldconfig_scriptlets java %files %doc README.md -%license LICENSE %{_bindir}/opencv_* -%dir %{_datadir}/OpenCV -%{_datadir}/OpenCV/haarcascades -%{_datadir}/OpenCV/lbpcascades -%{_datadir}/OpenCV/valgrind* +%dir %{_datadir}/opencv4 +%{_datadir}/opencv4/haarcascades +%{_datadir}/opencv4/lbpcascades +%{_datadir}/opencv4/valgrind* +%{_datadir}/opencv4/quality %files core -%{_datadir}/licenses/opencv3/ -%{_libdir}/libopencv_calib3d.so.%{abiver}* -%{_libdir}/libopencv_core.so.%{abiver}* -%{_libdir}/libopencv_dnn.so.%{abiver}* -%{_libdir}/libopencv_features2d.so.%{abiver}* -%{_libdir}/libopencv_flann.so.%{abiver}* -%{_libdir}/libopencv_highgui.so.%{abiver}* -%{_libdir}/libopencv_imgcodecs.so.%{abiver}* -%{_libdir}/libopencv_imgproc.so.%{abiver}* -%{_libdir}/libopencv_ml.so.%{abiver}* -%{_libdir}/libopencv_objdetect.so.%{abiver}* -%{_libdir}/libopencv_photo.so.%{abiver}* -%{_libdir}/libopencv_shape.so.%{abiver}* -%{_libdir}/libopencv_stitching.so.%{abiver}* -%{_libdir}/libopencv_superres.so.%{abiver}* -%{_libdir}/libopencv_video.so.%{abiver}* -%{_libdir}/libopencv_videoio.so.%{abiver}* -%{_libdir}/libopencv_videostab.so.%{abiver}* +%license LICENSE +%{_datadir}/licenses/opencv4/ +%{_libdir}/libopencv_calib3d.so.{%{abiver},%{version}} +%{_libdir}/libopencv_core.so.{%{abiver},%{version}} +%{_libdir}/libopencv_dnn.so.{%{abiver},%{version}} +%{_libdir}/libopencv_features2d.so.{%{abiver},%{version}} +%{_libdir}/libopencv_flann.so.{%{abiver},%{version}} +%{_libdir}/libopencv_gapi.so.{%{abiver},%{version}} +%{_libdir}/libopencv_highgui.so.{%{abiver},%{version}} +%{_libdir}/libopencv_imgcodecs.so.{%{abiver},%{version}} +%{_libdir}/libopencv_imgproc.so.{%{abiver},%{version}} +%{_libdir}/libopencv_ml.so.{%{abiver},%{version}} +%{_libdir}/libopencv_objdetect.so.{%{abiver},%{version}} +%{_libdir}/libopencv_photo.so.{%{abiver},%{version}} +%{_libdir}/libopencv_stitching.so.{%{abiver},%{version}} +%{_libdir}/libopencv_video.so.{%{abiver},%{version}} +%{_libdir}/libopencv_videoio.so.{%{abiver},%{version}} %files devel -%{_includedir}/opencv -%{_includedir}/opencv2 +%dir %{_includedir}/opencv4 +%{_includedir}/opencv4/opencv2 %{_libdir}/lib*.so +%{!?without_compat_openvc_pc: %{_libdir}/pkgconfig/opencv.pc +} +%{_libdir}/pkgconfig/opencv4.pc %{_libdir}/cmake/OpenCV/*.cmake %files doc -%{_datadir}/OpenCV/samples -%{_datadir}/OpenCV/doc +%{_datadir}/opencv4/samples %files -n python3-opencv -%{python3_sitearch}/cv2.cpython-3*.so +%{python3_sitearch}/cv2 + +%if %{with java} +%files java +%{_jnidir}/libopencv_java%{javaver}.so +%{_jnidir}/opencv-%{javaver}.jar +%{_jnidir}/libopencv_java.so +%{_jnidir}/opencv.jar +%endif %files contrib -%{_libdir}/libopencv_aruco.so.%{abiver}* -%{_libdir}/libopencv_bgsegm.so.%{abiver}* -%{_libdir}/libopencv_bioinspired.so.%{abiver}* -%{_libdir}/libopencv_ccalib.so.%{abiver}* -%{_libdir}/libopencv_cvv.so.%{abiver}* -%{_libdir}/libopencv_datasets.so.%{abiver}* -%{_libdir}/libopencv_dnn_objdetect.so.%{abiver}* -%{_libdir}/libopencv_dpm.so.%{abiver}* -%{_libdir}/libopencv_face.so.%{abiver}* -%{_libdir}/libopencv_freetype.so.%{abiver}* -%{_libdir}/libopencv_fuzzy.so.%{abiver}* -%{_libdir}/libopencv_hfs.so.%{abiver}* -%{_libdir}/libopencv_img_hash.so.%{abiver}* -%{_libdir}/libopencv_line_descriptor.so.%{abiver}* -%{_libdir}/libopencv_optflow.so.%{abiver}* -%{_libdir}/libopencv_phase_unwrapping.so.%{abiver}* -%{_libdir}/libopencv_plot.so.%{abiver}* -%{_libdir}/libopencv_reg.so.%{abiver}* -%{_libdir}/libopencv_rgbd.so.%{abiver}* -%{_libdir}/libopencv_saliency.so.%{abiver}* -%{_libdir}/libopencv_stereo.so.%{abiver}* -%{_libdir}/libopencv_structured_light.so.%{abiver}* -%{_libdir}/libopencv_surface_matching.so.%{abiver}* -%{_libdir}/libopencv_text.so.%{abiver}* -%{_libdir}/libopencv_tracking.so.%{abiver}* -%{_libdir}/libopencv_ximgproc.so.%{abiver}* -%{_libdir}/libopencv_xobjdetect.so.%{abiver}* -%{_libdir}/libopencv_xphoto.so.%{abiver}* +%{_libdir}/libopencv_alphamat.so.{%{abiver},%{version}} +%{_libdir}/libopencv_aruco.so.{%{abiver},%{version}} +%{_libdir}/libopencv_bgsegm.so.{%{abiver},%{version}} +%{_libdir}/libopencv_barcode.so.{%{abiver},%{version}} +%{_libdir}/libopencv_bioinspired.so.{%{abiver},%{version}} +%{_libdir}/libopencv_ccalib.so.{%{abiver},%{version}} +%{?with_cuda: +%{_libdir}/libopencv_cuda*.so.{%{abiver},%{version}} +%{_libdir}/libopencv_cudev.so.{%{abiver},%{version}} +} +%{_libdir}/libopencv_cvv.so.{%{abiver},%{version}} +%{_libdir}/libopencv_datasets.so.{%{abiver},%{version}} +%{_libdir}/libopencv_dnn_objdetect.so.{%{abiver},%{version}} +%{_libdir}/libopencv_dnn_superres.so.{%{abiver},%{version}} +%{_libdir}/libopencv_dpm.so.{%{abiver},%{version}} +%{_libdir}/libopencv_face.so.{%{abiver},%{version}} +%{_libdir}/libopencv_freetype.so.{%{abiver},%{version}} +%{_libdir}/libopencv_fuzzy.so.{%{abiver},%{version}} +%{_libdir}/libopencv_hdf.so.{%{abiver},%{version}} +%{_libdir}/libopencv_hfs.so.{%{abiver},%{version}} +%{_libdir}/libopencv_img_hash.so.{%{abiver},%{version}} +%{_libdir}/libopencv_intensity_transform.so.{%{abiver},%{version}} +%{_libdir}/libopencv_line_descriptor.so.{%{abiver},%{version}} +%{_libdir}/libopencv_mcc.so.{%{abiver},%{version}} +%{_libdir}/libopencv_optflow.so.{%{abiver},%{version}} +%{_libdir}/libopencv_phase_unwrapping.so.{%{abiver},%{version}} +%{_libdir}/libopencv_plot.so.{%{abiver},%{version}} +%{_libdir}/libopencv_quality.so.{%{abiver},%{version}} +%{_libdir}/libopencv_rapid.so.{%{abiver},%{version}} +%{_libdir}/libopencv_reg.so.{%{abiver},%{version}} +%{_libdir}/libopencv_rgbd.so.{%{abiver},%{version}} +%{_libdir}/libopencv_saliency.so.{%{abiver},%{version}} +%{_libdir}/libopencv_shape.so.{%{abiver},%{version}} +%{_libdir}/libopencv_stereo.so.{%{abiver},%{version}} +%{_libdir}/libopencv_structured_light.so.{%{abiver},%{version}} +%{_libdir}/libopencv_superres.so.{%{abiver},%{version}} +%{_libdir}/libopencv_surface_matching.so.{%{abiver},%{version}} +%{_libdir}/libopencv_text.so.{%{abiver},%{version}} +%{_libdir}/libopencv_tracking.so.{%{abiver},%{version}} +%{_libdir}/libopencv_videostab.so.{%{abiver},%{version}} +%if %{with vtk} +%{_libdir}/libopencv_viz.so.{%{abiver},%{version}} +%endif +%{_libdir}/libopencv_wechat_qrcode.so.{%{abiver},%{version}} +%{_libdir}/libopencv_ximgproc.so.{%{abiver},%{version}} +%{_libdir}/libopencv_xobjdetect.so.{%{abiver},%{version}} +%{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}} %changelog -* Wed Aug 03 2022 Jiri Kucera - 3.4.6-8 -- Fix cvSaveImage - Resolves: #2104776 +* Wed Sep 20 2023 Arkady L. Shane - 4.6.0-7 +- Rebuilt for MSVSphere 9.2 -* Fri Jan 07 2022 Jiri Kucera - 3.4.6-7 -- Add DNN support - Resolves: #2007780 +* Wed Sep 28 2022 Tom Rix - 4.6.0-7 +- Remove Unicap -* Mon Jan 11 2021 Jiri Kucera - 3.4.6-6 -- Drop OpenEXR dependency - Resolves: #1886310 +* Fri Jul 29 2022 Mamoru TASAKA - 4.6.0-6 +- BR vte-java only on %%java_arches + +* Fri Jul 22 2022 Fedora Release Engineering - 4.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Sandro Mani - 4.6.0-4 +- Rebuild (tesseract) + +* Wed Jul 06 2022 Sérgio Basto - 4.6.0-3 +- (#2104082) only build Java sub package on arches that java is supported + +* Mon Jun 20 2022 Sérgio Basto - 4.6.0-2 +- Rebuilt for Python 3.11 (is just arrived to rawhide) + +* Fri Jun 17 2022 Sérgio Basto - 4.6.0-1 +- Update opencv to 4.6.0 (#2094603) +- Remove hack to keep old so version +- Adapt spec to new so version ${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR_2DIGITS} + and drop OPENCV_VERSION_PATCH + +* Tue Jun 14 2022 Python Maint - 4.5.5-9 +- Rebuilt for Python 3.11 + +* Sat May 21 2022 Sandro Mani - 4.5.5-8 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + +* Sun Mar 20 2022 Sérgio Basto - 4.5.5-7 +- Switch to new Python loader, doesn't fix rhbz #2054951 but can be a step + +* Thu Mar 10 2022 Sandro Mani - 4.5.5-6 +- Rebuild for tesseract 5.1.0 + +* Tue Feb 15 2022 Sérgio Basto - 4.5.5-5 +- The upstream fix https://github.com/opencv/opencv/pull/21614 + and remove the previous workaround + +* Sun Feb 13 2022 Mamoru TASAKA - 4.5.5-4 +- Disable some altivec vectorization optimization on ppc64le (bug 2051193) + +* Sat Feb 05 2022 Jiri Vanek - 4.5.5-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 27 2021 Sérgio Basto - 4.5.5-1 +- Update opencv to 4.5.5 (#2035628) + +* Sun Dec 19 2021 Sandro Mani - 4.5.4-8 +- Rebuild (tesseract) + +* Tue Dec 14 2021 Sandro Mani - 4.5.4-7 +- Rebuild (tesseract) -* Thu Nov 28 2019 Jiri Kucera - 3.4.6-5 -- Move libopencv_{calib3d,cvv,hfs}.so.* to their proper packages -- Fix issues found by rpmdiff - Related: #1694647 +* Mon Nov 22 2021 Orion Poplawski - 4.5.4-6 +- Rebuild for hdf5 1.12.1 -* Tue Nov 26 2019 Jiri Kucera - 3.4.6-4 -- Do not generate setupvars script (introduces multilib regression) - Related: #1694647 +* Thu Nov 11 2021 Sandro Mani - 4.5.4-5 +- Rebuild (gdal) + +* Sat Nov 06 2021 Adrian Reber - 4.5.4-4 +- Rebuilt for protobuf 3.19.0 + +* Fri Nov 05 2021 Adrian Reber - 4.5.4-3 +- Rebuilt for protobuf 3.19.0 + +* Mon Oct 25 2021 Adrian Reber - 4.5.4-2 +- Rebuilt for protobuf 3.18.1 + +* Sun Oct 10 2021 Sérgio Basto - 4.5.4-1 +- Update to 4.5.4 + +* Fri Aug 20 2021 Richard Shaw - 4.5.3-6 +- Rebuild for OpenEXR/Imath 3.1. + +* Tue Aug 10 2021 Orion Poplawski - 4.5.3-5 +- Rebuild for hdf5 1.10.7 + +* Sat Jul 31 2021 Richard Shaw - 4.5.3-4 +- Rebuild for OpenEXR/Imath 3. + +* Thu Jul 22 2021 Fedora Release Engineering - 4.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 Richard Shaw - 4.5.3-2 +- Rebuild for openexr 3. + +* Thu Jul 15 2021 Sérgio Basto - 4.5.3-1 +- Update to 4.5.3 + +* Fri Jun 04 2021 Python Maint - 4.5.2-6 +- Rebuilt for Python 3.10 + +* Fri May 21 2021 Sandro Mani - 4.5.2-5 +- Rebuild (gdal) + +* Thu May 20 2021 Richard Shaw - 4.5.2-4 +- Rebuild for gdal 3.3.0. + +* Fri May 07 2021 Sandro Mani - 4.5.2-3 +- Rebuild (gdal) + +* Thu Apr 29 2021 Sérgio Basto - 4.5.2-2 +- Upstream fixed GCC11 issues, so we can re-enable the tests + +* Sat Apr 03 2021 Nicolas Chauvet - 4.5.2-1 +- Update to 4.5.2 + +* Wed Mar 31 2021 Nicolas Chauvet - 4.5.1-8 +- Disable tests for now + +* Tue Mar 30 2021 Jonathan Wakely - 4.5.1-7 +- Rebuilt for removed libstdc++ symbol (#1937698) + +* Wed Feb 10 2021 Jiri Kucera - 4.5.1-6 +- Fix file lists + Based on comparison of `opencv-4.5.1/modules/` and + `opencv-4.5.1/opencv_contrib-4.5.1/modules/`, move some *.so's between core + and contrib rpms + +* Sun Jan 31 2021 Orion Poplawski - 4.5.1-5 +- Rebuild for VTK 9 + +* Wed Jan 27 2021 Tomas Popela - 4.5.1-4 +- Drop unused BR on SFML and disable VTK support on RHEL 8+ + +* Tue Jan 26 2021 Fedora Release Engineering - 4.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 12 14:20:57 CET 2021 Adrian Reber - 4.5.1-2 +- Rebuilt for protobuf 3.14 + +* Sat Jan 02 2021 Sérgio Basto - 4.5.1-1 +- Update to 4.5.1 + +* Fri Jan 01 2021 Richard Shaw - 4.5.0-4 +- Rebuild for OpenEXR 2.5.3. + +* Sat Dec 5 2020 Jeff Law - 4.5.0-3 +- Fix missing #include for gcc-11 + +* Fri Nov 6 22:47:45 CET 2020 Sandro Mani - 4.5.0-2 +- Rebuild (proj, gdal) + +* Thu Oct 15 2020 Sérgio Basto - 4.5.0-1 +- Update 4.5.0 + +* Wed Oct 07 2020 Sérgio Basto - 4.4.0-1 +- Update 4.4.0 +- opencv_vulkan.patch already applied in upstream + +* Thu Sep 24 2020 Adrian Reber - 4.3.0-9 +- Rebuilt for protobuf 3.13 + +* Fri Jul 24 2020 Nicolas Chauvet - 4.3.0-8 +- Rebuilt +- Fix cmake build +- Disable LTO on ppc64le +- Add undefine __cmake_in_source_build to allow build on Fedora < 33 + +* Sat Jul 11 2020 Jiri Vanek - 4.3.0-7 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Orion Poplawski - 4.3.0-6 +- Rebuild for hdf5 1.10.6 + +* Tue Jun 23 2020 Adrian Reber - 4.3.0-5 +- Rebuilt for protobuf 3.12 + +* Sun Jun 21 2020 Sérgio Basto - 4.3.0-4 +- Readd flake8 build requirement +- Fix build because pangox has been retired for F33 so we need remove the BR + gtkglext +- Also remove all gtk stuff (we have to choose between gtk or qt when build opencv) + https://answers.opencv.org/question/215066/gtk-or-qt-when-build-opencv/ +- Doxygen requires gtk2, disabling for now + +* Sun Jun 14 2020 Adrian Reber +- Rebuilt for protobuf 3.12 + +* Tue Jun 02 2020 Orion Poplawski - 4.3.0-3 +- Run tests + +* Tue Jun 02 2020 Orion Poplawski - 4.3.0-2 +- Add upstream patches for VTK 9.0 support (bz#1840977) + +* Thu May 28 2020 Nicolas Chauvet - 4.3.0-1 +- Update to 4.3.0 + +* Thu May 28 2020 Charalampos Stratakis - 4.2.0-9 +- Remove flake8 build requirement + +* Tue May 26 2020 Miro Hrončok - 4.2.0-8 +- Rebuilt for Python 3.9 + +* Thu May 21 2020 Sandro Mani - 4.2.0-7 +- Rebuild (gdal) + +* Fri May 08 2020 Nicolas Chauvet - 4.2.0-6 +- Drop compat symlink for includes - rhbz#1830266 + +* Thu Mar 26 2020 Nicolas Chauvet - 4.2.0-5 +- Add without_compat_opencv_pc with conditional - rhbz#1816439 + +* Tue Mar 03 2020 Sandro Mani - 4.2.0-4 +- Rebuild (gdal) + +* Wed Jan 29 2020 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 29 2020 Nicolas Chauvet - 4.2.0-2 +- Backport patch for ppc64le + +* Tue Dec 31 2019 Nicolas Chauvet - 4.2.0-1 +- Update to 4.2.0 + +* Sat Dec 28 2019 Sandro Mani - 4.1.2-3 +- Rebuild (tesseract) + +* Thu Dec 19 2019 Orion Poplawski - 4.1.2-2 +- Rebuild for protobuf 3.11 + +* Thu Oct 17 2019 Nicolas Chauvet - 4.1.2-1.1 +- Fix include path +- Drop CPU baseline to SSE2 for x86 +- Add missing directory ownership +- Add symlinks for compatibility with older versions +- Restore deprecated headers for compat + +* Sat Oct 12 2019 Nicolas Chauvet - 4.1.2-1 +- Update to 4.1.2 + +* Fri Sep 13 2019 Nicolas Chauvet - 4.1.1-1 +- Update to 4.1.1 + +* Fri Sep 13 2019 Sérgio Basto - 4.1.0-1 +- Update opencv to 4.1.0 + +* Fri Sep 13 2019 Christopher N. Hesse - 4.1.0-0 +- Enable vulkan compute backend + +* Fri Sep 13 2019 Sérgio Basto - 3.4.6-9 +- Reenable pylint and vtk, they are working now. +* Wed Sep 11 2019 Mamoru TASAKA - 3.4.6-8 +- F-32: remove vtk gcdm dependency for now because they have broken dependency + (bug 1751406) + +* Mon Aug 19 2019 Miro Hrončok - 3.4.6-7 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.4.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jun 27 2019 Jerry James - 3.4.6-5 +- Rebuild for coin-or package updates + +* Tue Jun 25 2019 Sérgio Basto - 3.4.6-4 +- cmake: use relative PATH on OPENCV_CONFIG_INSTALL_PATH, fixes rhbz #1721876 +- cmake: don't set ENABLE_PKG_CONFIG + +* Wed Jun 12 2019 Sérgio Basto - 3.4.6-3 +- Remove Obsoletes/Provides libopencv_java.so and use OPENCV_JAR_INSTALL_PATH + +* Sun Jun 09 2019 Sérgio Basto - 3.4.6-2 +- Fix cmakes location +- add BR: python3-beautifulsoup4 + +* Thu May 23 2019 Sérgio Basto - 3.4.6-1 +- Update to 3.4.6 + +* Mon May 20 2019 Sérgio Basto - 3.4.4-10 +- Try improve Java Bindings + +* Sun May 12 2019 Sérgio Basto - 3.4.4-9 +- Enable Java Bindings (contribution of Ian Wallace) +- Obsoletes python2-opencv to fix upgrade path + +* Wed Apr 10 2019 Richard Shaw - 3.4.4-8 +- Rebuild for OpenEXR 2.3.0. + +* Mon Mar 18 2019 Orion Poplawski +- Rebuild for vtk 8.2 + +* Sun Mar 03 2019 Sérgio Basto - 3.4.4-6 +- Reenable build with gdcm +- Opencl is fixed for ppc64le on F30 + +* Thu Feb 21 2019 Josef Ridky - 3.4.4-5 +- build without gdcm to fix FTBFS in F30+ (#1676289) + +* Fri Feb 01 2019 Fedora Release Engineering - 3.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 15 2019 Miro Hrončok - 3.4.4-3 +- Subpackage python2-opencv has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Mon Dec 03 2018 Sérgio Basto - 3.4.4-2 +- Add the correct and upstreamed fix for support_YV12_too, pull request 13351 + which is merged + +* Sat Dec 01 2018 Sérgio Basto - 3.4.4-1 +- Update to 3.4.4 + +* Wed Nov 21 2018 Igor Gnatenko - 3.4.3-7 +- Rebuild for protobuf 3.6 + +* Tue Nov 13 2018 Sandro Mani - 3.4.3-6 +- Rebuild (tesseract) -* Mon Nov 25 2019 Jiri Kucera - 3.4.6-3 -- Rebuild to kick on gating - Related: #1694647 +* Tue Oct 30 2018 Sérgio Basto - 3.4.3-5 +- Enable vtk should work with vtk-8.1.1 +- Add BR python Flake8 -* Sun Nov 24 2019 Jiri Kucera - 3.4.6-2 -- fix cmakes location -- remove -DENABLE_PKG_CONFIG=OFF (it was neither defined nor used) -- remove confusing comment -- WITH_GDAL=OFF (gdal dependency has been already removed) - Related: #1694647 +* Tue Oct 23 2018 Felix Kaechele - 3.4.3-4 +- enable building of dnn -* Fri Aug 30 2019 Jiri Kucera - 3.4.6-1 -- rebase to 3.4.6 (#1694647) +* Sat Oct 13 2018 Jerry James - 3.4.3-3 +- Rebuild for tbb 2019_U1 -* Tue Jul 24 2018 Josef Ridky - 3.4.1-9 -- remove hdf5 and gtkglext requirements +* Sun Sep 30 2018 Sérgio Basto - 3.4.3-2 +- Use GLVND libraries for OpenGL and GLX, setting OpenGL_GL_PREFERENCE=GLVND -* Mon Jul 09 2018 Josef Ridky - 3.4.1-8 -- remove openni requirement (#1599225) -- update Python requirements +* Wed Sep 26 2018 Sérgio Basto - 3.4.3-1 +- Update to 3.4.3 +- Fix build on arm and s390x -* Fri Jun 15 2018 Josef Ridky - 3.4.1-7 -- remove gdal requirement (#1591419) +* Wed Sep 26 2018 Sérgio Basto - 3.4.2-1 +- Update to 3.4.2 -* Tue Jun 12 2018 Charalampos Stratakis - 3.4.1-6 -- Remove pylint dependency +* Fri Jul 13 2018 Fedora Release Engineering - 3.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Mon May 28 2018 Josef Ridky - 3.4.1-5 -- remove Python2 package (#1567298) +* Wed Jul 11 2018 Sérgio Basto - 3.4.1-5 +- Small fix to build with Pyhton-3.7 -* Thu May 24 2018 Josef Ridky - 3.4.1-4 -- remove requirements of unavailable packages (#1580833) +* Tue Jun 19 2018 Miro Hrončok - 3.4.1-4 +- Rebuilt for Python 3.7 * Mon Mar 26 2018 Iryna Shcherbina - 3.4.1-3 - Update Python 2 dependency declarations to new packaging standards