[Lunar-commits] <moonbase> opencv: Adding a patch to fix the BUILD and a few twiddles while in there; along

[Dennis `stumbles` Veatch]

commit 3ec65d4cbf26029ccb7f068944b88d69d9fd74a6
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Jan 7 12:02:08 2010 -0500

    opencv: Adding a patch to fix the BUILD and a few twiddles while in there; along
    
    with some fleshing out of the DEPENDS.
---
 libs/opencv/BUILD   |   17 +++++++++++------
 libs/opencv/DEPENDS |   37 ++++++++++++++++++++++++-------------
 libs/opencv/DETAILS |    5 ++++-
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/libs/opencv/BUILD b/libs/opencv/BUILD
index 330be56..a0e576e 100644
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,13 +1,18 @@
 (
 
-  OOT_BUILD="$SOURCE_DIRECTORY/$MODULE-build"
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-RELEASE" &&
 
-  mkdir $OOT_BUILD  &&
-  cd $OOT_BUILD     &&
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE            &&
+  mkdir $OOTB_DIR  &&
+  cd $OOTB_DIR   &&
 
-  default_build
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX         \
+                           -DCMAKE_BUILD_TYPE=RELEASE                    \
+                           -DCMAKE_OPENCV_BUILD_3RDPARTY_LIBS=TRUE       \
+                           -DCMAKE_OPENCV_WHOLE_PROGRAM_OPTIMIZATION=ON  \
+                           $OPTS                                        &&
+
+  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index edc867e..5761468 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -3,23 +3,34 @@ depends libpng
 depends jpeg   
 depends tiff
 
-optional_depends ffmpeg       "--with-ffmpeg --without-quicktime" "--without-ffmpeg"    \
-                              "for ffmpeg video support.${PROBLEM_COLOR} If y here, say no to gstreamer${DEFAULT_COLOR}"
+optional_depends Python       "-DCMAKE_BUILD_NEW_PYTHON_SUPPORT=ON"  \
+                              "-DCMAKEBUILD_NEW_PYTHON_SUPPORT=OFF" \
+                              "for Python binding support"
 
-optional_depends gstreamer-10 "--with-gstreamer --without-ffmpeg" "--without-gstreamer" \
-                              "for gstreamer support. ${PROBLEM_COLOR}If y here, say no to ffmpeg${DEFAULT_COLOR}"
+optional_depends ffmpeg       "-DCMAKE_WITH_FFMPEG=ON"  \
+                              "-DCMAKE_WITH_FFMPEG=OFF" \
+                              "for ffmpeg video support"
 
-optional_depends %XINELIB     "--with-xine --without-quicktime"   "--without-xine"      "for xine video support"
+optional_depends gstreamer-10 "-DCMAKE_WITH_GSTREAMER=ON"   \
+                              "-DCMAKE_WITH_GSTREAMER=OFF"  \
+                              "for gstreamer support"
 
-#optional_depends octave       "--with-octave"       \
-#                              "--without-octave"    \
-#                              "for octave language support"
+optional_depends %XINELIB     "-DCMAKE_WITH_XINE=ON"  \
+                              "-DCMAKE_WITH_XINE=OFF" \
+                              "for xine video support"
 
-optional_depends libdc1394    "--with-1394libs --without-quicktime" \
-                              "--without-1394libs"                  \
+optional_depends octave       "-DCMAKE_BUILD_OCTAVE_SUPPORT=ON"  \
+                              "-DCMAKE_BUILD_OCTAVE_SUPPORT=OFF" \
+                              "for octave language support"
+
+optional_depends libdc1394    "-DCMAKE_WITH_1394=ON"   \
+                              "-DCMAKE_WITH_1394=OFF"  \
                               "for firewire support"
 
+optional_depends swig         "-DCMAKE_BUILD_SWIG_PYTHON_SUPPORT=ON"  \
+                              "-DCMAKE_BUILD_SWIG_PYTHON_SUPPORT=OFF" \
+                              "for swig support"
 
-optional_depends unicap       "--with-unicap"          \
-                              "--without-unicap"       \
-                              "for additional video capture support"
+optional_depends unicap       "-DCMAKE_WITH_UNICAP=ON"    \
+                               "-DCMAKE_WITH_UNICAP=OFF"  \
+                               "for additional video capture support"
diff --git a/libs/opencv/DETAILS b/libs/opencv/DETAILS
index d5fa2a7..f50195c 100644
--- a/libs/opencv/DETAILS
+++ b/libs/opencv/DETAILS
@@ -1,12 +1,15 @@
           MODULE=opencv
          VERSION=2.0.0
           SOURCE=OpenCV-$VERSION.tar.bz2
+         SOURCE2=OpenCV-2.0.0-cvconfig.h.missing-r2242.diff
       SOURCE_URL=$SFORGE_URL/opencvlibrary/opencv-unix/2.0/
+     SOURCE2_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenCV-$VERSION
       SOURCE_VFY=sha1:2090c2aaff77c3b0cc669c2ee81bea389db0a366
+     SOURCE2_VFY=sha1:f00ca42939af04e3a2d7d881c428eebabc770011
         WEB_SITE=http://opencv.willowgarage.com/wiki/
          ENTERED=20050404
-         UPDATED=20091020
+         UPDATED=20100107
            SHORT="Open Source Computer Vision Library"
 
 cat << EOF