[oe-commits] Steve Sakoman : opencv: Bump SRCREV, explicitly build with ffmpeg

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 60f1515945cb56843e8c0f110310aaa2e735f40f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=60f1515945cb56843e8c0f110310aaa2e735f40f

Author: Steve Sakoman <steve at sakoman.com>
Date:   Sun Aug  9 20:52:22 2009 -0700

opencv: Bump SRCREV, explicitly build with ffmpeg

---

 recipes/opencv/opencv-samples_svn.bb |    4 ++--
 recipes/opencv/opencv_svn.bb         |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index 4eeb394..429510c 100644
--- a/recipes/opencv/opencv-samples_svn.bb
+++ b/recipes/opencv/opencv-samples_svn.bb
@@ -9,8 +9,8 @@ DEPENDS = "opencv"
 SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
 "
 
-SRCREV = "1820"
-PV = "1.0.0+svnr${SRCREV}"
+SRCREV = "2027"
+PV = "1.0.0+1.1pre1+svnr${SRCREV}"
 
 S = "${WORKDIR}/opencv"
 
diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb
index 3bfa33c..ce54d8c 100644
--- a/recipes/opencv/opencv_svn.bb
+++ b/recipes/opencv/opencv_svn.bb
@@ -6,15 +6,13 @@ LICENSE = "GPLv2"
 
 ARM_INSTRUCTION_SET = "arm"
 
-PR = "r1"
-
 DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 
 SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
            file://acinclude.m4"
 
-SRCREV = "1820"
-PV = "1.0.0+svnr${SRCREV}"
+SRCREV = "2027"
+PV = "1.0.0+1.1pre1+svnr${SRCREV}"
 
 S = "${WORKDIR}/opencv"
 
@@ -24,6 +22,7 @@ EXTRA_OECONF = " \
 		--disable-debug \
 		--with-gtk \
 		--without-quicktime \
+		--with-ffmpeg \
 		--with-gthread \
 		--without-gstreamer \
 		--with-v4l \