[Lunar-commits] <moonbase> opencv: Removing some unused options, fixing some option typos and adjusting the BUILD.

[Dennis `stumbles` Veatch]

commit f00d86fda5b8f906430e3dd406011f6352346136
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed May 11 19:33:21 2011 -0400

    opencv: Removing some unused options, fixing some option typos and adjusting the BUILD.
---
 libs/opencv/BUILD   |   12 ++--------
 libs/opencv/DEPENDS |   53 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/libs/opencv/BUILD b/libs/opencv/BUILD
index 8a79e3f..92ab59c 100644
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,14 +1,8 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-RELEASE" &&
-
-  mkdir $OOTB_DIR  &&
-  cd $OOTB_DIR   &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX         \
-                           -DCMAKE_BUILD_TYPE=RELEASE                    \
-                           -DCMAKE_OPENCV_WHOLE_PROGRAM_OPTIMIZATION=ON  \
-                           $OPTS                                        &&
+  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX         \
+        -DCMAKE_BUILD_TYPE=RELEASE                    \
+        $OPTS .                                      &&
 
   default_make
 
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index fcae0db..b78d746 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -1,11 +1,30 @@
-depends gtk+-2
-depends libpng
-depends %JPEG
-depends tiff
+optional_depends libpng       "-DWITH_PNG=ON"    \
+                              "-DWITH_PNG=OFF"   \
+                              "for png graphics support"
 
-optional_depends Python       "-DCMAKE_BUILD_NEW_PYTHON_SUPPORT=ON"  \
-                              "-DCMAKE_BUILD_NEW_PYTHON_SUPPORT=OFF" \
-                              "for Python binding support"
+optional_depends gtk+-2       "-DWITH_GTK=ON"     \
+                              "-DWITH_GTK=OFF"    \
+                              "for gtk+-2 graphics support"
+
+optional_depends eigen        "-DWITH_EIGEN2=ON"    \
+                              "-DWITH_EIGEN2=OFF"   \
+                              "for linear algebra libraries support"
+
+optional_depends jasper       "-DWITH_JASPER=ON"   \
+                              "-DWITH_JASPER=OFF"  \
+                              "for JPEG-2000 Part-1 support"
+
+optional_depends %JPEG        "-DWITH_JPEG=ON"    \
+                              "-DWITH_JPEG=OFF    \
+                              "for jpeg graphics support"
+
+optional_depends qt4          "-DWITH_QT=ON WITH_QT_OPENGL=ON"      \
+                              "-DWITH_QT=OFF WITH_QT_OPENGL=OFF"    \
+                              "Build with Qt Backend support"
+
+optional_depends tiff         "-DWITH_TIFF=ON"     \
+                              "-DWITH_TIFF=OFF     \
+                              "for tiff graphics support"
 
 optional_depends ffmpeg       "-DWITH_FFMPEG=ON"  \
                               "-DWITH_FFMPEG=OFF" \
@@ -19,19 +38,17 @@ optional_depends %XINELIB     "-DWITH_XINE=ON"  \
                               "-DWITH_XINE=OFF" \
                               "for xine video support"
 
-optional_depends octave       "-D_BUILD_OCTAVE_SUPPORT=ON"  \
-                              "-DBUILD_OCTAVE_SUPPORT=OFF" \
-                              "for octave language support"
-
-optional_depends libdc1394    "-DCMAKE_WITH_1394=ON"   \
-                              "-DCMAKE_WITH_1394=OFF"  \
+optional_depends libdc1394    "-DWITH_1394=ON"   \
+                              "-DWITH_1394=OFF"  \
                               "for firewire support"
 
-optional_depends swig         "-DBUILD_SWIG_PYTHON_SUPPORT=ON"  \
-                              "-DBUILD_SWIG_PYTHON_SUPPORT=OFF" \
-                              "for swig support"
-
-#For now say no.
 optional_depends unicap       "-DWITH_UNICAP=ON"    \
                               "-DWITH_UNICAP=OFF"  \
                               "for additional video capture support"
+
+optional_depends              "v4l-utils"          \
+                              "-DWITH_V4L=ON"      \
+                              "-DWITH_V4L=OFF"     \
+                              "for v4l video support"
+
+