Seem configure is NOT needed at all here. So you should set below in yaml file rather than removing configure manually Configure: none
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Topi Santakivi > Sent: Tuesday, December 28, 2010 11:04 PM > To: [email protected] > Subject: [meego-commits] 11297: Changes to Trunk:Testing/OpenCV > > Hi, > I have made the following changes to OpenCV in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Topi Santakivi > > [This message was auto-generated] > > --- > > Request #11297: > > submit: home:tosantak:branches:TrunkTesting/OpenCV(r25) -> > Trunk:Testing/OpenCV > > > Message: > * Tue Dec 28 2010 Topi Santakivi <[email protected]> - 2.2.0 > - Updated to 2.2.0 (BMC#10513) > - 0001-use-exp-instead-of-expl.patch for making 2.2.0 compile on arm > (BMC#10513) > - added cmake & python-numeric to PkgBR > - build commands for cmake > - updated %files section to match 2.2.0 > > State: new 2010-12-28T07:04:08 tosantak > Comment: None > > > > changes files: > -------------- > --- OpenCV.changes > +++ OpenCV.changes > @@ -0,0 +1,7 @@ > +* Tue Dec 28 2010 Topi Santakivi <[email protected]> - 2.2.0 > +- Updated to 2.2.0 (BMC#10513) > +- 0001-use-exp-instead-of-expl.patch for making 2.2.0 compile on arm > (BMC#10513) > +- added cmake & python-numeric to PkgBR > +- build commands for cmake > +- updated %files section to match 2.2.0 > + > > old: > ---- > OpenCV-2.0.0.tar.bz2 > > new: > ---- > 0001-use-exp-instead-of-expl.patch > OpenCV-2.2.0.tar.bz2 > > spec files: > ----------- > --- OpenCV.spec > +++ OpenCV.spec > @@ -1,19 +1,20 @@ > # > -# Do not Edit! Generated by: > -# spectacle version 0.16 > +# Do NOT Edit the Auto-generated Part! > +# Generated by: spectacle version 0.21 > # > # >> macros > # << macros > > Name: OpenCV > Summary: Open Source Computer Vision Library > -Version: 2.0.0 > +Version: 2.2.0 > Release: 1 > Group: System/Libraries > License: BSD > URL: http://opencv.willowgarage.com/wiki/Welcome > Source0: %{name}-%{version}.tar.bz2 > Source100: OpenCV.yaml > +Patch0: 0001-use-exp-instead-of-expl.patch > Requires(post): /sbin/ldconfig > Requires(postun): /sbin/ldconfig > BuildRequires: pkgconfig(gtk+-2.0) > @@ -24,6 +25,9 @@ > BuildRequires: gettext-devel > BuildRequires: python-devel > BuildRequires: libjpeg-devel > +BuildRequires: cmake > +BuildRequires: python-numeric > + > > %description > Description: %{summary} > @@ -41,6 +45,8 @@ > %prep > %setup -q -n %{name}-%{version} > > +# 0001-use-exp-instead-of-expl.patch > +%patch0 -p1 > # >> setup > # << setup > > @@ -49,12 +55,12 @@ > %ifarch %{ix86} > export CXXFLAGS="%{__global_cflags} -m32 -fasynchronous-unwind-tables" > %endif > -# << build pre > > -%configure --disable-static \ > - --with-gtk \ > - --with-gstreamer \ > - --with-python > +# Create the build dir for cmake > +mkdir build > +cd build > +cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr -D > BUILD_SHARED_LIBS:BOOL=ON -D BUILD_TESTS:BOOL=OFF -D > BUILD_NEW_PYTHON_SUPPORT:BOOL=ON .. > +# << build pre > > make %{?jobs:-j%jobs} > > @@ -63,6 +69,7 @@ > %install > rm -rf %{buildroot} > # >> install pre > +cd build > # << install pre > %make_install > > @@ -82,12 +89,11 @@ > %files > %defattr(-,root,root,-) > # >> files > -%doc README COPYING AUTHORS NEWS > +%doc README > %{_libdir}/lib*.so.* > -%{_libdir}/python2.6/site-packages/opencv > +%{_libdir}/python2.6/site-packages/cv.so > %{_bindir}/opencv* > %{_datadir}/opencv/haarcascades > -%{_datadir}/opencv/readme.txt > # << files > > > @@ -97,6 +103,7 @@ > %{_libdir}/pkgconfig/*.pc > %{_libdir}/lib*.so > %{_includedir}/opencv > -%{_datadir}/opencv/samples > +%{_includedir}/opencv2 > +%{_datadir}/opencv > # << files devel > > > other changes: > -------------- > > ++++++ 0001-use-exp-instead-of-expl.patch (new) > --- 0001-use-exp-instead-of-expl.patch > +++ 0001-use-exp-instead-of-expl.patch > +diff -Naur a/CMakeLists.txt b/CMakeLists.txt > +--- a/CMakeLists.txt 2010-12-28 16:26:18.782847000 +0200 > ++++ b/CMakeLists.txt 2010-12-28 16:26:25.474847001 +0200 > +@@ -235,6 +235,7 @@ > + # We can use only -O2 because the -O3 causes gcc crash > + set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") > + set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for > GCC") > ++ add_definitions(-D ARM_ALL=1) > + endif() > + > + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) > +diff -Naur a/modules/ml/src/gbt.cpp b/modules/ml/src/gbt.cpp > +--- a/modules/ml/src/gbt.cpp 2010-12-28 16:26:19.066847002 +0200 > ++++ b/modules/ml/src/gbt.cpp 2010-12-28 16:26:25.674846999 +0200 > +@@ -11,7 +11,7 @@ > + #define CV_CMP_FLOAT(a,b) ((a) < (b)) > + static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float) > + > +-#if ANDROID > ++#if (ANDROID || ARM_ALL) > + #define expl(x) exp(x) > + #endif > + > > ++++++ OpenCV-2.0.0.tar.bz2 -> OpenCV-2.2.0.tar.bz2 > 2345804 lines of diff (skipped) > > ++++++ OpenCV.yaml > --- OpenCV.yaml > +++ OpenCV.yaml > @@ -1,27 +1,26 @@ > Name: OpenCV > Summary: Open Source Computer Vision Library > -Version: 2.0.0 > +Version: 2.2.0 > Release: 1 > Group: System/Libraries > License: BSD > URL: http://opencv.willowgarage.com/wiki/Welcome > Sources: > - "%{name}-%{version}.tar.bz2" > - > +Patches: > + - 0001-use-exp-instead-of-expl.patch > PkgBR: > - gettext-devel > - python-devel > - libjpeg-devel > + - cmake > + - python-numeric > PkgConfigBR: > - gtk+-2.0 > - gstreamer-0.10 > - gstreamer-base-0.10 > - gstreamer-plugins-base-0.10 > - libpng > -ConfigOptions: > - - --with-gtk > - - --with-gstreamer > - - --with-python > SubPackages: > - Name: devel > Summary: OpenCV Development > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
