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

Accepting request 726804 from science

Browse Source 
Add pkgconfig file

OBS-URL: https://build.opensuse.org/request/show/726804
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2019-09-02 10:39:38 +00:00 committed by Git OBS Bridge
commit c6a279d079
3 changed files with 50 additions and 24 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}

56
opencv.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Aug 28 15:05:46 UTC 2019 - Marius Kittler <marius.kittler@suse.com>
- Include pkg-config file in opencv-devel package
* Add opencv-includedir.patch
-------------------------------------------------------------------
Tue Aug 27 10:23:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Avoid use of ®/™ signs in specfiles as per guidelines.
-------------------------------------------------------------------
Mon Aug 19 11:13:05 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de>
@ -92,7 +103,7 @@ Mon Oct 29 10:22:25 UTC 2018 - Christophe Giboudeaux <christophe@krop.fr>
* Compatibility fixes with python 3.7
* Added a new computational target DNN_TARGET_OPENCL_FP16
* Extended support of Intel's Inference Engine backend
* Enabled import of Intel's OpenVINO pre-trained networks from
* Enabled import of Intel's OpenVINO pre-trained networks from
intermediate representation (IR).
* tutorials improvements
Check https://github.com/opencv/opencv/wiki/ChangeLog#version343
@ -203,7 +214,7 @@ Mon Oct 9 05:06:36 UTC 2017 - kah0922@gmail.com
- Update to 3.3
- Dropped obsolete patches
* opencv-gcc6-fix-pch-support-PR8345.patch
* opencv-gles.patch
* opencv-gles.patch
- Updated opencv-build-compare.patch
-------------------------------------------------------------------
@ -314,8 +325,8 @@ Wed Mar 9 18:15:57 UTC 2016 - toddrme2178@gmail.com
Thu Mar 3 21:16:19 UTC 2016 - tittiatcoke@gmail.com
- Added opencv_contrib_face-3.1.0.tar.bz2
* This tarball is created to take only the face module from the
contrib package. The Face module is required by libkface, which
* This tarball is created to take only the face module from the
contrib package. The Face module is required by libkface, which
in its turn is required by digikam.
-------------------------------------------------------------------
@ -340,7 +351,7 @@ Sat Feb 27 11:11:34 UTC 2016 - joerg.lorenzen@ki.tng.de
+ “Real-time Multi-object Tracking using Kernelized Correlation
Filter” – opencv_contrib/tracking module
(Laksono Kurnianggoro, Fernando J. Iglesias Garcia)
+ “Improved and expanded Scene Text Detection” –
+ “Improved and expanded Scene Text Detection” –
opencv_contrib/text module (Lluis Gomez, Vadim Pisarevsky)
+ “Stereo correspondence improvements” – opencv_contrib/stereo
module (Mircea Paul Muresan, Sergei Nosov)
@ -455,7 +466,7 @@ Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
Wed Dec 23 16:51:20 UTC 2015 - alarrosa@suse.com
- Remove BuildRequirement for python-sphinx in SLE12, since it's
not available there and it's not a mandatory requirement.
not available there and it's not a mandatory requirement.
-------------------------------------------------------------------
Wed Dec 2 09:17:09 UTC 2015 - ohering@suse.de
@ -500,7 +511,7 @@ Wed Apr 29 09:35:29 UTC 2015 - coolo@suse.com
-------------------------------------------------------------------
Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke@gmail.com
- Add specific buildrequires for libpng15, so that we are
- Add specific buildrequires for libpng15, so that we are
building against the system provided libpng.
-------------------------------------------------------------------
@ -521,9 +532,9 @@ Tue May 13 14:56:21 EEST 2014 - koprok@gmail.com
-------------------------------------------------------------------
Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke@gmail.com
- Drop the BuildRequires on libucil and libunicap for Factory. This
- Drop the BuildRequires on libucil and libunicap for Factory. This
stops us from getting ride of Gstreamer 0.10 and besides these two
libraries seem to be unmaintained upstream as that the latest
libraries seem to be unmaintained upstream as that the latest
actions are from 2010
-------------------------------------------------------------------
@ -531,7 +542,7 @@ Thu Apr 3 11:22:56 UTC 2014 - tittiatcoke@gmail.com
- Add upstream patch (3.0 version) to support Gstreamer 1.x
* bomb_commit_gstreamer-1x-support.patch
-------------------------------------------------------------------
Thu Mar 13 07:50:56 UTC 2014 - tchvatal@suse.com
@ -564,7 +575,7 @@ Sun Jan 19 15:57:26 EET 2014 - koprok@gmail.com
Thu Jan 16 17:11:21 UTC 2014 - dvlaeev@suse.com
- Fix build with altivec:
opencv-altivec-vector.patch
opencv-altivec-vector.patch
-------------------------------------------------------------------
Sun Dec 1 17:37:36 UTC 2013 - hrvoje.senjan@gmail.com
@ -579,11 +590,11 @@ Tue Nov 12 23:07:23 UTC 2013 - hrvoje.senjan@gmail.com
More info at:
http://opencv.org/opencv-2-4-7-is-out.html
The brief list of changes:
* dynamic OpenCL runtime loading, setting default OpenCL device
* dynamic OpenCL runtime loading, setting default OpenCL device
via env var, many bug-fixes and some new optimization with OpenCL
* bug-fixes and new optimizations in CUDA stuff
* latest NDK and Android OS support, Native Android Camera tuning
* minor fixes, XAML sample and MS Certification compatibility
* minor fixes, XAML sample and MS Certification compatibility
in WinRT stuff
* 382 pull requests have been merged
* 54 reported bugs have been fixed
@ -595,7 +606,7 @@ Tue Nov 12 23:07:23 UTC 2013 - hrvoje.senjan@gmail.com
-------------------------------------------------------------------
Sun Nov 10 09:42:16 UTC 2013 - tittiatcoke@gmail.com
- Add patch assume-Sphinx-is-there.diff to fix building with
- Add patch assume-Sphinx-is-there.diff to fix building with
Sphinx versions that have alphanumeric characters in the version
(Only for factory builds at the moment)
@ -631,7 +642,7 @@ Fri Jul 12 11:22:31 EEST 2013 - koprok@nand.bg
-------------------------------------------------------------------
Wed Jun 26 20:26:48 UTC 2013 - crrodriguez@opensuse.org
- build with LFS_CFLAGS in 32 bit archs.
- build with LFS_CFLAGS in 32 bit archs.
-------------------------------------------------------------------
Fri May 10 09:59:31 UTC 2013 - hrvoje.senjan@gmail.com
@ -763,7 +774,7 @@ Tue Jan 10 04:24:32 UTC 2012 - crrodriguez@opensuse.org
-------------------------------------------------------------------
Sat Dec 31 14:21:49 UTC 2011 - idonmez@suse.com
- Add upstream r6881 to fix clang compatibility
- Add upstream r6881 to fix clang compatibility
-------------------------------------------------------------------
Tue Oct 18 08:19:10 UTC 2011 - coolo@suse.com
@ -839,7 +850,7 @@ Wed Aug 3 00:36:36 EEST 2011 - koprok@nand.bg
-------------------------------------------------------------------
Wed Jul 6 08:23:04 UTC 2011 - idonmez@novell.com
- Add opencv-v4l-2.6.38.patch: use the new libv4l2 interface
- Add opencv-v4l-2.6.38.patch: use the new libv4l2 interface
-------------------------------------------------------------------
Mon Dec 27 16:56:15 EET 2010 - koprok@nand.bg
@ -859,7 +870,7 @@ Thu Dec 23 16:08:46 EET 2010 - koprok@nand.bg
Sun Dec 12 13:39:48 UTC 2010 - cristian.rodriguez@opensuse.org
- Use system zlib, oh, and do not export ZLIB symbols to
other applications, clashes ensued.
other applications, clashes ensued.
-------------------------------------------------------------------
Thu Nov 11 15:50:25 CET 2010 - dmueller@suse.de
@ -905,16 +916,16 @@ Thu Apr 15 14:26:49 EEST 2010 - koprok@nand.bg
Tue Apr 13 19:54:42 EEST 2010 - koprok@nand.bg
- Update to OpenCV 2.1.0:
* The whole OpenCV is now using exceptions instead of the old
* The whole OpenCV is now using exceptions instead of the old
libc-style mechanism
* Experimental "static" OpenCV configuration in CMake was
* Experimental "static" OpenCV configuration in CMake was
contributed by Jose Luis Blanco.
Pass "BUILD_SHARED_LIBS=OFF" to CMake to build OpenCV statically.
* new improved version of one-way descriptor is added
* User can now control the image areas visible after the stereo
* User can now control the image areas visible after the stereo
rectification
* Fullscreen has been added (thanks to Yannick Verdie).
* Further info at:
* Further info at:
http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs
-------------------------------------------------------------------
@ -936,4 +947,3 @@ Sat Jan 16 19:45:04 UTC 2010 - tittiatcoke@gmail.com
Fri Oct 9 19:23:14 UTC 2009 - cmorve69@yahoo.es
- Initial package

9
opencv.spec
View File

@ -49,6 +49,8 @@ Patch0: opencv-gles.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
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: fdupes
BuildRequires: libeigen3-devel
@ -108,7 +110,7 @@ BuildRequires: pkgconfig(libswscale)
%endif
%description
OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C
OpenCV means Intel Open Source Computer Vision Library. It is a collection of C
functions and a few C++ classes that implement some popular Image Processing and
Computer Vision algorithms.
@ -199,6 +201,7 @@ rm -f doc/packaging.txt
%endif
-DOPENCV_INCLUDE_INSTALL_PATH=%{_includedir} \
-DOPENCV_LICENSES_INSTALL_PATH=%{_licensedir}/%{name} \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
-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
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}%{_includedir}
@ -303,6 +309,7 @@ rm %{buildroot}%{_bindir}/setup_vars_opencv4.sh
%license LICENSE LICENSE.contrib
%{_includedir}/opencv2/
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/opencv4.pc
%dir %{_libdir}/cmake/opencv4
%{_libdir}/cmake/opencv4/OpenCVConfig*.cmake
%{_libdir}/cmake/opencv4/OpenCVModules*.cmake