rpms/opencv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cmake file for wrong include dir [release 4.1.2-3mamba;Thu Nov 14 2019]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 08:10:49 +01:00
parent 9b8551755a
commit 4aff41f3d3
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opencv-4.1.2-cmake-includedir.patch Normal file
View File

@ -0,0 +1,11 @@
--- opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig 2019-11-14 20:10:06.372000000 +0100
+++ opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in 2019-11-14 20:10:31.100000000 +0100
@@ -77,7 +77,7 @@
# Extract the directory where *this* file has been installed (determined at cmake run-time)
# Get the absolute path with no ../.. relative marks, to eliminate implicit linker warnings
get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
-get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/@OpenCV_INSTALL_PATH_RELATIVE_CONFIGCMAKE@" REALPATH)
+get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../../" REALPATH)
# Search packages for host system instead of packages for target system.
# in case of cross compilation this macro should be defined by toolchain file

12
opencv.spec
View File

@ -2,7 +2,7 @@
%define javaver %(echo %version | cut -d. -f1-3 | tr -d .) %define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
Name: opencv Name: opencv
Version: 4.1.2 Version: 4.1.2
Release: 2mamba Release: 3mamba
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
Group: Development/Libraries Group: Development/Libraries
Vendor: openmamba Vendor: openmamba
@ -15,6 +15,7 @@ Patch0: %{name}-2.1.0-libpng14.patch
Patch1: %{name}-2.3.1-arm-build.patch Patch1: %{name}-2.3.1-arm-build.patch
Patch2: opencv-2.4.9-buildfix-x86-asm-constraint.patch Patch2: opencv-2.4.9-buildfix-x86-asm-constraint.patch
Patch3: opencv-2.4.10-i586-inconsistent-constraint-asm.patch Patch3: opencv-2.4.10-i586-inconsistent-constraint-asm.patch
Patch4: opencv-4.1.2-cmake-includedir.patch
License: BSD License: BSD
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -107,6 +108,8 @@ Requires: python-numpy-py36
%description -n python-cv-py36 %description -n python-cv-py36
This package contains Python bindings for the OpenCV library. This package contains Python bindings for the OpenCV library.
%debug_package
%prep %prep
%setup -q -c %setup -q -c
mv opencv-opencv-*/* . mv opencv-opencv-*/* .
@ -115,6 +118,7 @@ mv opencv-opencv-*/* .
%patch2 -p1 %patch2 -p1
%endif %endif
#%patch3 -p1 #%patch3 -p1
%patch4 -p1
%build %build
#-- Interfaces: #-- Interfaces:
@ -137,6 +141,8 @@ mv opencv-opencv-*/* .
-DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -D__STDC_CONSTANT_MACROS" \ -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -D__STDC_CONSTANT_MACROS" \
-DPYTHON3_EXECUTABLE:PATH=%{__python36} \ -DPYTHON3_EXECUTABLE:PATH=%{__python36} \
-DPYTHON3_PACKAGES_PATH:PATH=%{python36_sitelib} \ -DPYTHON3_PACKAGES_PATH:PATH=%{python36_sitelib} \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_ENABLE_NONFREE=ON \
-DLIB_SUFFIX= -DLIB_SUFFIX=
%make_jobs %make_jobs
@ -182,6 +188,7 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc
%{_libdir}/libopencv_*.so %{_libdir}/libopencv_*.so
%dir %{_libdir}/cmake/opencv4 %dir %{_libdir}/cmake/opencv4
%{_libdir}/cmake/opencv4/OpenCV*.cmake %{_libdir}/cmake/opencv4/OpenCV*.cmake
%{_libdir}/pkgconfig/opencv4.pc
%dir %{_datadir}/licenses/opencv4 %dir %{_datadir}/licenses/opencv4
%{_datadir}/licenses/opencv4/* %{_datadir}/licenses/opencv4/*
@ -203,6 +210,9 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc
%endif %endif
%changelog %changelog
* Thu Nov 14 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2-3mamba
- fix cmake file for wrong include dir
* Sat Nov 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2-2mamba * Sat Nov 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2-2mamba
- fix double provide/obsolete for opencv-python - fix double provide/obsolete for opencv-python