Compare commits

...

No commits in common. 'i10ce' and 'epel9' have entirely different histories.
i10ce ... epel9

9
.gitignore vendored

@ -1,5 +1,4 @@
SOURCES/wechat-20230712.git3487ef7.tar.gz OpenCV*.tar.*
SOURCES/opencv_contrib-clean-4.10.0.tar.gz opencv*.tar.*
SOURCES/opencv-clean-4.10.0.tar.gz face_landmark_model.dat.xz
SOURCES/face_landmark_model.dat.xz /b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
SOURCES/dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip

@ -1,5 +0,0 @@
5a9c83cb89354b76d5c235f317e842997d7881ec SOURCES/wechat-20230712.git3487ef7.tar.gz
890a3dd10c2326a5919e5268881954fb4b5c6524 SOURCES/opencv_contrib-clean-4.10.0.tar.gz
c13bb70f67e0aa7a773f16faedf35175652674a6 SOURCES/opencv-clean-4.10.0.tar.gz
b3fe7e6db1f8c77a13fbc4b32ac0e90a443f1d57 SOURCES/face_landmark_model.dat.xz
265179756c822ddf1d4769f70ef93ccac61e8644 SOURCES/dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip

@ -0,0 +1,24 @@
diff -up opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in
--- opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig 2019-10-10 00:53:14.000000000 +0200
+++ opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in 2019-10-17 11:08:46.626400320 +0200
@@ -106,7 +106,7 @@ set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
set(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@)
-set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
+set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@ @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@/opencv2)
set(OpenCV_INCLUDE_DIRS "")
foreach(d ${__OpenCV_INCLUDE_DIRS})
diff -up opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig opencv-4.1.2/cmake/templates/opencv-XXX.pc.in
--- opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig 2019-10-10 00:53:14.000000000 +0200
+++ opencv-4.1.2/cmake/templates/opencv-XXX.pc.in 2019-10-17 11:04:11.486014573 +0200
@@ -3,7 +3,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir_old=@includedir@/opencv
+includedir_old=@includedir@/opencv2
includedir_new=@includedir@
Name: OpenCV

@ -0,0 +1,34 @@
#!/bin/bash
VERSION=4.6.0
wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz
wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz
rm -rf opencv-${VERSION}/
tar xf opencv-${VERSION}.tar.gz
find opencv-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
find opencv-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
rm -r opencv-${VERSION}/modules/xfeatures2d/
tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/
rm -r opencv-${VERSION}/
rm -rf opencv_contrib-${VERSION}/
tar xf opencv_contrib-${VERSION}.tar.gz
find opencv_contrib-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
find opencv_contrib-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
rm -r opencv_contrib-${VERSION}/modules/xfeatures2d/
tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/
rm -r opencv_contrib-${VERSION}/
rm -rf opencv_extra-${VERSION}/
tar xf opencv_extra-${VERSION}.tar.gz
find opencv_extra-${VERSION} -iname "*lena*" -exec rm {} ';' -print
find opencv_extra-${VERSION} -iname "*lenna*" -exec rm {} ';' -print
find opencv_extra-${VERSION} \( -iname "len*.*" -o -iname "*lena*.png" -o -iname "*lena*.jpg" \) -exec rm {} ';' -print
tar zcf opencv_extra-clean-${VERSION}.tar.gz opencv_extra-${VERSION}/
rm -r opencv_extra-${VERSION}/
echo fedpkg new-sources $(spectool -l --sources opencv.spec)

