Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c274fc07130ca6254404163ebe34b1581d348e20
commit c274fc07130ca6254404163ebe34b1581d348e20 Author: Devil505 <devil505li...@gmail.com> Date: Sun Apr 17 18:35:41 2011 +0200 opencv-2.2.0-1-i686 * new package diff --git a/source/xmultimedia-extra/opencv/FrugalBuild b/source/xmultimedia-extra/opencv/FrugalBuild new file mode 100644 index 0000000..ee66ec7 --- /dev/null +++ b/source/xmultimedia-extra/opencv/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 3.38 SBU +# Maintainer: Devil505 <devil505li...@gmail.com> + +pkgname=opencv +pkgver=2.2.0 +pkgrel=1 +pkgdesc="Intel(R) Open Source Computer Vision Library" +url="http://opencv.willowgarage.com"; +depends=('jasper' 'gst-plugins-base' 'openexr' \ + 'gtk+2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('doxygen' 'numpy' 'eigen') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_name="OpenCV" +_F_sourceforge_dirname="opencvlibrary" +_F_cmake_confopts="-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_XINE=ON \ + -DWITH_UNICAP=OFF \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_TESTS=OFF \ + -DINSTALL_C_EXAMPLES=ON \ + -DINSTALL_PYTHON_EXAMPLES=ON" +Finclude sourceforge cmake +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +_F_cd_path="$_F_sourceforge_name-$pkgver" +source=($source ptrcvcapture.patch OpenCV-2.2-nov4l1.patch) +sha1sums=('984ed71672d50391d0617fce2ef58e7590ec0fd7' \ + '7f49f7b25d93b734435dc572b65f0e2f45f42645' \ + '40987ad833f6b44cfca6cd19eb0dcc758afce64c') + +# optimization OK diff --git a/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch b/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch new file mode 100644 index 0000000..cacdd77 --- /dev/null +++ b/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch @@ -0,0 +1,25 @@ +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2011-02-02 16:55:22.844244001 +0100 ++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-02-02 16:53:22.224244002 +0100 +@@ -214,7 +214,9 @@ make & enjoy! + #include <sys/types.h> + #include <sys/mman.h> + ++#ifdef HAVE_CAMV4L + #include <linux/videodev.h> ++#endif + + #include <string.h> + #include <stdlib.h> +diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 2011-02-04 15:10:51.461243999 +0100 ++++ OpenCV-2.2.0/modules/highgui/src/cap.cpp 2011-02-04 15:11:22.040244001 +0100 +@@ -171,7 +171,7 @@ CV_IMPL CvCapture * cvCreateCameraCaptur + if (capture) + return capture; + #endif +- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2) ++ #if defined (HAVE_CAMV4L) + capture = cvCreateCameraCapture_V4L (index); + if (capture) + return capture; diff --git a/source/xmultimedia-extra/opencv/ptrcvcapture.patch b/source/xmultimedia-extra/opencv/ptrcvcapture.patch new file mode 100644 index 0000000..c1316f0 --- /dev/null +++ b/source/xmultimedia-extra/opencv/ptrcvcapture.patch @@ -0,0 +1,17 @@ +Index: modules/highgui/src/cap.cpp +=================================================================== +--- modules/highgui/src/cap.cpp (revision 4283) ++++ modules/highgui/src/cap.cpp (working copy) +@@ -52,10 +52,10 @@ + namespace cv + { + +-template<> inline void Ptr<CvCapture>::delete_obj() ++template<> void Ptr<CvCapture>::delete_obj() + { cvReleaseCapture(&obj); } + +-template<> inline void Ptr<CvVideoWriter>::delete_obj() ++template<> void Ptr<CvVideoWriter>::delete_obj() + { cvReleaseVideoWriter(&obj); } + + } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
