[Lunar-commits] <moonbase> opencv: version bump and a number of changes to BUILD/DEPENDS.

[Dennis 'stumbles' Veatch]

commit e831a2f21099f0cbcda8ae75b6a4247beefb2628
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Mon Jun 1 14:28:20 2009 -0400

    opencv: version bump and a number of changes to BUILD/DEPENDS.
    
    octave and OpenEXR (ImfCRgbaFile) causes the make to barf, so holding
    off on those for now. As noted for ffmpeg vs gstreamer, its one or the
    other. Odd that xine-lib is not included with that but there you have it.
    
    opencv devs are now aware of the pathing issues with ffmpeg and libdc1394.
---
 libs/opencv/BUILD   |   11 ++++++++++-
 libs/opencv/DEPENDS |   28 ++++++++++++++++++++++++----
 libs/opencv/DETAILS |   13 +++++++++----
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/libs/opencv/BUILD b/libs/opencv/BUILD
index 3e25659..6f4fe73 100644
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,6 +1,15 @@
 (
 
-  bad_flags ALL
+  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 &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index 6293a89..8419b20 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -1,5 +1,25 @@
-depends gtk+-2 &&
-depends ffmpeg &&
-depends libpng &&
-depends jpeg   &&
+depends gtk+-2 
+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 gstreamer-10 "--with-gstreamer --without-ffmpeg" "--without-gstreamer" \
+                              "for gstreamer support. ${PROBLEM_COLOR}If y here, say no to ffmpeg${DEFAULT_COLOR}"
+
+optional_depends xine-lib     "--with-xine --without-quicktime"   "--without-xine"      "for xine video support"
+
+#optional_depends octave       "--with-octave"       \
+#                              "--without-octave"    \
+#                              "for octave language support"
+
+optional_depends libdc1394    "--with-1394libs --without-quicktime" \
+                              "--without-1394libs"                  \
+                              "for firewire support"
+
+
+optional_depends unicap       "--with-unicap"          \
+                              "--without-unicap"       \
+                              "for additional video capture support"
diff --git a/libs/opencv/DETAILS b/libs/opencv/DETAILS
index acc9932..bb48035 100644
--- a/libs/opencv/DETAILS
+++ b/libs/opencv/DETAILS
@@ -1,12 +1,17 @@
           MODULE=opencv
-         VERSION=1.0.0
+         VERSION=1.1pre1
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=opencv-1.1.0-cvcap_xine.diff
       SOURCE_URL=$SFORGE_URL/opencvlibrary/
-      SOURCE_VFY=sha1:c7dd500703b0060cedfa049fcb33de0846e631fb
-        WEB_SITE=http://www.intel.com/technology/computing/opencv/index.htm
+     SOURCE2_URL=$PATCH_URL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/opencv-1.1.0
+      SOURCE_VFY=sha1:4bc4bda92a250adcb82b236161d364c059021a43
+     SOURCE2_VFY=sha1:6ad661f4c610b2ad75840395246460293648dd72
+        WEB_SITE=http://opencv.willowgarage.com/wiki/
          ENTERED=20050404
-         UPDATED=20061225
+         UPDATED=20090601
            SHORT="Open Source Computer Vision Library"
+
 cat << EOF
 This library is mainly aimed at real time computer vision.
 Some example areas would be  Human-Computer Interaction (HCI);