Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2015-01-30 17:47:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2015-01-30 17:47:42.000000000 +0100 @@ -0,0 +1,448 @@ +------------------------------------------------------------------- +Mon Jan 26 09:46:21 UTC 2015 - [email protected] + +- Add specific buildrequires for libpng15, so that we are + building against the system provided libpng. + +------------------------------------------------------------------- +Sat Jan 3 19:00:24 UTC 2015 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- Upstream now provides tarballs with source only as git tags + from github so update Source0 path. + +------------------------------------------------------------------- +Wed Mar 12 12:13:39 UTC 2014 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- Fix build with altivec: + opencv-altivec-vector.patch + +------------------------------------------------------------------- +Sun Dec 1 17:37:36 UTC 2013 - [email protected] + +- Added opencv-pkgconfig.patch: make sure to provide link flags in + OpenCV pc file (bnc#853036) + +------------------------------------------------------------------- +Tue Nov 12 23:07:23 UTC 2013 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- build with LFS_CFLAGS in 32 bit archs. + +------------------------------------------------------------------- +Fri May 10 09:59:31 UTC 2013 - [email protected] + +- Disable SSE3 for all architectures (bnc#814333) + +------------------------------------------------------------------- +Thu May 9 20:53:43 UTC 2013 - [email protected] + +- Disable SSE(2) on non x86_64 architectures, causes crashing + kde#276923, bnc#789173 + +------------------------------------------------------------------- +Thu Apr 11 16:01:08 EEST 2013 - [email protected] + +- 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 - [email protected] + +- 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 ++++ 251 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2014-05-17 21:46:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2015-01-30 17:47:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 26 09:46:21 UTC 2015 - [email protected] + +- Add specific buildrequires for libpng15, so that we are + building against the system provided libpng. + +------------------------------------------------------------------- New: ---- opencv-qt5-sobump.diff opencv-qt5.changes opencv-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ # # spec file for package opencv-qt5 # # Copyright (c) 2015 SUSE LINUX Products 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_with ffmpeg %define libname lib%{name} %define soname 5_4 Name: opencv-qt5 Version: 2.4.9 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 # PATCH-FIX-OPENSUSE opencv-qt5-sobump.diff [email protected] -- increase the so version of the libraries to force co-installability with the Qt4 version Patch0: opencv-qt5-sobump.diff # PATCH-FIX-UPSTREAM opencv-samples.patch [email protected] -- Improve samples installation. Patch1: opencv-samples.patch # PATCH-FIX-UPSTREAM opencv-underlinking.patch [email protected] -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. Patch2: opencv-underlinking.patch # PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version Patch3: improve-sphinx-search.diff # PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on # getting opencv vars via pc (first), and then via CMake, as is the case with nomacs # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 Patch4: opencv-pkgconfig.patch Patch5: opencv-altivec-vector.patch # PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support Patch6: bomb_commit_gstreamer-1x-support.patch BuildRequires: cmake BuildRequires: fdupes %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: libffmpeg-devel %endif 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: python-devel BuildRequires: python-numpy-devel BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) BuildRequires: libpng16-devel BuildRequires: libpng16-compat-devel 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 Group: Development/Libraries/C and C++ # Since 2.4.7 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 bindings for apps which use OpenCV Group: Development/Libraries/Python Requires: python-base = %{py_ver} %py_requires Conflicts: python-opencv %description -n python-%name This package contains Python 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 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 %patch5 -p1 %patch6 -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 export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)" mkdir build cd build 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 \ %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} mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples # Fix rpmlint warning "doc-file-dependency" chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.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}/cv.py %{python_sitearch}/cv2.so %files doc %defattr(-,root,root,-) %{_docdir}/%{name}-doc/ %changelog ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.Y0OEEE/_old 2015-01-30 17:47:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Y0OEEE/_new 2015-01-30 17:47:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -77,6 +77,8 @@ BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) +BuildRequires: libpng16-devel +BuildRequires: libpng16-compat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ opencv-qt5-sobump.diff ++++++ diff -urB opencv-2.4.9/cmake/OpenCVVersion.cmake new/cmake/OpenCVVersion.cmake --- opencv-2.4.9/cmake/OpenCVVersion.cmake 2014-04-11 12:15:26.000000000 +0200 +++ new/cmake/OpenCVVersion.cmake 2015-01-03 19:56:37.829234402 +0100 @@ -1,7 +1,7 @@ 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]+[ ]+[0-9]+" ) -string(REGEX REPLACE ".+CV_VERSION_EPOCH[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}") +set(OPENCV_VERSION_MAJOR 5) 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}") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
