diff --git a/opencv-qt5-sobump.diff b/opencv-qt5-sobump.diff deleted file mode 100644 index 6c3e399..0000000 --- a/opencv-qt5-sobump.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- opencv-3.1.0.orig/cmake/OpenCVVersion.cmake 2015-12-18 16:02:16.000000000 +0100 -+++ opencv-3.1.0/cmake/OpenCVVersion.cmake 2016-02-27 15:38:45.228901282 +0100 -@@ -1,10 +1,10 @@ - SET(OPENCV_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/modules/core/include/opencv2/core/version.hpp") - file(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_VERSION_[A-Z]+[ ]+" ) - --string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}") --string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}") --string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}") --string(REGEX REPLACE ".+CV_VERSION_STATUS[ ]+\"([^\"]*)\".*" "\\1" OPENCV_VERSION_STATUS "${OPENCV_VERSION_PARTS}") -+set(OPENCV_VERSION_MAJOR 6) -+string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}") -+string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}") -+string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_TWEAK "${OPENCV_VERSION_PARTS}") - - set(OPENCV_VERSION_PLAIN "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}") - diff --git a/opencv-qt5.changes b/opencv-qt5.changes deleted file mode 100644 index e0a23a2..0000000 --- a/opencv-qt5.changes +++ /dev/null @@ -1,694 +0,0 @@ -------------------------------------------------------------------- -Sun May 28 12:32:09 UTC 2017 - stefan.bruens@rwth-aachen.de - -- Update to OpenCV 3.2.0 - - Results from 11 GSoC 2016 projects have been submitted to the library: - + sinusoidal patterns for structured light and phase unwrapping module - [Ambroise Moreau (Delia Passalacqua)] - + DIS optical flow (excellent dense optical flow algorithm that is both - significantly better and significantly faster than Farneback’s algorithm – - our baseline), and learning-based color constancy algorithms implementation - [Alexander Bokov (Maksim Shabunin)] - + CNN based tracking algorithm (GOTURN) [Tyan Vladimir (Antonella Cascitelli)] - + PCAFlow and Global Patch Collider algorithms implementation - [Vladislav Samsonov (Ethan Rublee)] - + Multi-language OpenCV Tutorials in Python, C++ and Java - [João Cartucho (Vincent Rabaud)] - + New camera model and parallel processing for stitching pipeline - [Jiri Horner (Bo Li)] - + Optimizations and improvements of dnn module - [Vitaliy Lyudvichenko (Anatoly Baksheev)] - + Base64 and JSON support for file storage. Use names like - “myfilestorage.xml?base64” when writing file storage to store big chunks of - numerical data in base64-encoded form. [Iric Wu (Vadim Pisarevsky)] - + tiny_dnn improvements and integration - [Edgar Riba (Manuele Tamburrano, Stefano Fabri)] - + Quantization and semantic saliency detection with tiny_dnn - [Yida Wang (Manuele Tamburrano, Stefano Fabri)] - + Word-spotting CNN based algorithm - [Anguelos Nicolaou (Lluis Gomez)] - - Contributions besides GSoC: - + Greatly improved and accelerated dnn module in opencv_contrib: - - Many new layers, including deconvolution, LSTM etc. - - Support for semantic segmentation and SSD networks with samples. - - TensorFlow importer + sample that runs Inception net by Google. - + More image formats and camera backends supported - + Interactive camera calibration app - + Multiple algorithms implemented in opencv_contrib - + Supported latest OSes, including Ubuntu 16.04 LTS and OSX 10.12 - + Lot’s of optimizations for IA and ARM archs using parallelism, vector - instructions and new OpenCL kernels. - + OpenCV now can use vendor-provided OpenVX and LAPACK/BLAS (including Intel MKL, - Apple’s Accelerate, OpenBLAS and Atlas) for acceleration -- Refreshed opencv-build-compare.patch -- Dropped upstream opencv-gcc5.patch -- Replace opencv-gcc6-disable-pch.patch with upstream patch - opencv-gcc6-fix-pch-support-PR8345.patch -- Enable TBB support (C++ threading library) -- Add dependency on openBLAS - -------------------------------------------------------------------- -Thu Jul 21 07:55:09 UTC 2016 - olaf@aepfle.de - -- Enable ffmpeg support unconditional - -------------------------------------------------------------------- -Tue Jun 7 08:53:04 UTC 2016 - dimstar@opensuse.org - -- In case we build using GCC6 (or newer), add -mlra to CFLAGS to - workaround gcc bug - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71294. - -------------------------------------------------------------------- -Wed May 25 13:38:26 UTC 2016 - martin.liska@suse.com - -- Apply upstream patch opencv-gcc6-disable-pch.patch to disable - PCH for GCC6. - -------------------------------------------------------------------- -Mon Mar 21 17:05:19 UTC 2016 - toddrme2178@gmail.com - -- Test for python versions greater than or equal to the current - version. - -------------------------------------------------------------------- -Wed Mar 9 18:15:57 UTC 2016 - toddrme2178@gmail.com - -- Add python 3 support - -------------------------------------------------------------------- -Thu Mar 3 21:17:52 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 - in its turn is required by digikam. - -------------------------------------------------------------------- -Sun Feb 28 19:37:23 UTC 2016 - joerg.lorenzen@ki.tng.de - -- Added _constraints file to avoid random failures on small workers - (at least for builds on PMBS) - -------------------------------------------------------------------- -Sat Feb 27 11:11:34 UTC 2016 - joerg.lorenzen@ki.tng.de - -- Update to OpenCV 3.1.0 - - A lot of new functionality has been introduced during Google - Summer of Code 2015: - + “Omnidirectional Cameras Calibration and Stereo 3D - Reconstruction” – opencv_contrib/ccalib module - (Baisheng Lai, Bo Li) - + “Structure From Motion” – opencv_contrib/sfm module - (Edgar Riba, Vincent Rabaud) - + “Improved Deformable Part-based Models” – opencv_contrib/dpm - module (Jiaolong Xu, Bence Magyar) - + “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” – - opencv_contrib/text module (Lluis Gomez, Vadim Pisarevsky) - + “Stereo correspondence improvements” – opencv_contrib/stereo - module (Mircea Paul Muresan, Sergei Nosov) - + “Structured-Light System Calibration” – - opencv_contrib/structured_light (Roberta Ravanelli, - Delia Passalacqua, Stefano Fabri, Claudia Rapuano) - + “Chessboard+ArUco for camera calibration” – - opencv_contrib/aruco (Sergio Garrido, Prasanna, Gary Bradski) - + “Implementation of universal interface for deep neural - network frameworks” – opencv_contrib/dnn module - (Vitaliy Lyudvichenko, Anatoly Baksheev) - + “Recent advances in edge-aware filtering, improved SGBM - stereo algorithm” – opencv/calib3d and opencv_contrib/ximgproc - (Alexander Bokov, Maksim Shabunin) - + “Improved ICF detector, waldboost implementation” – - opencv_contrib/xobjdetect (Vlad Shakhuro, Alexander Bovyrin) - + “Multi-target TLD tracking” – opencv_contrib/tracking module - (Vladimir Tyan, Antonella Cascitelli) - + “3D pose estimation using CNNs” – opencv_contrib/cnn_3dobj - (Yida Wang, Manuele Tamburrano, Stefano Fabri) - - Many great contributions made by the community, such as: - + Support for HDF5 format - + New/Improved optical flow algorithms - + Multiple new image processing algorithms for filtering, - segmentation and feature detection - + Superpixel segmentation and much more - - IPPICV is now based on IPP 9.0.1, which should make OpenCV - even faster on modern Intel chips - - opencv_contrib modules can now be included into the - opencv2.framework for iOS - - Newest operating systems are supported: Windows 10 and - OSX 10.11 (Visual Studio 2015 and XCode 7.1.1) - - Interoperability between T-API and OpenCL, OpenGL, DirectX and - Video Acceleration API on Linux, as well as Android 5 camera. - - HAL (Hardware Acceleration Layer) module functionality has been - moved into corresponding basic modules; the HAL replacement - mechanism has been implemented along with the examples -- Removed improve-sphinx-search.diff, opencv-altivec-vector.patch, - opencv-pkgconfig.patch and opencv-samples.patch, fixed upstream. -- Fixed opencv-qt5-sobump.diff, opencv-build-compare.patch, - opencv-gcc5.patch and opencv-gles.patch. - -- Version OpenCV 3.0.0 - + ~1500 patches, submitted as PR @ github. All our patches go - the same route. - + opencv_contrib (http://github.com/itseez/opencv_contrib) - repository has been added. A lot of new functionality is there - already! opencv_contrib is only compatible with 3.0/master, - not 2.4. Clone the repository and use “cmake … - -D OPENCV_EXTRA_MODULES_PATH= …” - to build opencv and opencv_contrib together. - + a subset of Intel IPP (IPPCV) is given to us and our users free - of charge, free of licensing fees, for commercial and - non-commerical use. It’s used by default in x86 and x64 builds - on Windows, Linux and Mac. - + T-API (transparent API) has been introduced, this is transparent - GPU acceleration layer using OpenCL. It does not add any - compile-time or runtime dependency of OpenCL. When OpenCL is - available, it’s detected and used, but it can be disabled at - compile time or at runtime. It covers ~100 OpenCV functions. - This work has been done by contract and with generous support - from AMD and Intel companies. - + ~40 OpenCV functions have been accelerated using NEON intrinsics - and because these are mostly basic functions, some higher-level - functions got accelerated as well. - + There is also new OpenCV HAL layer that will simplifies creation - of NEON-optimized code and that should form a base for the - open-source and proprietary OpenCV accelerators. - + The documentation is now in Doxygen: http://docs.opencv.org/master/ - + We cleaned up API of many high-level algorithms from features2d, - calib3d, objdetect etc. They now follow the uniform - “abstract interface – hidden implementation” pattern and make - extensive use of smart pointers (Ptr<>). - + Greatly improved and extended Python & Java bindings (also, - see below on the Python bindings), newly introduced Matlab - bindings (still in alpha stage). - + Improved Android support – now OpenCV Manager is in Java and - supports both 2.4 and 3.0. - + Greatly improved WinRT support, including video capturing and - multi-threading capabilities. Thanks for Microsoft team for this! - + Big thanks to Google who funded several successive GSoC programs - and let OpenCV in. The results of many successful GSoC 2013 and - 2014 projects have been integrated in opencv 3.0 and - opencv_contrib (earlier results are also available in - OpenCV 2.4.x). We can name: - - text detection - - many computational photography algorithms (HDR, inpainting, - edge-aware filters, superpixels, …) - - tracking and optical flow algorithms - - new features, including line descriptors, KAZE/AKAZE - - general use optimization (hill climbing, linear programming) - - greatly improved Python support, including Python 3.0 support, - many new tutorials & samples on how to use OpenCV with Python. - - 2d shape matching module and 3d surface matching module - - RGB-D module - - VTK-based 3D visualization module - - etc. - + Besides Google, we enjoyed (and hope that you will enjoy too) - many useful contributions from community, like: - - biologically inspired vision module - - DAISY features, LATCH descriptor, improved BRIEF - - image registration module - - etc. - -------------------------------------------------------------------- -Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de - -- Reduce build-compare noise - opencv-build-compare.patch - -------------------------------------------------------------------- -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. - -------------------------------------------------------------------- -Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de - -- Use pkgconfig for ffmpeg BuildRequires - -------------------------------------------------------------------- -Fri Jul 24 14:48:48 UTC 2015 - mlin@suse.com - -- Update improve-sphinx-search.diff for new python-Sphinx(1.3.1) - * now that sphinx-build disallow executing without arguments and - give you "Insufficient arguments" error, use "sphinx-build -h" - instead - * the default usages output ie. sphinx-build(or --help) no longer - are standard error but standard output, drop OUTPUT_QUIET and - add OUTPUT_VARIABLE throws the output to SPHINX_OUTPUT as well - -------------------------------------------------------------------- -Wed Jun 10 12:42:49 UTC 2015 - schwab@suse.de - -- opencv-gles.patch: support Qt5 built with GLES - -------------------------------------------------------------------- -Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke@gmail.com - -- Add specific buildrequires for libpng15, so that we are - building against the system provided libpng. - -------------------------------------------------------------------- -Sat Jan 3 19:00:24 UTC 2015 - tittiatcoke@gmail.com - -- Enable Qt5 build for openCV. Unfortunately the Qt5 build will - conflict with the Qt4 version. - Added patch opencv-qt5-sobump.diff to have at least the libraries - enabled for co-installability - -------------------------------------------------------------------- -Tue May 13 14:56:21 EEST 2014 - koprok@gmail.com - -- Update to OpenCV 2.4.9 - More info at: - http://opencv.org/opencv-2-4-9-is-out.html - The brief list of changes: - * new 3D visualization module ‘viz’; - * performance fixes in ‘ocl’ module; - * fixes in Android Camera; - * improved CUDA support for mobile platforms; - * bugfixes from community; - * 55 reported bugs have been closed; - * 156 pull requests have been merged. - -------------------------------------------------------------------- -Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke@gmail.com - -- 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 - actions are from 2010 - -------------------------------------------------------------------- -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 - -- Upstream now provides tarballs with source only as git tags - from github so update Source0 path. - -------------------------------------------------------------------- -Wed Mar 12 12:13:39 UTC 2014 - tchvatal@suse.com - -- Add requires on various X extensions linked to opencv_ts module. - As those are present in the .pc file we need it anyway. - -------------------------------------------------------------------- -Sun Jan 19 15:57:26 EET 2014 - koprok@gmail.com - -- Update to OpenCV 2.4.8 - More info at: - http://opencv.org/opencv-2-4-8.html - The brief list of changes: - * NVidia CUDA support on Android devices with CUDA capable SoC and - CUDA sample; - * Concurrent kernel execution and user defined context support for - OpenCL; - * Integration with Intel Perceptual SDK and new depth sensors support - for Windows; - * 32 reported bugs have been closed; - * 139 pull requests have been merged; - -------------------------------------------------------------------- -Thu Jan 16 17:11:21 UTC 2014 - dvlaeev@suse.com - -- Fix build with altivec: - opencv-altivec-vector.patch - -------------------------------------------------------------------- -Sun Dec 1 17:37:36 UTC 2013 - hrvoje.senjan@gmail.com - -- Added opencv-pkgconfig.patch: make sure to provide link flags in - OpenCV pc file (bnc#853036) - -------------------------------------------------------------------- -Tue Nov 12 23:07:23 UTC 2013 - hrvoje.senjan@gmail.com - -- Update to OpenCV 2.4.7 - 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 - 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 - in WinRT stuff - * 382 pull requests have been merged - * 54 reported bugs have been fixed -- Added pkgconfig(glu) Requires to devel package, as per .pc file -- Make devel package provides also devel-static one -- Drop assume-Sphinx-is-there.diff, and add improve-sphinx-search.diff, - for properly finding sphinx with alphabetic chars in version - -------------------------------------------------------------------- -Sun Nov 10 09:42:16 UTC 2013 - tittiatcoke@gmail.com - -- 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) - -------------------------------------------------------------------- -Sun Jul 14 16:54:56 UTC 2013 - asterios.dramis@gmail.com - -- Use eigen3 instead of eigen2 as build requirement for openSUSE > 12.3. -- Enable compilation with libucil and libunicap. -- Removed dos2unix build requirement (not needed anymore). - -------------------------------------------------------------------- -Fri Jul 12 11:22:31 EEST 2013 - koprok@nand.bg - -- Update to OpenCV 2.4.6.1 - More info at: - http://opencv.org/opencv-2-4-6-is-out.html - The brief list of changes: - * added video file i/o Windows RT and sample application using - camera, enabled parallelization with TBB or MS Concurrency - * added CUDA 5.5 support for desktop and ARM systems - * added Qt 5 support - * added many new OpenCL algorithms ports, included OpenCL binaries - into the Windows superpack - * iOS build scripts (together with Android ones) moved to - ‘opencv/platforms’ directory - * added functions for UIImage <-> cv::Mat conversion - * correct front/back camera selection in Android app framework - * added Linaro NDK support and fixes for MIPS to Android CMake - toolchain - * stability has been improved by a lot, numerous bug-fixes across - all the library - -------------------------------------------------------------------- -Wed Jun 26 20:26:48 UTC 2013 - crrodriguez@opensuse.org - -- build with LFS_CFLAGS in 32 bit archs. - -------------------------------------------------------------------- -Fri May 10 09:59:31 UTC 2013 - hrvoje.senjan@gmail.com - -- Disable SSE3 for all architectures (bnc#814333) - -------------------------------------------------------------------- -Thu May 9 20:53:43 UTC 2013 - hrvoje.senjan@gmail.com - -- Disable SSE(2) on non x86_64 architectures, causes crashing - kde#276923, bnc#789173 - -------------------------------------------------------------------- -Thu Apr 11 16:01:08 EEST 2013 - koprok@nand.bg - -- Update to OpenCV 2.4.5 - More info at: - http://opencv.org/opencv-2-4-5-is-out.html - The brief list of changes: - * experimental WinRT support - * new video super-resolution module - * CLAHE (adaptive histogram equalization) algorithm on both CPU - and GPU - * further improvements and extensions in ocl module - (stereo block matching and belief propagation have been added, - fixed crashes on Intel HD4000) - * Visual Studio 2012 cv::Mat visualizer plugin debugger tutorial - from Microsoft Research - * OpenCV4Android SDK improvements - (NDK r8e support, native activity sample using OpenCV Manager, - bug-fixes) - * ~25 reported problems have been resolved since 2.4.4, ~78 pull - requests have been merged, thanks everybody who participated! - -------------------------------------------------------------------- -Tue Mar 5 14:42:49 EET 2013 - koprok@nand.bg - -- Update to OpenCV 2.4.4 - More info at: - http://opencv.org/opencv-2-4-4-is-out.html - The brief list of changes: - * OpenCV Java bindings are ported from Android to desktop Java! - Actually any JVM language will work, see Tutorial for details, - and Java or Scala code samples. - * Android application framework, samples, tutorials, and OpenCV - Manager are improved. - * Optimizations for the new NVIDIA Kepler architecture, CARMA - platform support and other new optimizations in CUDA. - * OpenCL module now builds successfully with various SDKs (from - AMD, NVIDIA, Intel and Apple) and runs well on different GPUs - (AMD, NVidia, Intel HD4000). A lot of new functionality has been - added, tons of bugs fixed, performance of many functions has - been significantly improved. - * 100+ reported problems have been resolved since 2.4.3, thanks - everybody who participated! - -------------------------------------------------------------------- -Sat Dec 1 12:56:09 UTC 2012 - tittiatcoke@gmail.com - -- Drop the buildrequire for libxine - -------------------------------------------------------------------- -Wed Nov 28 11:33:38 EET 2012 - koprok@nand.bg - -- Update to OpenCV 2.4.3 - More info at: - http://opencv.org/opencv-2-4-3-released.html - The nicely formatted changelog can be seen here: - http://code.opencv.org/projects/opencv/wiki/ChangeLog; - here are the highlights: - * A lot of good stuff from the Google Summer of Code 2012 has been - integrated; this was a very productive summer! - * Significantly improved and optimized Android and iOS ports. - * Greatly extended GPU (i.e. CUDA-based) module. - * The brand new ocl (OpenCL-based) module that unleashes GPU power - also for AMD and Intel GPU users. It’s not included into the - binary package, since there are different SDKs, and it’s not - turned on by default. You need to run CMake and turn on - “WITH_OPENCL”. Also, please note that this is very first version - of the module, so it may be not very stable and not very - functional. - * Much better performance on many-core systems out of the box. You - do not need TBB anymore on MacOSX, iOS and Windows. BTW, the - binary package for Windows is now built without TBB support. - Libraries and DLLs for Visual Studio 2010 use the Concurrency - framework. - * About 130 bugs have been fixed since 2.4.2. - * Since 2.4.3rc we fixed several more problems, in particular some - compile problems with iOS 6 SDK. - -------------------------------------------------------------------- -Tue Sep 18 07:22:59 UTC 2012 - coolo@suse.com - -- buildrequire glu - -------------------------------------------------------------------- -Thu Jul 5 11:17:21 EEST 2012 - koprok@nand.bg - -- Update to OpenCV 2.4.2 - More info at: - http://code.opencv.org/projects/opencv/wiki/ChangeLog -- Drop opencv-datadir.patch to comply with upstream directory layout - -------------------------------------------------------------------- -Fri Jun 8 11:07:47 EEST 2012 - koprok@nand.bg - -- Update to OpenCV 2.4.1 - More info at: - http://code.opencv.org/projects/opencv/wiki/ChangeLog - -------------------------------------------------------------------- -Tue May 15 14:24:05 EEST 2012 - koprok@nand.bg - -- Update to OpenCV 2.4.0 - More info at: - http://code.opencv.org/projects/opencv/wiki/ChangeLog - -------------------------------------------------------------------- -Sat Mar 17 12:01:52 UTC 2012 - dimstar@opensuse.org - -- Add opencv-gcc47.patch: Fix build with gcc 4.7. - -------------------------------------------------------------------- -Tue Jan 10 04:24:32 UTC 2012 - crrodriguez@opensuse.org - -- Use Explicit Buildrequires on several needed libraries - future dependency cleanups may/will cause build to fail otherwise. - -------------------------------------------------------------------- -Sat Dec 31 14:21:49 UTC 2011 - idonmez@suse.com - -- Add upstream r6881 to fix clang compatibility - -------------------------------------------------------------------- -Tue Oct 18 08:19:10 UTC 2011 - coolo@suse.com - -- uncomment libraries not in 12.1 for now - -------------------------------------------------------------------- -Fri Oct 7 15:15:32 UTC 2011 - toddrme2178@gmail.com - -- Changed groups (fix for RPMLINT warning) -- Added check for duplicate files (fix for RPMLINT warning) -- Added py_requires macros and python-base dependencies (fix for RPMLINT warning) -- Escaped macros (fix for RPMLINT warning) -- Fixed end-of-line encoding problems (fix for RPMLINT warning) -- Added libeigen2-devel buildrequires -- Added libunicap and libucil buildrequires (libunicap supports requires libucil) -- Cleaned up spec file formatting - -------------------------------------------------------------------- -Tue Aug 23 17:46:53 EEST 2011 - koprok@nand.bg - -- Dropped opencv-2.3-ffmpeg.patch, applied upstream - -------------------------------------------------------------------- -Tue Aug 23 16:31:53 EEST 2011 - koprok@nand.bg - -- Revive opencv-2.3-ffmpeg.patch, needs rebase -- Tag all patches according to openSUSE packaging guidelines - -------------------------------------------------------------------- -Tue Aug 23 11:22:19 EEST 2011 - koprok@nand.bg - -- Removed opencv-2.3-cmake.patch, old cmake cannot be used any more. -- Python bindings cannot be built without NumPy any more. - -------------------------------------------------------------------- -Fri Aug 19 15:03:45 EEST 2011 - koprok@nand.bg - -- Update to OpenCV 2.3.1 - -------------------------------------------------------------------- -Wed Aug 17 23:50:39 UTC 2011 - reddwarf@opensuse.org - -- Update and readd opencv-2.3-underlinking.patch since it is still - necessary. - -------------------------------------------------------------------- -Wed Aug 17 20:19:05 UTC 2011 - reddwarf@opensuse.org - -- Fix support for new ffmpeg versions - -------------------------------------------------------------------- -Sun Aug 14 01:44:47 EEST 2011 - koprok@nand.bg - -- Removed unnecessary patches -- Enable Python NumPy support on openSUSE 11.2 -- Build Qt instead of Gtk GUI -- Fix cmake files for openSUSE 11.1 -- No GStreamer support on openSUSE 11.1 - -------------------------------------------------------------------- -Fri Aug 12 17:37:30 EEST 2011 - koprok@nand.bg - -- Update to OpenCV 2.3.0. - More info at: - http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs - -------------------------------------------------------------------- -Wed Aug 3 00:36:36 EEST 2011 - koprok@nand.bg - -- Fix build on openSUSE 11.2 - -------------------------------------------------------------------- -Wed Jul 6 08:23:04 UTC 2011 - idonmez@novell.com - -- Add opencv-v4l-2.6.38.patch: use the new libv4l2 interface - -------------------------------------------------------------------- -Mon Dec 27 16:56:15 EET 2010 - koprok@nand.bg - -- Enable Python NumPy support -- SWIG is not required any more -- Enable OpenEXR support - -------------------------------------------------------------------- -Thu Dec 23 16:08:46 EET 2010 - koprok@nand.bg - -- Update to OpenCV 2.2.0. - More info at: - http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs - -------------------------------------------------------------------- -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. - -------------------------------------------------------------------- -Thu Nov 11 15:50:25 CET 2010 - dmueller@suse.de - -- fix build with gcc 4.6 - -------------------------------------------------------------------- -Fri Oct 8 07:29:48 UTC 2010 - reddwarf@opensuse.org - -- add -underlinking patch - -------------------------------------------------------------------- -Thu Apr 22 11:43:38 EEST 2010 - koprok@nand.bg - -- devel package renamed to opencv-devel, so that switching between - OBS and packman opencv packages is easier - -------------------------------------------------------------------- -Mon Apr 19 10:48:10 EEST 2010 - koprok@nand.bg - -- fix gstreamer support -- fix xine support -- fix some rpmlint warnings -- fix shared libraries permissions - -------------------------------------------------------------------- -Sat Apr 17 18:23:31 EEST 2010 - koprok@nand.bg - -- Do not waste resources building the tests as we do not run them - -------------------------------------------------------------------- -Fri Apr 16 10:58:26 EEST 2010 - koprok@nand.bg - -- Do not disable SSE,SSE2,etc. According to OpenCV changelog, - it should be safe to leave these enabled. - -------------------------------------------------------------------- -Thu Apr 15 14:26:49 EEST 2010 - koprok@nand.bg - -- fix build on openSUSE 11.0 - -------------------------------------------------------------------- -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 - libc-style mechanism - * 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 - rectification - * Fullscreen has been added (thanks to Yannick Verdie). - * Further info at: - http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs - -------------------------------------------------------------------- -Wed Apr 7 14:12:03 UTC 2010 - coolo@novell.com - -- fix build with libpng14 - -------------------------------------------------------------------- -Thu Mar 18 06:33:27 UTC 2010 - coolo@novell.com - -- small spec file cleanup - -------------------------------------------------------------------- -Sat Jan 16 19:45:04 UTC 2010 - tittiatcoke@gmail.com - -- Moved to the KDE repositories to enable inclusion in kipi-plugins - -------------------------------------------------------------------- -Fri Oct 9 19:23:14 UTC 2009 - cmorve69@yahoo.es - -- Initial package - diff --git a/opencv-qt5.spec b/opencv-qt5.spec deleted file mode 100644 index 851c8c3..0000000 --- a/opencv-qt5.spec +++ /dev/null @@ -1,255 +0,0 @@ -# -# spec file for package opencv-qt5 -# -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%bcond_without ffmpeg - -%define libname lib%{name} -%define soname 6_3 - -Name: opencv-qt5 -Version: 3.2.0 -Release: 0 -Summary: Collection of algorithms for computer vision -License: BSD-3-Clause -Group: Development/Libraries/C and C++ -Url: http://opencv.org/ -Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz -# This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much usntable modules -Source1: opencv_contrib_face-3.1.0.tar.bz2 -# PATCH-FIX-OPENSUSE opencv-qt5-sobump.diff tittiatcoke@gmail.com -- increase the so version of the libraries to force co-installability with the Qt4 version -Patch0: opencv-qt5-sobump.diff -# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES -Patch7: opencv-gles.patch -# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes -Patch8: opencv-build-compare.patch -# PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x -Patch10: opencv-gcc6-fix-pch-support-PR8345.patch -BuildRequires: cmake -BuildRequires: fdupes -BuildRequires: unzip -%if 0%{?suse_version} > 1310 -BuildRequires: gstreamer-plugins-base-devel -%else -BuildRequires: gstreamer-0_10-plugins-base-devel -BuildRequires: libucil-devel -BuildRequires: libunicap-devel -%endif -BuildRequires: libdc1394-devel -%if 0%{?suse_version} > 1230 -BuildRequires: libeigen3-devel -%else -BuildRequires: libeigen2-devel -%endif -%if %{with ffmpeg} -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libswscale) -%endif -BuildRequires: libgphoto2-devel -BuildRequires: libjasper-devel -BuildRequires: libjpeg-devel -BuildRequires: libtiff-devel -BuildRequires: libv4l-devel -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 -BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -%if 0%{?suse_version} > 1220 -BuildRequires: ilmbase-devel -BuildRequires: openexr-devel -%else -BuildRequires: OpenEXR-devel -BuildRequires: libilmbase-devel -%endif -BuildRequires: libpng16-compat-devel -BuildRequires: libpng16-devel -BuildRequires: openblas-devel -BuildRequires: python-devel -BuildRequires: python-numpy-devel -BuildRequires: python3-devel -BuildRequires: python3-numpy-devel -%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} -BuildRequires: python-sphinx -%endif -BuildRequires: tbb-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig(glu) -Conflicts: opencv -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -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. - -%package -n %{libname}%{soname} -Summary: Development files for using the OpenCV library -Group: Development/Libraries/C and C++ - -%description -n %{libname}%{soname} -The Open Computer Vision Library is a collection of algorithms and sample code -for various computer vision problems. The library is compatible with IPL and -utilizes Intel Integrated Performance Primitives for better performance. - -%package devel -Summary: Development files for using the OpenCV library -# Since 2.4.7 -Group: Development/Libraries/C and C++ -Provides: %{name}-devel-static = %{version} -Requires: %{libname}%{soname} = %{version} -Requires: %{name} = %{version} -Requires: pkgconfig(gl) -Requires: pkgconfig(glu) -Requires: pkgconfig(ice) -Requires: pkgconfig(sm) -Requires: pkgconfig(x11) -Requires: pkgconfig(xext) -Conflicts: opencv-devel - -%description devel -This package contains the OpenCV C/C++ library and header files, as well as -documentation. It should be installed if you want to develop programs that will -use the OpenCV library. - -%package -n python-%{name} -Summary: Python 2 bindings for apps which use OpenCV -Group: Development/Libraries/Python -Requires: python-base >= %{py_ver} -Conflicts: python-opencv - -%description -n python-%{name} -This package contains Python 2 bindings for the OpenCV library. - -%package -n python3-%{name} -Summary: Python 3 bindings for apps which use OpenCV -Group: Development/Libraries/Python -Requires: python3-base >= %{py3_ver} -Conflicts: python3-opencv - -%description -n python3-%name -This package contains Python 3 bindings for the OpenCV library. - -%package doc -Summary: Documentation and examples for OpenCV -Group: Development/Libraries/C and C++ -Recommends: python -# Since this package also contains examples that need -devel to be compiled -Recommends: %{name}-devel -Conflicts: opencv-doc - -%description doc -This package contains the documentation and examples for the OpenCV library. - -%prep -%setup -q -n opencv-%version -a 1 -%patch0 -p1 -%patch7 -p1 -%patch8 -p1 -%patch10 -p1 - -# Remove Windows specific files -rm -f doc/packaging.txt - -%build -%ifarch ppc64le -if [ $(gcc -dumpversion) -ge 6 ]; then -export mlra=-mlra -fi -%endif -export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" -export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)" -mkdir build -cd build -# TODO for OCV 3.3: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options -cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX='%{_prefix}' \ - -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_TESTS=OFF \ - -DINSTALL_C_EXAMPLES=ON \ - -DINSTALL_PYTHON_EXAMPLES=ON \ - -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ - -DENABLE_OMIT_FRAME_POINTER=OFF \ - -DWITH_QT=ON \ - -DWITH_OPENGL=ON \ - -DWITH_UNICAP=ON \ - -DWITH_XINE=ON \ - -DWITH_IPP=OFF \ - -DWITH_TBB=ON \ -%if 0%{?suse_version} <= 1310 - -DWITH_GSTREAMER_0_10=ON \ -%endif -%ifnarch x86_64 - -DENABLE_SSE=0 \ - -DENABLE_SSE2=0 \ -%endif - -DENABLE_SSE3=0 \ - .. -make %{?_smp_mflags} VERBOSE=1 - -%install -cd build -make DESTDIR=%{?buildroot:%{buildroot}} install/fast -mkdir -p %{buildroot}%{_docdir}/%{name}-doc -mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples -# OpenCV 3.2 no longer install libopencv_ts.a if the tests are not enabled -install lib/libopencv_ts.a %{buildroot}%{_libdir} - -# Fix rpmlint warning "doc-file-dependency" -chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py - -%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples -%fdupes -s %{buildroot}%{_includedir} - -%post -n %{libname}%{soname} -p /sbin/ldconfig - -%postun -n %{libname}%{soname} -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%{_bindir}/opencv_* -%{_datadir}/OpenCV -%exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake - -%files -n %{libname}%{soname} -%defattr(-,root,root,-) -%{_libdir}/lib*.so.* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/opencv/ -%{_includedir}/opencv2/ -%{_libdir}/libopencv_ts.a -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/opencv.pc -%{_datadir}/OpenCV/OpenCVConfig*.cmake - -%files -n python-%{name} -%defattr(-,root,root,-) -%{python_sitearch}/cv2.so - -%files -n python3-%{name} -%defattr(-,root,root,-) -%{python3_sitearch}/cv2.%{py3_soflags}.so - -%files doc -%defattr(-,root,root,-) -%{_docdir}/%{name}-doc/ - -%changelog diff --git a/opencv.changes b/opencv.changes index 8e48505..f6b6122 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jun 5 12:15:24 UTC 2017 - tchvatal@suse.com + +- Add conditional for the qt5/qt4 integration + * This is used only for gui tools, library is not affected +- Add provides/obsoletes for the qt5 packages to allow migration +- Drop patch opencv-qt5-sobump.diff + * Used only by the obsoleted qt5 variant + +------------------------------------------------------------------- +Mon Jun 5 11:29:06 UTC 2017 - tchvatal@suse.com + +- Cleanup a bit with spec-cleaner +- Use %cmake macros +- Remove the conditions that are not really needed +- Add tests conditional disabled by default + * Many tests fail and there are missing testdata +- Switch to pkgconfig style dependencies + ------------------------------------------------------------------- Sun May 28 12:32:09 UTC 2017 - stefan.bruens@rwth-aachen.de diff --git a/opencv.spec b/opencv.spec index bdf588a..d48fa1a 100644 --- a/opencv.spec +++ b/opencv.spec @@ -16,11 +16,12 @@ # -%bcond_without ffmpeg - %define libname lib%{name} %define soname 3_2 - +# disabled by default as many fail +%bcond_with tests +%bcond_without qt5 +%bcond_without ffmpeg Name: opencv Version: 3.2.0 Release: 0 @@ -31,25 +32,49 @@ Url: http://opencv.org/ Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz # This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much usntable modules Source1: opencv_contrib_face-3.1.0.tar.bz2 +# PATCH-FIX-UPSTREAM opencv-gles.patch -- Make sure PERSPECTIVE_CORRECTION_HINT is validated first +Patch1: opencv-gles.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes Patch8: opencv-build-compare.patch # PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x Patch10: opencv-gcc6-fix-pch-support-PR8345.patch BuildRequires: cmake BuildRequires: fdupes -BuildRequires: unzip -%if 0%{?suse_version} > 1310 -BuildRequires: gstreamer-plugins-base-devel -%else -BuildRequires: gstreamer-0_10-plugins-base-devel -BuildRequires: libucil-devel -BuildRequires: libunicap-devel -%endif -BuildRequires: libdc1394-devel -%if 0%{?suse_version} > 1230 BuildRequires: libeigen3-devel +BuildRequires: libjasper-devel +BuildRequires: libjpeg-devel +BuildRequires: openblas-devel +BuildRequires: pkgconfig +BuildRequires: python-numpy-devel +BuildRequires: python3-numpy-devel +BuildRequires: tbb-devel +BuildRequires: unzip +BuildRequires: pkgconfig(IlmBase) +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(libgphoto2) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(libv4lconvert) +BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(zlib) +Provides: opencv-qt5 +Obsoletes: opencv-qt5 +%if %{with qt5} +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 +BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 %else -BuildRequires: libeigen2-devel +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(QtTest) %endif %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) @@ -57,33 +82,9 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) %endif -BuildRequires: libgphoto2-devel -BuildRequires: libjasper-devel -BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel -BuildRequires: libtiff-devel -BuildRequires: libv4l-devel -%if 0%{?suse_version} > 1220 -BuildRequires: ilmbase-devel -BuildRequires: openexr-devel -%else -BuildRequires: OpenEXR-devel -BuildRequires: libilmbase-devel -%endif -BuildRequires: libpng16-compat-devel -BuildRequires: libpng16-devel -BuildRequires: openblas-devel -BuildRequires: python-devel -BuildRequires: python-numpy-devel -BuildRequires: python3-devel -BuildRequires: python3-numpy-devel %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: python-sphinx %endif -BuildRequires: tbb-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig(glu) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C @@ -91,8 +92,8 @@ functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. %package -n %{libname}%{soname} -Summary: Development files for using the OpenCV library -Group: Development/Libraries/C and C++ +Summary: Libraries to use OpenCV computer vision +Group: System/Libraries %description -n %{libname}%{soname} The Open Computer Vision Library is a collection of algorithms and sample code @@ -101,9 +102,7 @@ utilizes Intel Integrated Performance Primitives for better performance. %package devel Summary: Development files for using the OpenCV library -# Since 2.4.7 Group: Development/Libraries/C and C++ -Provides: %{name}-devel-static = %{version} Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} Requires: pkgconfig(gl) @@ -112,6 +111,8 @@ Requires: pkgconfig(ice) Requires: pkgconfig(sm) Requires: pkgconfig(x11) Requires: pkgconfig(xext) +Provides: %{name}-qt5-devel +Obsoletes: %{name}-qt5-devel %description devel This package contains the OpenCV C/C++ library and header files, as well as @@ -121,7 +122,9 @@ use the OpenCV library. %package -n python-%{name} Summary: Python 2 bindings for apps which use OpenCV Group: Development/Libraries/Python -Requires: python-base >= %{py_ver} +Requires: python-base +Provides: python-%{name}-qt5 +Obsoletes: python-%{name}-qt5 %description -n python-%{name} This package contains Python 2 bindings for the OpenCV library. @@ -129,49 +132,40 @@ This package contains Python 2 bindings for the OpenCV library. %package -n python3-%{name} Summary: Python 3 bindings for apps which use OpenCV Group: Development/Libraries/Python -Requires: python3-base >= %{py3_ver} +Requires: python3-base +Provides: python3-%{name}-qt5 +Obsoletes: python3-%{name}-qt5 %description -n python3-%{name} This package contains Python 3 bindings for the OpenCV library. %package doc Summary: Documentation and examples for OpenCV -Group: Development/Libraries/C and C++ +Group: Documentation/Other Recommends: python # Since this package also contains examples that need -devel to be compiled -Recommends: %{name}-devel +Suggests: %{name}-devel +Provides: %{name}-qt5-doc +Obsoletes: %{name}-qt5-doc %description doc This package contains the documentation and examples for the OpenCV library. %prep %setup -q -a 1 -%patch8 -p1 -%patch10 -p1 +%autopatch -p1 # Remove Windows specific files rm -f doc/packaging.txt -# Fix "wrong-file-end-of-line-encoding" rpmlint warning -# sed -i 's/\r$//' samples/c/facedetect.cmd %build -%ifarch ppc64le -if [ $(gcc -dumpversion) -ge 6 ]; then -export mlra=-mlra -fi -%endif -export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" -export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)" -mkdir build -cd build # TODO for OCV 3.3: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options -cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX='%{_prefix}' \ - -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_TESTS=OFF \ +%cmake \ +%if %{with tests} + -DBUILD_TESTS=ON \ +%endif -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ - -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ -DENABLE_OMIT_FRAME_POINTER=OFF \ -DWITH_QT=ON \ -DWITH_OPENGL=ON \ @@ -179,24 +173,23 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DWITH_XINE=ON \ -DWITH_IPP=OFF \ -DWITH_TBB=ON \ -%if 0%{?suse_version} <= 1310 - -DWITH_GSTREAMER_0_10=ON \ -%endif -%ifnarch x86_64 +%ifarch %{ix86} -DENABLE_SSE=0 \ -DENABLE_SSE2=0 \ %endif - -DENABLE_SSE3=0 \ - .. + -DENABLE_SSE3=0 make %{?_smp_mflags} VERBOSE=1 +%check +%if %{with tests} +export LD_LIBRARY_PATH=$(pwd)/build/lib:$LD_LIBRARY_PATH +%ctest +%endif + %install -cd build -make DESTDIR=%{?buildroot:%{buildroot}} install/fast +%cmake_install mkdir -p %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples -# OpenCV 3.2 no longer install libopencv_ts.a if the tests are not enabled -install lib/libopencv_ts.a %{buildroot}%{_libdir} # Fix rpmlint warning "doc-file-dependency" chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py @@ -205,7 +198,6 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py %fdupes -s %{buildroot}%{_includedir} %post -n %{libname}%{soname} -p /sbin/ldconfig - %postun -n %{libname}%{soname} -p /sbin/ldconfig %files @@ -222,7 +214,6 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py %defattr(-,root,root,-) %{_includedir}/opencv/ %{_includedir}/opencv2/ -%{_libdir}/libopencv_ts.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/opencv.pc %{_datadir}/OpenCV/OpenCVConfig*.cmake @@ -233,11 +224,7 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py %files -n python3-%{name} %defattr(-,root,root,-) -%if 0%{?suse_version} > 1310 %{python3_sitearch}/cv2.%{py3_soflags}.so -%else -%{python3_sitearch}/cv2.so -%endif %files doc %defattr(-,root,root,-)