[Lunar-commits] <moonbase> opencv: Version bump, and they have switched to cmake; adjusting BUILD to suit.

[Dennis `stumbles` Veatch]

commit e4f1b2450ad5c5ec116de1a18ecf030f09539afb
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Sep 22 18:46:21 2009 -0400

    opencv: Version bump, and they have switched to cmake; adjusting BUILD to suit.
---
 libs/opencv/BUILD   |   16 +++++++---------
 libs/opencv/DETAILS |   12 ++++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/libs/opencv/BUILD b/libs/opencv/BUILD
index 6f4fe73..330be56 100644
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,14 +1,12 @@
 (
 
-  sedit "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:g" configure otherlibs/highgui/cvcap_ffmpeg.cpp
-  sedit "s:ffmpeg/avformat.h:libavformat/avformat.h:g" otherlibs/highgui/cvcap_ffmpeg.cpp
-  sedit "s:ffmpeg/swscale.h:libswscale/swscale.h:g" otherlibs/highgui/cvcap_ffmpeg.cpp configure
-  sedit "s:libdc1394/dc1394_control.h:dc1394/control.h:g" configure otherlibs/highgui/cvcap_dc1394.cpp
-  sedit "s:-ldc1394_control:-lcontrol:g" configure
-  sedit "s:dc1394_control:control:g" configure
-#  sedit "s:<ImfCRgbaFile.h:<OpenEXR/ImfCRgbaFile.h:g" configure
-
-  patch_it  $SOURCE_CACHE/$SOURCE2 0 &&
+  OOT_BUILD="$SOURCE_DIRECTORY/$MODULE-build"
+
+  mkdir $OOT_BUILD  &&
+  cd $OOT_BUILD     &&
+
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+                           -DCMAKE_BUILD_TYPE=RELEASE            &&
 
   default_build
 
diff --git a/libs/opencv/DETAILS b/libs/opencv/DETAILS
index bb48035..c6fd79c 100644
--- a/libs/opencv/DETAILS
+++ b/libs/opencv/DETAILS
@@ -1,15 +1,15 @@
           MODULE=opencv
-         VERSION=1.1pre1
-          SOURCE=$MODULE-$VERSION.tar.gz
+         VERSION=1.2.0
+          SOURCE=OpenCV-$VERSION.tar.bz2
          SOURCE2=opencv-1.1.0-cvcap_xine.diff
-      SOURCE_URL=$SFORGE_URL/opencvlibrary/
+      SOURCE_URL=$SFORGE_URL/opencvlibrary/opencv-unix/2.0beta/OpenCV-1.2.0.tar.bz2
      SOURCE2_URL=$PATCH_URL
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/opencv-1.1.0
-      SOURCE_VFY=sha1:4bc4bda92a250adcb82b236161d364c059021a43
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenCV-$VERSION
+      SOURCE_VFY=sha15c677ceb38c30bc6465a70d0abd0de22cd870d81:
      SOURCE2_VFY=sha1:6ad661f4c610b2ad75840395246460293648dd72
         WEB_SITE=http://opencv.willowgarage.com/wiki/
          ENTERED=20050404
-         UPDATED=20090601
+         UPDATED=20090922
            SHORT="Open Source Computer Vision Library"
 
 cat << EOF