Wed Nov 21 01:32:09 PST 2012

1 files changed, 26 insertions, 24 deletions

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index cdeadc91c..60b93e686 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170692 2012-11-09 19:50:58Z schiv $
+# $Id: PKGBUILD 171611 2012-11-20 13:12:19Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -6,17 +6,19 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
 depends=('jasper' 'gstreamer0.10-base' 'intel-tbb'
-         'xine-lib' 'libdc1394' 'openexr' 'gtk2')
-makedepends=('cmake' 'python2-numpy' 'eigen2')
+         'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'eigen2'
+             'libcl' 'opencl-headers' 'mesa')
 optdepends=('opencv-docs'
             'opencv-samples'
             'eigen2'
+            'libcl'
             'python2-numpy: Python 2.x interface')
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
         'pkgconfig.patch'
@@ -25,23 +27,23 @@ md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
          'cb916260b5ec594fe7a0cc2e54fc569f'
          '35256e3ccace373feba8131d1540a0de')
 
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
+_cmakeopts=('-D WITH_OPENCL=ON'
+            '-D WITH_OPENGL=ON'
+            '-D WITH_TBB=ON'
+            '-D WITH_XINE=ON'
+            '-D ENABLE_SSE=OFF'
+            '-D ENABLE_SSE2=OFF'
+            '-D ENABLE_SSE3=OFF'
+            '-D BUILD_PACKAGE=OFF'
+            '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
+            '-D BUILD_PERF_TESTS=OFF'
             '-D BUILD_EXAMPLES=ON'
             '-D INSTALL_C_EXAMPLES=ON'
             '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=ON'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
+            '-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
@@ -87,11 +89,11 @@ package_opencv-docs() {
   cd "$srcdir"
 
   mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/$pkgname"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -102,12 +104,12 @@ package_opencv-samples() {
 
   cd "$srcdir"
 
-  mkdir -p "$pkgdir/usr/share/$pkgname"
-  cp -r opencv-samples "$pkgdir/usr/share/$pkgname/samples"
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: