Date: Monday, April 18, 2011 @ 16:44:58 Author: schiv Revision: 120048
upgpkg: opencv 2.2.0-5 2.6.38 wrong compat fixed; FS#23826 Added: opencv/trunk/v4l_2.6.38.patch Modified: opencv/trunk/PKGBUILD Deleted: opencv/trunk/libpng-1.4.patch opencv/trunk/nov4l1.patch ------------------+ PKGBUILD | 13 +++++-------- libpng-1.4.patch | 12 ------------ nov4l1.patch | 25 ------------------------- v4l_2.6.38.patch | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 45 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-18 18:02:58 UTC (rev 120047) +++ PKGBUILD 2011-04-18 20:44:58 UTC (rev 120048) @@ -5,7 +5,7 @@ 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 @@ 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 @@ 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 \ Deleted: libpng-1.4.patch =================================================================== --- libpng-1.4.patch 2011-04-18 18:02:58 UTC (rev 120047) +++ libpng-1.4.patch 2011-04-18 20:44:58 UTC (rev 120048) @@ -1,12 +0,0 @@ -diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp ---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 2010-01-21 01:08:46.000000000 -0500 -+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-01-21 01:13:11.000000000 -0500 -@@ -223,7 +223,7 @@ - png_set_palette_to_rgb( png_ptr ); - - if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) -- png_set_gray_1_2_4_to_8( png_ptr ); -+ png_set_expand_gray_1_2_4_to_8( png_ptr ); - - if( CV_MAT_CN(m_type) > 1 && color ) - png_set_bgr( png_ptr ); // convert RGB to BGR Deleted: nov4l1.patch =================================================================== --- nov4l1.patch 2011-04-18 18:02:58 UTC (rev 120047) +++ nov4l1.patch 2011-04-18 20:44:58 UTC (rev 120048) @@ -1,25 +0,0 @@ -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; Added: v4l_2.6.38.patch =================================================================== --- v4l_2.6.38.patch (rev 0) +++ v4l_2.6.38.patch 2011-04-18 20:44:58 UTC (rev 120048) @@ -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>