[arch-commits] Commit in opencv/trunk (PKGBUILD cldetect.patch)
Ray Rashif
schiv at nymeria.archlinux.org
Fri Jul 12 13:36:56 UTC 2013
Date: Friday, July 12, 2013 @ 15:36:55
Author: schiv
Revision: 189984
upgpkg: opencv 2.4.6.1-1
upstream release
fixes upstream bug FS#36092
added workaround for FS#36076
Added:
opencv/trunk/cldetect.patch
Modified:
opencv/trunk/PKGBUILD
----------------+
PKGBUILD | 16 +++++++++++-----
cldetect.patch | 23 +++++++++++++++++++++++
2 files changed, 34 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-12 13:36:13 UTC (rev 189983)
+++ PKGBUILD 2013-07-12 13:36:55 UTC (rev 189984)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=('opencv' 'opencv-samples')
_realname=OpenCV
-pkgver=2.4.6
+pkgver=2.4.6.1
pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
@@ -20,16 +20,17 @@
'python2-numpy: Python 2.x interface')
source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
'pkgconfig.patch'
- 'fsh.patch')
-md5sums=('c5e8758a419b4f258611b17fc83aafaf'
+ 'fsh.patch'
+ 'cldetect.patch')
+md5sums=('d756bfa460891697571d5c90050e1cfe'
'cb916260b5ec594fe7a0cc2e54fc569f'
- '35256e3ccace373feba8131d1540a0de')
+ '35256e3ccace373feba8131d1540a0de'
+ '0dd6572405adc2387ded4c95be0f189c')
_cmakeopts=('-D WITH_OPENCL=ON'
'-D WITH_OPENGL=ON'
'-D WITH_TBB=ON'
'-D WITH_XINE=ON'
- '-D BUILD_PACKAGE=OFF'
'-D BUILD_WITH_DEBUG_INFO=OFF'
'-D BUILD_TESTS=OFF'
'-D BUILD_PERF_TESTS=OFF'
@@ -52,6 +53,11 @@
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
# see https://bugs.archlinux.org/task/32430
# and http://code.opencv.org/issues/1925
Added: cldetect.patch
===================================================================
--- cldetect.patch (rev 0)
+++ cldetect.patch 2013-07-12 13:36:55 UTC (rev 189984)
@@ -0,0 +1,23 @@
+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 +0000
++++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 19:04:00.577069207 +0000
+@@ -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)
More information about the arch-commits
mailing list