Date: Wednesday, April 13, 2011 @ 19:48:14 Author: schiv Revision: 119711
upgpkg: opencv 2.2.0-4 gcc 4.6 compat; FS#23741, no-v4l1 kernel compat Added: opencv/trunk/gcc46.patch opencv/trunk/nov4l1.patch Modified: opencv/trunk/PKGBUILD --------------+ PKGBUILD | 18 +++++++++++++++--- gcc46.patch | 10 ++++++++++ nov4l1.patch | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-13 22:46:00 UTC (rev 119710) +++ PKGBUILD 2011-04-13 23:48:14 UTC (rev 119711) @@ -5,7 +5,7 @@ pkgname=opencv _realname=OpenCV pkgver=2.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -18,9 +18,13 @@ 'python2-numpy') options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 - ptrcvcapture.patch) + ptrcvcapture.patch + gcc46.patch + nov4l1.patch) md5sums=('122c9ac793a46854ef2819fedbbd6b1b' - '461a8b1b0f2264521e13d9ae051d13be') + '461a8b1b0f2264521e13d9ae051d13be' + 'b5fb8d6786578ae7bf272615279e8865' + '0164bdbd54ee28b1f6cba20fcfd53812') build() { cd "$srcdir/$_realname-$pkgver" @@ -41,6 +45,14 @@ # see https://bugs.archlinux.org/task/22841 patch -Np0 -i "$srcdir/ptrcvcapture.patch" + # gcc 4.6 compatibility + # see https://bugs.archlinux.org/task/23741 + patch -Np3 -i "$srcdir/gcc46.patch" + + # distro kernel no longer has v4l1 + # see https://code.ros.org/trac/opencv/ticket/862 + patch -Np1 -i "$srcdir/nov4l1.patch" + cmake . -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ Added: gcc46.patch =================================================================== --- gcc46.patch (rev 0) +++ gcc46.patch 2011-04-13 23:48:14 UTC (rev 119711) @@ -0,0 +1,10 @@ +Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp +=================================================================== +--- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804) ++++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861) +@@ -56,4 +56,5 @@ + #include <algorithm> + #include <cmath> ++#include <cstddef> + #include <complex> + #include <map> Added: nov4l1.patch =================================================================== --- nov4l1.patch (rev 0) +++ nov4l1.patch 2011-04-13 23:48:14 UTC (rev 119711) @@ -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;