pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 726779 from home:mkittler:branches:science

Browse Source 
This include pkg-config file in opencv-devel package. The problem with wrong include and linker search paths mentioned in the previous SR has been fixed.

OBS-URL: https://build.opensuse.org/request/show/726779
OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=4
This commit is contained in:
Stefan Brüns 2019-08-28 16:57:07 +00:00 committed by Git OBS Bridge
parent c69fdc3a1b
commit aaeb4778a3
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opencv-includedir.patch Normal file
View File

@ -0,0 +1,9 @@
diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in
--- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in 2018-12-22 07:03:30.000000000 +0000
+++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in 2019-02-07 15:08:15.016613349 +0000
@@ -11,4 +10,4 @@
Version: @OPENCV_VERSION_PLAIN@
Libs: @OPENCV_PC_LIBS@
Libs.private: @OPENCV_PC_LIBS_PRIVATE@
-Cflags: -I${includedir_old} -I${includedir_new}
+Cflags: -I${includedir_new}

5
opencv.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 28 15:05:46 UTC 2019 - Marius Kittler <marius.kittler@suse.com>
- Include pkg-config file in opencv-devel package
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 19 11:13:05 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de> Mon Aug 19 11:13:05 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de>

7
opencv.spec
View File

@ -49,6 +49,8 @@ Patch0: opencv-gles.patch
Patch1: opencv-build-compare.patch Patch1: opencv-build-compare.patch
# PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types, https://github.com/opencv/opencv/issues/9171 # PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types, https://github.com/opencv/opencv/issues/9171
Patch2: 0001-Do-not-include-glx.h-when-using-GLES.patch Patch2: 0001-Do-not-include-glx.h-when-using-GLES.patch
# PATCH-FIX-OPENSUSE opencv-includedir.patch -- Fix wrong include path in pkgconfig file
Patch3: opencv-includedir.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libeigen3-devel BuildRequires: libeigen3-devel
@ -199,6 +201,7 @@ rm -f doc/packaging.txt
%endif %endif
-DOPENCV_INCLUDE_INSTALL_PATH=%{_includedir} \ -DOPENCV_INCLUDE_INSTALL_PATH=%{_includedir} \
-DOPENCV_LICENSES_INSTALL_PATH=%{_licensedir}/%{name} \ -DOPENCV_LICENSES_INSTALL_PATH=%{_licensedir}/%{name} \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DINSTALL_C_EXAMPLES=ON \ -DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \
-DENABLE_OMIT_FRAME_POINTER=OFF \ -DENABLE_OMIT_FRAME_POINTER=OFF \
@ -258,6 +261,9 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
# Remove LD_LIBRARY_PATH wrapper script, we install into proper library dirs # Remove LD_LIBRARY_PATH wrapper script, we install into proper library dirs
rm %{buildroot}%{_bindir}/setup_vars_opencv4.sh rm %{buildroot}%{_bindir}/setup_vars_opencv4.sh
# Fix duplicated install prefix in pkg-config file
sed -i -e 's|//usr||g' %{buildroot}%{_libdir}/pkgconfig/opencv4.pc
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
%fdupes -s %{buildroot}%{_includedir} %fdupes -s %{buildroot}%{_includedir}
@ -303,6 +309,7 @@ rm %{buildroot}%{_bindir}/setup_vars_opencv4.sh
%license LICENSE LICENSE.contrib %license LICENSE LICENSE.contrib
%{_includedir}/opencv2/ %{_includedir}/opencv2/
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/opencv4.pc
%dir %{_libdir}/cmake/opencv4 %dir %{_libdir}/cmake/opencv4
%{_libdir}/cmake/opencv4/OpenCVConfig*.cmake %{_libdir}/cmake/opencv4/OpenCVConfig*.cmake
%{_libdir}/cmake/opencv4/OpenCVModules*.cmake %{_libdir}/cmake/opencv4/OpenCVModules*.cmake