import opencv-3.4.6-5.el8
This commit is contained in:
CentOS Sources
parent
66881c5db3
commit
8d2a242a60
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/opencv-clean-3.4.1.tar.gz
|
||||
SOURCES/opencv_contrib-clean-3.4.1.tar.gz
|
||||
SOURCES/opencv-clean-3.4.6.tar.gz
|
||||
SOURCES/opencv_contrib-clean-3.4.6.tar.gz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
d1d4a22b40c5399c4ecf35b55b56d0768c1abd09 SOURCES/opencv-clean-3.4.1.tar.gz
|
||||
ce4e9d8ef57c2f77226c357241113589c928c54d SOURCES/opencv_contrib-clean-3.4.1.tar.gz
|
||||
76924263971d8314a4fb8a152cd0c3b3c337ff8f SOURCES/opencv-clean-3.4.6.tar.gz
|
||||
22c33b7cc5f1c17ccefd9f9a2618afc17289c180 SOURCES/opencv_contrib-clean-3.4.6.tar.gz
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- ./CMakeLists.txt.orig 2018-02-27 01:46:32.259819239 +0000
|
||||
+++ ./CMakeLists.txt 2018-02-27 19:48:19.658736383 +0000
|
||||
@@ -439,19 +439,14 @@ else()
|
||||
ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
|
||||
else()
|
||||
include(GNUInstallDirs)
|
||||
- ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
|
||||
+ ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR})
|
||||
ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
||||
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
|
||||
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
|
||||
ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
|
||||
|
||||
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
|
||||
- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
|
||||
- if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
||||
- ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
|
||||
- else()
|
||||
- ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
|
||||
- endif()
|
||||
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/OpenCV)
|
||||
endif()
|
||||
endif()
|
||||
ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include")
|
||||
@ -1,9 +0,0 @@
|
||||
--- ./samples/va_intel/CMakeLists.txt.bak 2018-02-28 01:53:40.199554269 +0000
|
||||
+++ ./samples/va_intel/CMakeLists.txt 2018-02-28 01:54:34.036200492 +0000
|
||||
@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_
|
||||
file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
|
||||
foreach(sample_filename ${all_samples})
|
||||
ocv_define_sample(tgt ${sample_filename} va_intel)
|
||||
- ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
|
||||
+ ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
|
||||
endforeach()
|
||||
11
SOURCES/opencv-3.4.6-install_3rdparty_licenses.patch
Normal file
11
SOURCES/opencv-3.4.6-install_3rdparty_licenses.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- ./cmake/OpenCVDetectOpenCL.cmake.orig 2019-05-14 00:35:41.373094435 +0100
|
||||
+++ ./cmake/OpenCVDetectOpenCL.cmake 2019-05-14 00:35:50.833189862 +0100
|
||||
@@ -5,7 +5,7 @@ if(APPLE)
|
||||
else()
|
||||
set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
|
||||
set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
|
||||
- ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
|
||||
+ #ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
|
||||
endif()
|
||||
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#VTK support disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.7.1.1 + Qt4
|
||||
%bcond_with vtk
|
||||
# gdcm, coin-or-Clp and libmfx packages aren't available on RHEL
|
||||
%if 0%{rhel}
|
||||
%if 0%{?rhel}
|
||||
%bcond_with gdcm
|
||||
%bcond_with clp
|
||||
%bcond_with libmfx
|
||||
@ -53,8 +53,8 @@
|
||||
%global optflags %(echo %{optflags} -Wl,--as-needed )
|
||||
|
||||
Name: opencv
|
||||
Version: 3.4.1
|
||||
Release: 9%{?dist}
|
||||
Version: 3.4.6
|
||||
Release: 5%{?dist}
|
||||
Summary: Collection of algorithms for computer vision
|
||||
# This is normal three clause BSD.
|
||||
License: BSD
|
||||
@ -68,8 +68,7 @@ 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.1-cmake_paths.patch
|
||||
Patch2: opencv-3.4.1-cmake_va_intel_fix.patch
|
||||
Patch1: opencv-3.4.6-install_3rdparty_licenses.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: cmake >= 2.6.3
|
||||
BuildRequires: chrpath
|
||||
@ -143,7 +142,8 @@ BuildRequires: lapack-devel
|
||||
%{?with_clp:BuildRequires: coin-or-Clp-devel}
|
||||
%{?with_va:BuildRequires: libva-devel}
|
||||
|
||||
Requires: opencv-core%{_isa} = %{version}-%{release}
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-contrib%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: gcc, gcc-c++
|
||||
|
||||
%description
|
||||
@ -161,8 +161,9 @@ This package contains the OpenCV C/C++ core libraries.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for using the OpenCV library
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Requires: %{name}-contrib%{_isa} = %{version}-%{release}
|
||||
Requires: cmake-filesystem
|
||||
Requires: %{name}-core%{?_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
|
||||
@ -173,7 +174,7 @@ package.
|
||||
|
||||
%package doc
|
||||
Summary: docs files
|
||||
Requires: opencv-devel = %{version}-%{release}
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
Provides: %{name}-devel-docs = %{version}-%{release}
|
||||
Obsoletes: %{name}-devel-docs < %{version}-%{release}
|
||||
@ -182,9 +183,10 @@ Obsoletes: %{name}-devel-docs < %{version}-%{release}
|
||||
This package contains the OpenCV documentation, samples and examples programs.
|
||||
|
||||
|
||||
%package -n python3-opencv
|
||||
%package -n python3-%{name}
|
||||
Summary: Python3 bindings for apps which use OpenCV
|
||||
Requires: opencv%{_isa} = %{version}-%{release}
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-contrib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-numpy
|
||||
%{?python_provide:%python_provide python3-%{srcname}}
|
||||
# Remove before F30
|
||||
@ -192,12 +194,13 @@ Provides: %{name}-python3 = %{version}-%{release}
|
||||
Provides: %{name}-python3%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python3 < %{version}-%{release}
|
||||
|
||||
%description -n python3-opencv
|
||||
%description -n python3-%{name}
|
||||
This package contains Python3 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
|
||||
@ -213,12 +216,11 @@ rm -r 3rdparty/
|
||||
# missing dependecies for dnn module in Fedora (protobuf-cpp)
|
||||
rm -r modules/dnn/
|
||||
|
||||
%patch1 -p1 -b .cmake_paths
|
||||
%patch2 -p1 -b .va_intel
|
||||
%patch1 -p1 -b .install_3rdparty_licenses
|
||||
|
||||
pushd %{name}_contrib-%{version}
|
||||
# missing dependecies for dnn_modern module in Fedora (tiny-dnn)
|
||||
rm -r modules/dnn_modern/
|
||||
#rm -r modules/dnn_modern/
|
||||
popd
|
||||
|
||||
# fix dos end of lines
|
||||
@ -240,7 +242,7 @@ pushd build
|
||||
-DWITH_ITT=OFF \
|
||||
-DWITH_QT=ON \
|
||||
-DWITH_OPENGL=ON \
|
||||
-DWITH_GDAL=ON \
|
||||
-DWITH_GDAL=OFF \
|
||||
-DWITH_UNICAP=ON \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DWITH_CAROTENE=OFF \
|
||||
@ -265,14 +267,17 @@ pushd build
|
||||
-DBUILD_PROTOBUF=OFF \
|
||||
-DBUILD_opencv_python3=ON \
|
||||
-DBUILD_opencv_python2=OFF \
|
||||
-DOPENCV_SKIP_PYTHON_LOADER=ON \
|
||||
-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \
|
||||
-DWITH_LIBV4L=ON \
|
||||
-DWITH_OPENMP=ON \
|
||||
-DENABLE_PKG_CONFIG=OFF \
|
||||
-DOPENCV_GENERATE_SETUPVARS=OFF \
|
||||
-DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
|
||||
%{?with_gdcm: -DWITH_GDCM=ON } \
|
||||
%{?with_libmfx: -DWITH_MFX=ON } \
|
||||
%{?with_clp: -DWITH_CLP=ON } \
|
||||
%{?with_va: -DWITH_VA=ON } \
|
||||
-DWITH_QUIRC=OFF \
|
||||
..
|
||||
|
||||
%make_build VERBOSE=1
|
||||
@ -284,6 +289,7 @@ popd
|
||||
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
||||
%make_install -C build
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/
|
||||
|
||||
%check
|
||||
# Check fails since we don't support most video
|
||||
@ -314,11 +320,11 @@ popd
|
||||
%{_datadir}/OpenCV/valgrind*
|
||||
|
||||
%files core
|
||||
%{_datadir}/licenses/opencv3/
|
||||
%{_libdir}/libopencv_calib3d.so.%{abiver}*
|
||||
%{_libdir}/libopencv_core.so.%{abiver}*
|
||||
%{_libdir}/libopencv_cvv.so.%{abiver}*
|
||||
%{_libdir}/libopencv_features2d.so.%{abiver}*
|
||||
%{_libdir}/libopencv_flann.so.%{abiver}*
|
||||
%{_libdir}/libopencv_hfs.so.%{abiver}*
|
||||
%{_libdir}/libopencv_highgui.so.%{abiver}*
|
||||
%{_libdir}/libopencv_imgcodecs.so.%{abiver}*
|
||||
%{_libdir}/libopencv_imgproc.so.%{abiver}*
|
||||
@ -337,7 +343,7 @@ popd
|
||||
%{_includedir}/opencv2
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/opencv.pc
|
||||
%{_libdir}/OpenCV/*.cmake
|
||||
%{_libdir}/cmake/OpenCV/*.cmake
|
||||
|
||||
%files doc
|
||||
%{_datadir}/OpenCV/samples
|
||||
@ -350,16 +356,16 @@ popd
|
||||
%{_libdir}/libopencv_aruco.so.%{abiver}*
|
||||
%{_libdir}/libopencv_bgsegm.so.%{abiver}*
|
||||
%{_libdir}/libopencv_bioinspired.so.%{abiver}*
|
||||
%{_libdir}/libopencv_calib3d.so.%{abiver}*
|
||||
%{_libdir}/libopencv_ccalib.so.%{abiver}*
|
||||
#Module opencv_datasets disabled because opencv_text dependency can't be resolved!
|
||||
%{_libdir}/libopencv_datasets.so.%%{abiver}*
|
||||
%{_libdir}/libopencv_cvv.so.%{abiver}*
|
||||
%{_libdir}/libopencv_datasets.so.%{abiver}*
|
||||
# Disabled because of missing dependency package in fedora (protobuf-cpp)
|
||||
#{_libdir}/libopencv_dnn.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}*
|
||||
@ -379,6 +385,29 @@ popd
|
||||
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
||||
|
||||
%changelog
|
||||
* Thu Nov 28 2019 Jiri Kucera <jkucera@redhat.com> - 3.4.6-5
|
||||
- Move libopencv_{calib3d,cvv,hfs}.so.* to their proper packages
|
||||
- Fix issues found by rpmdiff
|
||||
Related: #1694647
|
||||
|
||||
* Tue Nov 26 2019 Jiri Kucera <jkucera@redhat.com> - 3.4.6-4
|
||||
- Do not generate setupvars script (introduces multilib regression)
|
||||
Related: #1694647
|
||||
|
||||
* Mon Nov 25 2019 Jiri Kucera <jkucera@redhat.com> - 3.4.6-3
|
||||
- Rebuild to kick on gating
|
||||
Related: #1694647
|
||||
|
||||
* Sun Nov 24 2019 Jiri Kucera <jkucera@redhat.com> - 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
|
||||
|
||||
* Fri Aug 30 2019 Jiri Kucera <jkucera@redhat.com> - 3.4.6-1
|
||||
- rebase to 3.4.6 (#1694647)
|
||||
|
||||
* Tue Jul 24 2018 Josef Ridky <jridky@redhat.com> - 3.4.1-9
|
||||
- remove hdf5 and gtkglext requirements
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user