From 1926012812fbccd5441b0f87f543e91d84480666c123a4a196aab2890b211545 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 25 Apr 2010 16:45:15 +0000 Subject: [PATCH] Accepting request 38605 from KDE:KDE4:Factory:Desktop Copy from KDE:KDE4:Factory:Desktop/opencv based on submit request 38605 from user llunak OBS-URL: https://build.opensuse.org/request/show/38605 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=6 --- opencv.changes | 30 ++++++++++++++++++++++++++++++ opencv.spec | 32 +++++++++++++++++++------------- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/opencv.changes b/opencv.changes index a4efd8f..af84770 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +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 diff --git a/opencv.spec b/opencv.spec index d0070c3..d236bc3 100644 --- a/opencv.spec +++ b/opencv.spec @@ -22,7 +22,7 @@ Name: opencv %define libname lib%{name} %define soname 2 Version: 2.1.0 -Release: 1 +Release: 2 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: BSD3c @@ -32,7 +32,12 @@ Patch0: %{name}-2.1-libdir.patch Patch1: %{name}-2.1-samples.patch Patch2: libpng14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gstreamer-0_10-devel libdc1394-devel libv4l-devel libxine-devel +BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel +%if 0%{?suse_version} >= 1110 +BuildRequires: libdc1394-devel libv4l-devel libxine-devel +%else +BuildRequires: xine-devel +%endif BuildRequires: gtk2-devel libjasper-devel libjpeg-devel libtiff-devel BuildRequires: cmake gcc-c++ libpng-devel python-devel swig zlib-devel %if %{with ffmpeg} @@ -55,15 +60,15 @@ 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 -n %{libname}-devel - +%package devel +License: BSD3c Summary: Development files for using the OpenCV library Group: Development/Libraries Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} -%description -n %{libname}-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. @@ -94,7 +99,7 @@ This package contains the old Python bindings for the OpenCV library. Summary: Documentation and examples for OpenCV Group: Documentation # Since this package also contains examples that need -devel to be compiled -Recommends: %{libname}-devel +Recommends: %{name}-devel %description -n %{name}-doc This package contains the documentation and examples for the OpenCV library. @@ -107,7 +112,10 @@ This package contains the documentation and examples for the OpenCV library. # 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/python/camshift.py +sed -i 's/\r$//' samples/c/adaptiveskindetector.cpp \ + samples/c/calibration_artificial.cpp \ + samples/c/grabcut.cpp \ + samples/python/camshift.py %build export CFLAGS=$RPM_OPT_FLAGS @@ -119,10 +127,8 @@ cmake -DCMAKE_SKIP_RPATH=ON \ -DLIB_SUFFIX=$(echo %_lib | cut -b4-) \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_OMIT_FRAME_POINTER=OFF \ - -DUSE_MMX=OFF \ - -DUSE_SSE=OFF \ - -DUSE_SSE2=OFF \ - -DUSE_SSE3=OFF \ + -DWITH_XINE=ON \ + -DBUILD_TESTS=OFF \ -DBUILD_SWIG_PYTHON_SUPPORT=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ @@ -144,7 +150,7 @@ rm -rf %{buildroot} %postun -n %{libname}%{soname} -p /sbin/ldconfig %files -n %{libname}%{soname} -%defattr(0644, root, root, 0755) +%defattr(-, root, root, 0755) %{_libdir}/lib*.so.* %files -n %{name} @@ -153,7 +159,7 @@ rm -rf %{buildroot} %{_datadir}/%{name} %exclude %{_datadir}/%{name}/OpenCVConfig.cmake -%files -n %{libname}-devel +%files devel %defattr(0644, root, root, 0755) %{_includedir}/%{name} %{_libdir}/lib*.so