opencv: Bump SRCREV, explicitly build with ffmpeg

diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index 4eeb39486f4150710b8245f4cee0fcdb70f5df6c..429510c086e73de84f50c50089ea2395d75b882e 100644 (file)
--- 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 3bfa33cd9dc1be0a00fe7b1d9fe182436be78ccf..ce54d8c773e2bc2b09e2da06660ce1a6cd24bdff 100644 (file)
--- 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 \