[arch-commits] Commit in opencv/trunk (4 files)
Date: Tuesday, November 12, 2013 @ 22:42:45
Author: schiv
Revision: 199448
upgpkg: opencv 2.4.7-1
upstream release
Modified:
opencv/trunk/PKGBUILD
opencv/trunk/fsh.patch
opencv/trunk/pkgconfig.patch
Deleted:
opencv/trunk/cldetect.patch
-+
PKGBUILD| 25
cldetect.patch | 23 ---
fsh.patch | 111 +++---
pkgconfig.patch | 12 ++---
4 files changed, 87 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-12 20:29:19 UTC (rev 199447)
+++ PKGBUILD2013-11-12 21:42:45 UTC (rev 199448)
@@ -4,9 +4,8 @@
pkgbase=opencv
pkgname=('opencv' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.4.6.1
-pkgrel=3
+pkgver=2.4.7
+pkgrel=1
pkgdesc=Open Source Computer Vision Library
arch=('i686' 'x86_64')
license=('BSD')
@@ -20,12 +19,10 @@
'python2-numpy: Python 2.x interface')
source=(http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz;
'pkgconfig.patch'
-'fsh.patch'
-'cldetect.patch')
-md5sums=('d756bfa460891697571d5c90050e1cfe'
- 'cb916260b5ec594fe7a0cc2e54fc569f'
- '35256e3ccace373feba8131d1540a0de'
- '0dd6572405adc2387ded4c95be0f189c')
+'fsh.patch')
+md5sums=('33a12a8bba6e6dc32c97298c99b083b2'
+ 'c7cea48ed7d4f729ebdb9673bac41bd3'
+ 'c597598d142dd34d0eb4af7d6e9779d8')
_cmakeopts=('-D WITH_OPENCL=ON'
'-D WITH_OPENGL=ON'
@@ -53,18 +50,14 @@
prepare() {
cd $srcdir/$pkgname-$pkgver
- # fix missing opencl module
- # see https://bugs.archlinux.org/task/36076
- # and http://code.opencv.org/issues/3140
- patch -Np1 -i $srcdir/cldetect.patch
-
- # fix pkg-config mess
+ # hack-fix pkg-config mess
# see https://bugs.archlinux.org/task/32430
# and http://code.opencv.org/issues/1925
patch -Np1 -i $srcdir/pkgconfig.patch
- # fix another upstream mess that they won't fix
+ # hack-fix folder naming inconsistency that they won't fix
# see http://code.opencv.org/issues/2512
+ # and https://bugs.archlinux.org/task/32342
patch -Np1 -i $srcdir/fsh.patch
# no longer including docs, see https://bugs.archlinux.org/task/34185
Deleted: cldetect.patch
===
--- cldetect.patch 2013-11-12 20:29:19 UTC (rev 199447)
+++ cldetect.patch 2013-11-12 21:42:45 UTC (rev 199448)
@@ -1,23 +0,0 @@
-diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake
opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 2013-07-11
18:57:27.363199736 +
-+++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake2013-07-11
19:04:00.577069207 +
-@@ -17,8 +17,7 @@
- NAMES OpenCL/cl.h CL/cl.h
- HINTS ${OPENCL_ROOT_DIR}
- PATH_SUFFIXES include include/nvidia-current
-- DOC OpenCL include directory
-- NO_DEFAULT_PATH)
-+ DOC OpenCL include directory)
-
- if (X86_64)
- set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
-@@ -30,8 +29,7 @@
- NAMES OpenCL
- HINTS ${OPENCL_ROOT_DIR}
- PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
-- DOC OpenCL library
-- NO_DEFAULT_PATH)
-+ DOC OpenCL library)
-
- mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
- include(FindPackageHandleStandardArgs)
Modified: fsh.patch
===
--- fsh.patch 2013-11-12 20:29:19 UTC (rev 199447)
+++ fsh.patch 2013-11-12 21:42:45 UTC (rev 199448)
@@ -1,7 +1,7 @@
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-05
18:42:32.460958392 +
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake2012-11-05
18:52:43.766689315 +
-@@ -47,7 +47,7 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake
opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12
20:31:27.253763202 +
opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake2013-11-12
20:31:54.923577113 +
+@@ -46,7 +46,7 @@
#need better solution
if(libpath MATCHES 3rdparty)
@@ -10,10 +10,22 @@
else()
set(installDir ${OPENCV_LIB_INSTALL_PATH})
endif()
-diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
OpenCV-2.4.3.orig/CMakeLists.txt 2012-11-05 18:42:32.700956757 +
-+++ OpenCV-2.4.3/CMakeLists.txt2012-11-05 18:55:42.358787848 +
-@@ -221,9 +221,9 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake
opencv-2.4.7/cmake/OpenCVModule.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake 2013-11-12 20:31:27.253763202
+
[arch-commits] Commit in opencv/trunk (4 files)
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
===
--- PKGBUILD2011-04-18 18:02:58 UTC (rev 120047)
+++ PKGBUILD2011-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.patch2011-04-18 18:02:58 UTC (rev 120047)
+++ libpng-1.4.patch2011-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.cpp2010-01-21
01:08:46.0 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-01-21 01:13:11.0
-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.patch2011-04-18 18:02:58 UTC (rev 120047)
+++ nov4l1.patch2011-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.nov4l12011-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.nov4l12011-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.patch2011-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.nov4l12010-12-05
11:35:25.0 +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
+---
