Hello community, here is the log from the commit of package opencv.1664 for openSUSE:12.3:Update checked in at 2013-05-27 17:05:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/opencv.1664 (Old) and /work/SRC/openSUSE:12.3:Update/.opencv.1664.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv.1664" Changes: -------- New Changes file: --- /dev/null 2013-05-23 01:40:31.032032505 +0200 +++ /work/SRC/openSUSE:12.3:Update/.opencv.1664.new/opencv.changes 2013-05-27 17:06:02.000000000 +0200 @@ -0,0 +1,256 @@ +------------------------------------------------------------------- +Thu May 9 20:27:16 UTC 2013 - [email protected] + +- Disable SSE(2) on non x86_64 architectures, causes crashing + (kde#276923, bnc#789173) and disable SSE3 for all architectures + (bnc#814333) + +------------------------------------------------------------------- +Sat Dec 1 12:56:09 UTC 2012 - [email protected] + +- Drop the buildrequire for libxine + +------------------------------------------------------------------- +Wed Nov 28 11:33:38 EET 2012 - [email protected] + +- 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 - [email protected] + +- buildrequire glu + +------------------------------------------------------------------- +Thu Jul 5 11:17:21 EEST 2012 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- Add opencv-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- +Tue Jan 10 04:24:32 UTC 2012 - [email protected] + +- 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 - [email protected] + +- Add upstream r6881 to fix clang compatibility + +------------------------------------------------------------------- +Tue Oct 18 08:19:10 UTC 2011 - [email protected] + +- uncomment libraries not in 12.1 for now + +------------------------------------------------------------------- +Fri Oct 7 15:15:32 UTC 2011 - [email protected] + +- 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 - [email protected] + +- Dropped opencv-2.3-ffmpeg.patch, applied upstream + +------------------------------------------------------------------- +Tue Aug 23 16:31:53 EEST 2011 - [email protected] + +- Revive opencv-2.3-ffmpeg.patch, needs rebase +- Tag all patches according to openSUSE packaging guidelines + +------------------------------------------------------------------- +Tue Aug 23 11:22:19 EEST 2011 - [email protected] + +- 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 - [email protected] + +- Update to OpenCV 2.3.1 + +------------------------------------------------------------------- +Wed Aug 17 23:50:39 UTC 2011 - [email protected] + +- Update and readd opencv-2.3-underlinking.patch since it is still + necessary. + +------------------------------------------------------------------- +Wed Aug 17 20:19:05 UTC 2011 - [email protected] + +- Fix support for new ffmpeg versions + +------------------------------------------------------------------- +Sun Aug 14 01:44:47 EEST 2011 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- Fix build on openSUSE 11.2 + +------------------------------------------------------------------- +Wed Jul 6 08:23:04 UTC 2011 - [email protected] + +- Add opencv-v4l-2.6.38.patch: use the new libv4l2 interface + +------------------------------------------------------------------- +Mon Dec 27 16:56:15 EET 2010 - [email protected] + +- Enable Python NumPy support +- SWIG is not required any more +- Enable OpenEXR support + +------------------------------------------------------------------- +Thu Dec 23 16:08:46 EET 2010 - [email protected] + +- 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 - [email protected] + +- Use system zlib, oh, and do not export ZLIB symbols to + other applications, clashes ensued. + +------------------------------------------------------------------- +Thu Nov 11 15:50:25 CET 2010 - [email protected] + +- fix build with gcc 4.6 + +------------------------------------------------------------------- +Fri Oct 8 07:29:48 UTC 2010 - [email protected] + +- add -underlinking patch + +------------------------------------------------------------------- +Thu Apr 22 11:43:38 EEST 2010 - [email protected] + +- devel package renamed to opencv-devel, so that switching between + OBS and packman opencv packages is easier + +------------------------------------------------------------------- ++++ 59 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.opencv.1664.new/opencv.changes New: ---- OpenCV-2.4.3.tar.bz2 opencv-samples.patch opencv-underlinking.patch opencv.changes opencv.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ # # spec file for package opencv # # Copyright (c) 2013 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 Name: opencv %define libname lib%{name} %define soname 2_4 Version: 2.4.3 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://%{name}.willowgarage.com/wiki/ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM opencv-samples.patch [email protected] -- Improve samples installation. Patch1: %{name}-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: %{name}-underlinking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenEXR-devel BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libdc1394-devel BuildRequires: libeigen2-devel BuildRequires: libjasper-devel BuildRequires: libqt4-devel #BuildRequires: libucil-devel #BuildRequires: libunicap-devel BuildRequires: libilmbase-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif BuildRequires: libv4l-devel %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++ Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} %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 %description -n python-%{name} This package contains Python bindings for the OpenCV library. %package -n %{name}-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 %description -n %{name}-doc This package contains the documentation and examples for the OpenCV library. %prep %setup -qn OpenCV-%{version} %patch1 -p1 %patch2 -p1 # Windows specific and with wrong end of line rm -f doc/packaging.txt chmod +x samples/c/build_all.sh sed -i 's/\r$//' samples/c/adaptiveskindetector.cpp \ samples/c/latentsvmdetect.cpp \ samples/gpu/hog.cpp \ samples/python/camshift.py %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" 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 \ %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 dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/python*/*.py dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/gpu/*.cpp %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %clean rm -rf %{buildroot} %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig %files -n %{libname}%{soname} %defattr(-, root, root, 0755) %{_libdir}/lib*.so.* %files -n %{name} %defattr(0644, root, root, 0755) %attr(0755, root, root) %{_bindir}/%{name}_* %{_datadir}/OpenCV %exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake %files devel %defattr(0644, root, root, 0755) %{_includedir}/opencv %{_includedir}/opencv2 %{_libdir}/lib*.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/OpenCV/OpenCVConfig*.cmake %files -n python-%{name} %defattr(0644, root, root, 0755) %{python_sitearch}/cv.py %{python_sitearch}/cv2.so %files -n %{name}-doc %defattr(-, root, root, 0755) %{_docdir}/%{name}-doc %changelog ++++++ opencv-samples.patch ++++++ diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt --- OpenCV-2.4.3-orig/CMakeLists.txt 2012-11-02 17:04:07.000000000 +0200 +++ OpenCV-2.4.3/CMakeLists.txt 2012-11-28 12:01:07.942804657 +0200 @@ -455,7 +455,7 @@ add_subdirectory(apps) # examples -if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) +if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) add_subdirectory(samples) endif() diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLists.txt --- OpenCV-2.4.3-orig/samples/CMakeLists.txt 2012-08-09 01:55:05.000000000 +0300 +++ OpenCV-2.4.3/samples/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 @@ -3,6 +3,7 @@ # # ---------------------------------------------------------------------------- +if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES) add_subdirectory(c) add_subdirectory(cpp) add_subdirectory(gpu) @@ -11,3 +12,9 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES) add_subdirectory(android) endif() +endif() + +if(INSTALL_PYTHON_EXAMPLES) +add_subdirectory(python) +add_subdirectory(python2) +endif() diff -urN OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt --- OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 +++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 @@ -64,7 +64,7 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${install_list} - DESTINATION share/OpenCV/samples/${project} + DESTINATION share/OpenCV/samples/gpu PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/CMakeLists.txt --- OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 +++ OpenCV-2.4.3/samples/ocl/CMakeLists.txt 2012-11-28 13:16:24.943465391 +0200 @@ -58,7 +58,7 @@ if (NOT WIN32) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${install_list} - DESTINATION share/opencv/samples/${project} + DESTINATION share/OpenCV/samples/ocl PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/python/CMakeLists.txt --- OpenCV-2.4.3-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 +++ OpenCV-2.4.3/samples/python/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt +# ------------------------------------------------------------------------- + +file(GLOB PYTHON_SAMPLES *.py) +if(NOT WIN32) +install(FILES ${PYTHON_SAMPLES} + DESTINATION share/OpenCV/samples/python + PERMISSIONS OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +endif() diff -urN OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt OpenCV-2.4.3/samples/python2/CMakeLists.txt --- OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 +++ OpenCV-2.4.3/samples/python2/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt +# ------------------------------------------------------------------------- + +file(GLOB PYTHON_SAMPLES *.py) +if(NOT WIN32) +install(FILES ${PYTHON_SAMPLES} + DESTINATION share/OpenCV/samples/python2 + PERMISSIONS OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +endif() ++++++ opencv-underlinking.patch ++++++ diff -urN OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake --- OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake 2012-05-31 17:05:39.000000000 +0300 +++ OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake 2012-06-08 11:26:23.643869881 +0300 @@ -75,6 +75,7 @@ ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2) if(WITH_V4L) CHECK_MODULE(libv4l1 HAVE_LIBV4L) + CHECK_MODULE(libv4l2 HAVE_LIBV4L2) CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) endif(WITH_V4L) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
