diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-19 04:14:07 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-19 04:14:07 +0000 |
| commit | 8f4f6fea0e8f06647b3e06c003069c93b5b033b4 (patch) | |
| tree | b1c2eae862fab1f19ba291dcb5569383a01df12a /testing/opencv | |
| parent | 3299b3302e12f5a2b0e85dd625de99454c47664d (diff) | |
Tue Apr 19 04:14:07 UTC 2011
Diffstat (limited to 'testing/opencv')
| -rw-r--r-- | testing/opencv/PKGBUILD | 15 | ||||
| -rw-r--r-- | testing/opencv/v4l_2.6.38.patch | 33 |
2 files changed, 39 insertions, 9 deletions
diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD index b371f6930..b909207c7 100644 --- a/testing/opencv/PKGBUILD +++ b/testing/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119711 2011-04-13 23:48:14Z schiv $ +# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=opencv _realname=OpenCV pkgver=2.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -20,20 +20,17 @@ options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 ptrcvcapture.patch gcc46.patch - nov4l1.patch) + v4l_2.6.38.patch) md5sums=('122c9ac793a46854ef2819fedbbd6b1b' '461a8b1b0f2264521e13d9ae051d13be' 'b5fb8d6786578ae7bf272615279e8865' - '0164bdbd54ee28b1f6cba20fcfd53812') + '82c8a8a76275acd4a73a4f8e948c3f78') build() { cd "$srcdir/$_realname-$pkgver" # Please do not remove any patches from trunk # - # libpng 1.4 compatibility - #patch -Np1 -i "$srcdir/libpng-1.4.patch" - # fix v4l issue #patch -Np0 -i "$srcdir/v4l-mmap.patch" @@ -50,8 +47,8 @@ build() { 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" + # see https://bugs.archlinux.org/task/23826 + patch -Np1 -i "$srcdir/v4l_2.6.38.patch" cmake . -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/testing/opencv/v4l_2.6.38.patch b/testing/opencv/v4l_2.6.38.patch new file mode 100644 index 000000000..dd23cd133 --- /dev/null +++ b/testing/opencv/v4l_2.6.38.patch @@ -0,0 +1,33 @@ +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 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800 +@@ -214,7 +214,7 @@ + #include <sys/types.h> + #include <sys/mman.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include <string.h> + #include <stdlib.h> +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800 +@@ -224,7 +224,7 @@ + #include "highgui.h" + #include "precomp.hpp" + +-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 ++#if !defined WIN32 && defined HAVE_CAMV4L2 + + #define CLEAR(x) memset (&(x), 0, sizeof (x)) + +@@ -241,7 +241,7 @@ + #include <sys/stat.h> + #include <sys/ioctl.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <linux/videodev2.h> + + #include <libv4l1.h> |