From: Steve Sakoman <steve@sakoman.com>
Date: Mon, 10 Aug 2009 03:52:22 +0000 (-0700)
Subject: opencv: Bump SRCREV, explicitly build with ffmpeg
X-Git-Tag: Release-2010-05/1~2752
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f1515945cb56843e8c0f110310aaa2e735f40f;p=openembedded.git

opencv: Bump SRCREV, explicitly build with ffmpeg
---

diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index 4eeb39486f..429510c086 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 3bfa33cd9d..ce54d8c773 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 \