diff options
| author | root <root@rshg054.dnsready.net> | 2013-07-13 01:48:00 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-07-13 01:48:00 -0700 |
| commit | c9952f3a144d9fb19917d7c100dca30d2d99f629 (patch) | |
| tree | 94cc27a7d3077f0c571751f92f5cc6261d183dd8 /extra/opencv | |
| parent | 0d51c533d75a26daabeb9e7b9c5dcfb211498a4d (diff) | |
Sat Jul 13 01:47:15 PDT 2013
Diffstat (limited to 'extra/opencv')
| -rw-r--r-- | extra/opencv/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/opencv/cldetect.patch | 23 |
2 files changed, 35 insertions, 6 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 60672e423..a3ba155e1 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189712 2013-07-05 15:55:50Z schiv $ +# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> 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 @@ optdepends=('opencv-samples' '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 @@ _cmakeopts=('-D WITH_OPENCL=ON' 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 diff --git a/extra/opencv/cldetect.patch b/extra/opencv/cldetect.patch new file mode 100644 index 000000000..6dbe1608c --- /dev/null +++ b/extra/opencv/cldetect.patch @@ -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) |