@ -1,28 +1,26 @@
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
%bcond_without tests
%bcond_with tests %bcond_without extras
%bcond_without compat_openvc_pc
%if %{without tests}
%bcond_with extras_tests
%else
%bcond_without extras_tests
%endif
# linters are enabled by default if BUILD_DOCS OR BUILD_EXAMPLES # linters are enabled by default if BUILD_DOCS OR BUILD_EXAMPLES
%bcond_with linters %bcond_without linters
%bcond_without ffmpeg %bcond_with ffmpeg
%bcond_without gstreamer %bcond_without gstreamer
%bcond_with eigen2 %bcond_with eigen2
%bcond_without eigen3 %bcond_without eigen3
%bcond_without opencl %bcond_without opencl
%ifarch x86_64 %{arm} %if 0%{?rhel} >= 8
%bcond_with openni
%else
%ifarch %{ix86} x86_64 %{arm}
%bcond_without openni %bcond_without openni
%else %else
# we dont have openni in other archs # we dont have openni in other archs
%bcond_with openni %bcond_with openni
%endif %endif
%endif
%bcond_without tbb %bcond_without tbb
%bcond_with cuda %bcond_with cuda
%bcond_without xine %bcond_with xine
# Atlas need (missing: Atlas_CLAPACK_INCLUDE_DIR Atlas_CBLAS_LIBRARY Atlas_BLAS_LIBRARY Atlas_LAPACK_LIBRARY) # Atlas need (missing: Atlas_CLAPACK_INCLUDE_DIR Atlas_CBLAS_LIBRARY Atlas_BLAS_LIBRARY Atlas_LAPACK_LIBRARY)
# LAPACK may use atlas or openblas since now it detect openblas, atlas is not used anyway, more info please # LAPACK may use atlas or openblas since now it detect openblas, atlas is not used anyway, more info please
# check OpenCVFindLAPACK.cmake # check OpenCVFindLAPACK.cmake
@ -37,6 +35,7 @@
%ifarch x86_64 %ifarch x86_64
%bcond_without libmfx %bcond_without libmfx
%bcond_without va
%else %else
%bcond_with libmfx %bcond_with libmfx
%endif %endif
@ -51,13 +50,6 @@
%bcond_with java %bcond_with java
%endif %endif
%if 0%{?fedora}
%bcond_without openexr
%else
%bcond_with openexr
%endif
%bcond_without va
%bcond_without vulkan %bcond_without vulkan
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
@ -71,7 +63,7 @@
%endif %endif
Name: opencv Name: opencv
Version: 4.10.0 Version: 4.6.0
%global javaver %(foo=%{version}; echo ${foo//./}) %global javaver %(foo=%{version}; echo ${foo//./})
%global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} ) %global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} )
%global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} ) %global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
@ -80,7 +72,7 @@ Version: 4.10.0
Release: 7%{?dist} Release: 7%{?dist}
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
# This is normal three clause BSD. # This is normal three clause BSD.
License: BSD-3-Clause AND Apache-2.0 AND ISC License: BSD
URL: https://opencv.org URL: https://opencv.org
# TO PREPARE TARBALLS FOR FEDORA # TO PREPARE TARBALLS FOR FEDORA
# Edit opencv-clean.sh and set VERSION, save file and run opencv-clean.sh # Edit opencv-clean.sh and set VERSION, save file and run opencv-clean.sh
@ -90,17 +82,13 @@ URL: https://opencv.org
# #
Source0: %{name}-clean-%{version}.tar.gz Source0: %{name}-clean-%{version}.tar.gz
Source1: %{name}_contrib-clean-%{version}.tar.gz Source1: %{name}_contrib-clean-%{version}.tar.gz
%{?with_extras_tests: %{?with_extras:
#Source2: %{name}_extra-clean-%{version}.tar.gz Source2: %{name}_extra-clean-%{version}.tar.gz
} }
Source3: face_landmark_model.dat.xz Source3: face_landmark_model.dat.xz
# SRC=v0.1.2d.zip ; wget https://github.com/opencv/ade/archive/$SRC; mv $SRC $(md5sum $SRC | cut -d' ' -f1)-$SRC # from https://github.com/opencv/ade/archive/v0.1.1f.zip
Source4: dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
Source5: xorg.conf Source5: xorg.conf
%global wechat_commit 3487ef7cde71d93c6a01bb0b84aa0f22c6128f6b
%global wechat_shortcommit %(c=%{wechat_commit}; echo ${c:0:7})
%global wechat_gitdate 20230712
Source6: https://github.com/WeChatCV/opencv_3rdparty/archive/%{wechat_commit}/wechat-%{wechat_gitdate}.git%{wechat_shortcommit}.tar.gz
Patch0: opencv-4.1.0-install_3rdparty_licenses.patch Patch0: opencv-4.1.0-install_3rdparty_licenses.patch
Patch3: opencv.python.patch Patch3: opencv.python.patch
@ -131,14 +119,10 @@ BuildRequires: libpng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libGL-devel BuildRequires: libGL-devel
BuildRequires: libv4l-devel BuildRequires: libv4l-devel
%{?with_openexr:
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
}
%{?with_openni: %{?with_openni:
BuildRequires: openni-devel BuildRequires: openni-devel
%if 0%{?fedora}
BuildRequires: openni-primesense BuildRequires: openni-primesense
%endif
} }
%{?with_tbb: %{?with_tbb:
BuildRequires: tbb-devel BuildRequires: tbb-devel
@ -147,19 +131,12 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-numpy BuildRequires: python3-numpy
BuildRequires: python3-setuptools
%{?with_linters: %{?with_linters:
BuildRequires: pylint BuildRequires: pylint
BuildRequires: python3-flake8 BuildRequires: python3-flake8
} }
BuildRequires: swig >= 1.3.24 BuildRequires: swig >= 1.3.24
%{?with_ffmpeg: %{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libavdevice)
}
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel} %{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel}
%else %else
@ -185,7 +162,7 @@ BuildRequires: hdf5-devel
BuildRequires: openjpeg2-devel BuildRequires: openjpeg2-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
BuildRequires: harfbuzz-devel BuildRequires: harfbuzz-devel
# Module opencv_ovis disabled because of incompatible OGRE3D version < 1.11.5 # Module opencv_ovis disabled because of incompatible OGRE3D version < 1.10
# BuildRequires: ogre-devel # BuildRequires: ogre-devel
%{?with_vtk:BuildRequires: vtk-devel} %{?with_vtk:BuildRequires: vtk-devel}
%{?with_vtk: %{?with_vtk:
@ -208,7 +185,7 @@ BuildRequires: blas-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
} }
%{?with_gdcm:BuildRequires: gdcm-devel} %{?with_gdcm:BuildRequires: gdcm-devel}
%{?with_libmfx:BuildRequires: libvpl-devel} %{?with_libmfx:BuildRequires: libmfx-devel}
%{?with_clp:BuildRequires: coin-or-Clp-devel} %{?with_clp:BuildRequires: coin-or-Clp-devel}
%{?with_va:BuildRequires: libva-devel} %{?with_va:BuildRequires: libva-devel}
%{?with_java: %{?with_java:
@ -216,14 +193,12 @@ BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
} }
%{?with_vulkan:BuildRequires: vulkan-headers} %{?with_vulkan:BuildRequires: vulkan-headers}
#BuildRequires: flatbuffers-devel
%if %{with tests} %if %{with tests}
BuildRequires: xorg-x11-drv-dummy BuildRequires: xorg-x11-drv-dummy
BuildRequires: mesa-dri-drivers BuildRequires: mesa-dri-drivers
%endif %endif
Requires: opencv-core%{_isa} = %{version}-%{release} Requires: opencv-core%{_isa} = %{version}-%{release}
Requires: opencv-data = %{version}-%{release}
%description %description
OpenCV means Intel® Open Source Computer Vision Library. It is a collection of OpenCV means Intel® Open Source Computer Vision Library. It is a collection of
@ -234,120 +209,16 @@ and Computer Vision algorithms.
%package core %package core
Summary: OpenCV core libraries Summary: OpenCV core libraries
Provides: bundled(quirc) = 1.0 Provides: bundled(quirc) = 1.0
Obsoletes: python2-%{name} < %{version} Obsoletes: python2-%{name} < %{version}-%{release}
# any removed modules should be listed here
Obsoletes: %{name}-core < 4.8.0-2
Obsoletes: %{name}-contrib < 4.8.0-2
%description core %description core
This package contains the OpenCV C/C++ core libraries. This package contains the OpenCV C/C++ core libraries.
%package data
Summary: OpenCV data
BuildArch: noarch
%description data
This package contains OpenCV data.
%global opencv_devel_requires %{name}-core%{_isa} = %{version}-%{release}
%define opencv_module_subpkg(m:d:) \
%global opencv_devel_requires %{opencv_devel_requires} %{name}-%{-m*}%{_isa} = %{version}-%{release}\
%define modulename %{-m:%{-m*}}%{!-m:%{error:Module name not defined}}\
%define moduledesc %{-d:%{-d*}}%{!-d:%{-m*}}\
%package %{modulename}\
Summary: OpenCV module: %{moduledesc}\
Requires: %{name}-core%{_isa} = %{version}-%{release}\
\
%description %{modulename}\
This package contains the OpenCV %{moduledesc} module runtime.\
\
%files %{modulename}\
%{_libdir}/libopencv_%{modulename}.so.{%{abiver},%{version}}
# main modules
%opencv_module_subpkg -m calib3d -d %{quote:Camera Calibration and 3D Reconstruction}
%opencv_module_subpkg -m dnn -d %{quote:Deep Neural Network}
%opencv_module_subpkg -m features2d -d %{quote:2D Feature Detection}
%opencv_module_subpkg -m flann -d %{quote:Clustering and Search in Multi-dimensional Space}
%opencv_module_subpkg -m gapi -d %{quote:Graph API}
%opencv_module_subpkg -m highgui -d %{quote:High-level GUI}
%opencv_module_subpkg -m imgcodecs -d %{quote:Image Encoding/Decoding}
%opencv_module_subpkg -m imgproc -d %{quote:Image Processing}
%opencv_module_subpkg -m ml -d %{quote:Machine Learning}
%opencv_module_subpkg -m objdetect -d %{quote:Object Detection}
%opencv_module_subpkg -m photo -d %{quote:Computational Photography}
%opencv_module_subpkg -m stitching -d %{quote:Images stitching}
%opencv_module_subpkg -m video -d %{quote:Video Analysis}
%opencv_module_subpkg -m videoio -d %{quote:Video I/O}
# contrib/extra modules
%opencv_module_subpkg -m alphamat -d %{quote:Alpha Matting}
%opencv_module_subpkg -m aruco -d %{quote:Aruco Markers}
%opencv_module_subpkg -m bgsegm -d %{quote:Background Segmentation}
%opencv_module_subpkg -m bioinspired -d %{quote:Biologically-inspired Vision Models}
%opencv_module_subpkg -m ccalib -d %{quote:Custom Calibration Pattern}
%if %{with cuda}
%opencv_module_subpkg -m cudaarithm -d %{quote:CUDA Matrix Arithmatic}
%opencv_module_subpkg -m cudabgsegm -d %{quote:CUDA Background Segmentation}
%opencv_module_subpkg -m cudacodec -d %{quote:CUDA Video Encoding/Decoding}
%opencv_module_subpkg -m cudafeatures2d -d %{quote:CUDA 2D Feature Detection}
%opencv_module_subpkg -m cudafilters -d %{quote:CUDA Image Filtering}
%opencv_module_subpkg -m cudaimgproc -d %{quote:CUDA Image Processing}
%opencv_module_subpkg -m cudalegacy -d %{quote:CUDA Legacy Support}
%opencv_module_subpkg -m cudaobjdetect -d %{quote:CUDA Object Detection}
%opencv_module_subpkg -m cudaoptflow -d %{quote:CUDA Optical Flow}
%opencv_module_subpkg -m cudastereo -d %{quote:CUDA Stereo Correspondance}
%opencv_module_subpkg -m cudawarping -d %{quote:CUDA Image Warping}
%opencv_module_subpkg -m cudev -d %{quote:CUDA Device Layer}
%endif
%opencv_module_subpkg -m cvv -d %{quote:Interactive Computer Vision Visual Debugging}
%opencv_module_subpkg -m datasets -d %{quote:Datasets Framework}
%opencv_module_subpkg -m dnn_objdetect -d %{quote:Deep Neural Network Object Detection}
%opencv_module_subpkg -m dnn_superres -d %{quote:Deep Neural Network Super Resolution}
%opencv_module_subpkg -m dpm -d %{quote:Deformable Part-based Models}
%opencv_module_subpkg -m face -d %{quote:Face Analysis}
%opencv_module_subpkg -m freetype -d %{quote:Freetype/Harfbuzz UTF-8 Strings}
%opencv_module_subpkg -m fuzzy -d %{quote:Fuzzy Math-based Image Processing}
%opencv_module_subpkg -m hdf -d %{quote:HDF Data Format I/O}
%opencv_module_subpkg -m hfs -d %{quote:Heirarchical Feature Selection}
%opencv_module_subpkg -m img_hash -d %{quote:Image Hashing}
%opencv_module_subpkg -m intensity_transform -d %{quote:Intensity Transformation}
%opencv_module_subpkg -m line_descriptor -d %{quote:Extracted Line Binary Descriptor}
%opencv_module_subpkg -m mcc -d %{quote:Macbeth Chart}
%opencv_module_subpkg -m optflow -d %{quote:Optical Flow Algorithms}
#opencv_module_subpkg -m ovis -d %%{quote:OGRE 3D Visualiser}
%opencv_module_subpkg -m phase_unwrapping -d %{quote:Phase Unwrapping}
%opencv_module_subpkg -m plot -d %{quote:2D Plotting}
%opencv_module_subpkg -m quality -d %{quote:Image Quality Analysis}
%opencv_module_subpkg -m rapid -d %{quote:Silhouette based 3D Object Tracking}
%opencv_module_subpkg -m reg -d %{quote:Image Registration}
%opencv_module_subpkg -m rgbd -d %{quote:RGB-Depth Processing}
%opencv_module_subpkg -m saliency -d %{quote:Saliency}
%opencv_module_subpkg -m shape -d %{quote:Shape Distance and Matching}
%opencv_module_subpkg -m signal -d %{quote:Signal processing algorithms}
%opencv_module_subpkg -m stereo -d %{quote:Stereo Correspondance}
%opencv_module_subpkg -m structured_light -d %{quote:Structed Light}
%opencv_module_subpkg -m superres -d %{quote:Super Resolution}
%opencv_module_subpkg -m surface_matching -d %{quote:Surface Matching}
%opencv_module_subpkg -m text -d %{quote:Text Detection and Recognition}
%opencv_module_subpkg -m tracking -d %{quote:Tracking}
%opencv_module_subpkg -m videostab -d %{quote:Video Stabilization}
%if %{with vtk}
%opencv_module_subpkg -m viz -d %{quote:3D Visualizer}
%endif
%opencv_module_subpkg -m wechat_qrcode -d %{quote:WeChat QR code detector}
%opencv_module_subpkg -m ximgproc -d %{quote:Extended Image Processing}
%opencv_module_subpkg -m xobjdetect -d %{quote:Extended Object Detection}
%opencv_module_subpkg -m xphoto -d %{quote:Extended Photo Processing}
%package devel %package devel
Summary: Development files for using the OpenCV library Summary: Development files for using the OpenCV library
Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-contrib%{_isa} = %{version}-%{release}
Requires: %{opencv_devel_requires}
%description devel %description devel
This package contains the OpenCV C/C++ library and header files, as well as This package contains the OpenCV C/C++ library and header files, as well as
@ -388,21 +259,30 @@ Requires: %{name}-core%{_isa} = %{version}-%{release}
This package contains Java bindings for the OpenCV library. This package contains Java bindings for the OpenCV library.
%prep %package contrib
# autosetup doesn't work with 2 sources Summary: OpenCV contributed functionality
# https://github.com/rpm-software-management/rpm/issues/1204
%setup -q -a1 %{?with_extras_tests:-a2} -a6
%description contrib
This package is intended for development of so-called "extra" modules, contributed
functionality. New modules quite often do not have stable API, and they are not
well-tested. Thus, they shouldn't be released as a part of official OpenCV
distribution, since the library maintains binary compatibility, and tries
to provide decent performance and stability.
%prep
%setup -q -a1 %{?with_extras:-a2}
%if 1
# we don't use pre-built contribs except quirc # we don't use pre-built contribs except quirc
pushd 3rdparty pushd 3rdparty
shopt -s extglob shopt -s extglob
#rm -r !(openexr|openvx|quirc) #rm -r !(openexr|openvx|quirc)
rm -r !(openvx|quirc|flatbuffers) rm -r !(openvx|quirc)
shopt -u extglob shopt -u extglob
popd &>/dev/null popd &>/dev/null
%endif
%patch -P 0 -p1 -b .install_3rdparty_licenses %patch0 -p1 -b .install_3rdparty_licenses
%patch -P 3 -p1 -b .python_install_binary %patch3 -p1 -b .python_install_binary
pushd %{name}_contrib-%{version} pushd %{name}_contrib-%{version}
#patch1 -p1 -b .install_cvv #patch1 -p1 -b .install_cvv
@ -410,20 +290,15 @@ popd
# Install face_landmark_model # Install face_landmark_model
mkdir -p .cache/data mkdir -p .cache/data
install -pm 0644 %{S:3} .cache/data install -pm 0644 %{SOURCE3} .cache/data
pushd .cache/data pushd .cache/data
xz -d face_landmark_model.dat.xz xz -d face_landmark_model.dat.xz
mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat
popd popd
mkdir -p .cache/wechat_qrcode
mv opencv_3rdparty-%{wechat_commit}/detect.caffemodel .cache/wechat_qrcode/238e2b2d6f3c18d6c3a30de0c31e23cf-detect.caffemodel
mv opencv_3rdparty-%{wechat_commit}/detect.prototxt .cache/wechat_qrcode/6fb4976b32695f9f5c6305c19f12537d-detect.prototxt
mv opencv_3rdparty-%{wechat_commit}/sr.caffemodel .cache/wechat_qrcode/cbfcd60361a73beb8c583eea7e8e6664-sr.caffemodel
mv opencv_3rdparty-%{wechat_commit}/sr.prototxt .cache/wechat_qrcode/69db99927a70df953b471daaba03fbef-sr.prototxt
# Install ADE, needed for opencv_gapi # Install ADE, needed for opencv_gapi
mkdir -p .cache/ade mkdir -p .cache/ade
install -pm 0644 %{S:4} .cache/ade/ install -pm 0644 %{SOURCE4} .cache/ade/
%build %build
# enabled by default if libraries are presents at build time: # enabled by default if libraries are presents at build time:
@ -432,9 +307,6 @@ install -pm 0644 %{S:4} .cache/ade/
# disabling IPP because it is closed source library from intel # disabling IPP because it is closed source library from intel
%cmake \ %cmake \
%if 0%{?fedora} > 38
-DCMAKE_CXX_STANDARD=17 \
%endif
-DCV_TRACE=OFF \ -DCV_TRACE=OFF \
-DWITH_IPP=OFF \ -DWITH_IPP=OFF \
-DWITH_ITT=OFF \ -DWITH_ITT=OFF \
@ -445,14 +317,13 @@ install -pm 0644 %{S:4} .cache/ade/
%endif %endif
-DOpenGL_GL_PREFERENCE=GLVND \ -DOpenGL_GL_PREFERENCE=GLVND \
-DWITH_GDAL=ON \ -DWITH_GDAL=ON \
%{?with_openexr: -DWITH_OPENEXR=ON} \ -DWITH_OPENEXR=ON \
%{!?with_openexr: -DWITH_OPENEXR=OFF} \
-DCMAKE_SKIP_RPATH=ON \ -DCMAKE_SKIP_RPATH=ON \
-DWITH_CAROTENE=OFF \ -DWITH_CAROTENE=OFF \
%ifarch x86_64 %{ix86} %ifarch x86_64 %{ix86}
-DCPU_BASELINE=SSE2 \ -DCPU_BASELINE=SSE2 \
%endif %endif
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \
%{?with_java: -DBUILD_opencv_java=ON \ %{?with_java: -DBUILD_opencv_java=ON \
-DOPENCV_JAR_INSTALL_PATH=%{_jnidir} } \ -DOPENCV_JAR_INSTALL_PATH=%{_jnidir} } \
%{!?with_java: -DBUILD_opencv_java=OFF } \ %{!?with_java: -DBUILD_opencv_java=OFF } \
@ -483,16 +354,16 @@ install -pm 0644 %{S:4} .cache/ade/
} \ } \
-DBUILD_PROTOBUF=OFF \ -DBUILD_PROTOBUF=OFF \
-DPROTOBUF_UPDATE_FILES=ON \ -DPROTOBUF_UPDATE_FILES=ON \
%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL -DOPENCV_DNN_OPENCL=ON} \ %{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \
%{!?with_opencl: -DWITH_OPENCL=OFF } \ %{!?with_opencl: -DWITH_OPENCL=OFF } \
-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \ -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \
-DWITH_LIBV4L=ON \ -DWITH_LIBV4L=ON \
-DWITH_OPENMP=ON \ -DWITH_OPENMP=ON \
-DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
-DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_PKGCONFIG=ON \
%{?with_extras_tests: -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata} \ %{?with_extras: -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata} \
%{?with_gdcm: -DWITH_GDCM=ON } \ %{?with_gdcm: -DWITH_GDCM=ON } \
%{?with_libmfx: -DWITH_MFX=ON -DWITH_GAPI_ONEVPL=ON} \ %{?with_libmfx: -DWITH_MFX=ON } \
%{?with_clp: -DWITH_CLP=ON } \ %{?with_clp: -DWITH_CLP=ON } \
%{?with_va: -DWITH_VA=ON } \ %{?with_va: -DWITH_VA=ON } \
%{!?with_vtk: -DWITH_VTK=OFF} \ %{!?with_vtk: -DWITH_VTK=OFF} \
@ -503,8 +374,6 @@ install -pm 0644 %{S:4} .cache/ade/
%install %install
%cmake_install %cmake_install
cd %{__cmake_builddir}/python_loader/
%py3_install -- --install-lib %{python3_sitearch}
rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/ rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/
%if %{with java} %if %{with java}
@ -513,15 +382,18 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
%endif %endif
# For compatibility with existing opencv.pc application # For compatibility with existing opencv.pc application
%{?with_compat_openvc_pc: %{!?without_compat_openvc_pc:
ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc
} }
%check %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
#ifnarch ppc64 #ifnarch ppc64
%if %{with tests} %if %{with tests}
cp %{S:5} %{__cmake_builddir} cp %SOURCE5 .
if [ -x /usr/libexec/Xorg ]; then if [ -x /usr/libexec/Xorg ]; then
Xorg=/usr/libexec/Xorg Xorg=/usr/libexec/Xorg
else else
@ -529,18 +401,20 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
fi fi
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
export DISPLAY=:99 export DISPLAY=:99
export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/%{__cmake_builddir}/lib:$LD_LIBARY_PATH LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH %ctest || :
%ctest || :
%endif %endif
#endif #endif
%ldconfig_scriptlets core
%ldconfig_scriptlets contrib
%ldconfig_scriptlets java
%files %files
%doc README.md %doc README.md
%{_bindir}/opencv_* %{_bindir}/opencv_*
%files data
%license LICENSE
%dir %{_datadir}/opencv4 %dir %{_datadir}/opencv4
%{_datadir}/opencv4/haarcascades %{_datadir}/opencv4/haarcascades
%{_datadir}/opencv4/lbpcascades %{_datadir}/opencv4/lbpcascades
@ -550,13 +424,27 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
%files core %files core
%license LICENSE %license LICENSE
%{_datadir}/licenses/opencv4/ %{_datadir}/licenses/opencv4/
%{_libdir}/libopencv_calib3d.so.{%{abiver},%{version}}
%{_libdir}/libopencv_core.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 %files devel
%dir %{_includedir}/opencv4 %dir %{_includedir}/opencv4
%{_includedir}/opencv4/opencv2 %{_includedir}/opencv4/opencv2
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{?with_compat_openvc_pc: %{!?without_compat_openvc_pc:
%{_libdir}/pkgconfig/opencv.pc %{_libdir}/pkgconfig/opencv.pc
} }
%{_libdir}/pkgconfig/opencv4.pc %{_libdir}/pkgconfig/opencv4.pc
@ -567,7 +455,6 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
%files -n python3-opencv %files -n python3-opencv
%{python3_sitearch}/cv2 %{python3_sitearch}/cv2
%{python3_sitearch}/opencv-*.egg-info
%if %{with java} %if %{with java}
%files java %files java
@ -577,159 +464,56 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
%{_jnidir}/opencv.jar %{_jnidir}/opencv.jar
%endif %endif
%files contrib
%{_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 %changelog
* Sat Dec 21 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 4.10.0-7
- Rebuilt for MSVSphere 10
* Tue Nov 12 2024 Sandro Mani <manisandro@gmail.com> - 4.10.0-7
- Rebuild (tesseract)
* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 4.10.0-6
- Rebuild (gdal)
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 4.10.0-5
- Rebuild for hdf5 1.14.5
* Wed Sep 25 2024 Michel Lind <salimma@fedoraproject.org> - 4.10.0-4
- Rebuild for tesseract-5.4.1-3 (soversion change from 5.4.1 to just 5.4)
* Mon Sep 23 2024 Fabio Valentini <decathorpe@gmail.com> - 4.10.0-3
- Rebuild for ffmpeg 7
* Thu Jul 25 2024 Sérgio Basto <sergio@serjux.com> - 4.10.0-2
- Rebuild for opencv 4.10.0
* Thu Jul 25 2024 Packit <hello@packit.dev> - 4.10.0-1
- Update to version 4.10.0
- Resolves: rhbz#2290312
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jun 13 2024 Sandro Mani <manisandro@gmail.com> - 4.9.0-7
- Rebuild for tesseract-5.4.1
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 4.9.0-6
- Rebuilt for Python 3.13
* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 4.9.0-5
- Rebuild (gdal)
* Tue Apr 23 2024 Josef Ridky <jridky@redhat.com> - 4.9.0-4
- Rebuild for openexr
* Fri Feb 23 2024 Jerry James <loganjerry@gmail.com> - 4.9.0-3
- Rebuild (coin-or-Clp)
- Use uppercase connectives in SPDX expression
* Mon Feb 05 2024 Sérgio Basto <sergio@serjux.com> - 4.9.0-2
- Revert "drop compat symlink to opencv.pc"
* Sun Jan 28 2024 Sérgio Basto <sergio@serjux.com> - 4.9.0-1
- Update opencv to 4.9.0 (#2256160)
- Enable ffmpeg and xine (now they are available on Fedora)
- Really drop compat symlink for includes - rhbz#1830266
Note: conditional builds with underscrore don't have _without option
https://github.com/rpm-software-management/rpm/issues/1929
* Sun Jan 28 2024 Sandro Mani <manisandro@gmail.com> - 4.8.1-8
- Rebuild (tesseract)
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 4.8.1-5
- Rebuilt for TBB 2021.11
* Thu Jan 11 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 4.8.1-4
- Backport support for protobuf v22 and later from opencv 4.9.0
* Thu Nov 16 2023 Sandro Mani <manisandro@gmail.com> - 4.8.1-3
- Rebuild (gdal)
* Sat Oct 07 2023 Sandro Mani <manisandro@gmail.com> - 4.8.1-2
- Rebuild (tesseract)
* Fri Sep 29 2023 Sérgio Basto <sergio@serjux.com> - 4.8.1-1
- Update opencv to 4.8.1
* Thu Sep 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 4.8.0-2
- Separate per-module subpackages (#1878320)
* Mon Aug 07 2023 Sérgio Basto <sergio@serjux.com> - 4.8.0-1
- Update opencv to 4.8.0
- Use bundle flatbuffers, tried build with flatbuffers from system but doesn't build
- Use oneVPL instead libmfx
- Add WeChat QRCode
- https://src.fedoraproject.org/rpms/opencv/pull-request/23 , upgrade C++ standard to C++17 for protobuf v4 (23.x etc.)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jul 19 2023 Josef Ridky <jridky@redhat.com> - 4.7.0-14
- Migrate to SPDX license format
* Fri Jul 14 2023 Sandro Mani <manisandro@gmail.com> - 4.7.0-13
- Rebuild (tesseract)
* Fri Jul 07 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.7.0-12
- Drop openni support on i686 as it is no longer available
* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 4.7.0-11
- Rebuilt for Python 3.12
* Mon Jun 12 2023 Nicolas Chauvet <kwizart@gmail.com> - 4.7.0-10
- Rebuilt for libdc1394
* Mon Jun 12 2023 Nicolas Chauvet <kwizart@gmail.com> - 4.7.0-9
- Upstream commit to fix rhbz#2190013
* Sat May 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-8
- The %%ldconfig_scriptlets macro can be removed on all Fedoras. Possibly also on
EPEL 8. But it is required on EPEL 7.
- Install egg-info in python3_sitearch to stay in same location as the rest of python
* Sat May 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-7
- Install python egg-info
- Fix patch warning
- Obsolete python2 < %{version} (if someone want use an external python2 version}
* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 4.7.0-6
- Rebuild (gdal)
- Disable tests, even only tests, fail to build and generate build.log with millions of logs lines saying:
*** stack smashing detected ***: terminated
cat build.log | grep smashing | wc -l
118308609
- Disable extra tests on builds
* Thu Apr 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-5
- if without tests also disable 500MB of extra tests
* Mon Apr 03 2023 Sandro Mani <manisandro@gmail.com> - 4.7.0-4
- Rebuild (tesseract)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Jan 15 2023 Orion Poplawski <orion@nwra.com> - 4.7.0-2
- Rebuild for vtk 9.2.5
* Fri Jan 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-1
- Update opencv to 4.7.0 (#2157121)
* Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 4.6.0-10
- Rebuild (tesseract)
* Fri Dec 23 2022 Nicolas Chauvet <kwizart@gmail.com> - 4.6.0-9
- Rebuilt for tesseract
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 4.6.0-8
- Rebuild (gdal)
* Wed Sep 28 2022 Tom Rix <trix@redhat.com> - 4.6.0-7 * Wed Sep 28 2022 Tom Rix <trix@redhat.com> - 4.6.0-7
- Remove Unicap - Remove Unicap

@ -0,0 +1,5 @@
SHA512 (opencv-clean-4.6.0.tar.gz) = 73815df0df4b93b3df19d66e0957a781de25c78ee51d0f026129df9302d45b114bf3cd249ed13121c160df7b4c01b9e348fe2ba75949d3e25fe6f6168d2b0576
SHA512 (opencv_contrib-clean-4.6.0.tar.gz) = 8f4a6569671eb161beac6c9bc52f51b3a9e1ac257478477d5238ddcac959612055ab8554a5815f5b55fe8405a34885e63c1c9995468e5641b9d47d1120ef0113
SHA512 (opencv_extra-clean-4.6.0.tar.gz) = 2b576a2ed87e1a41fddb351bbc66fa23397aa6952866aec3d172976d261f035dc0c1f3e7c66e85e0684bb050862c368fe7fdc34804a9c6171cf1b2a96b621a33
SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836
Loading…
Cancel
Save