diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2012-01-24 17:53:14 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-24 18:54:45 +0100 |
| commit | 943629369939d13a5e321ef95ca8d3ca7310c962 (patch) | |
| tree | e3c9b49d47c5069fb67c4cd49a526185553be9d7 /meta-oe/recipes-support/opencv | |
| parent | c7c38998ea37adefbc32930e84423ac64fc81c96 (diff) | |
| download | meta-openembedded-943629369939d13a5e321ef95ca8d3ca7310c962.tar.gz | |
opencv: bump SRCREV
opencv doesn't work with libav, so make gstreamer the default
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/opencv')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv-samples_2.3.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.3.bb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.3.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.3.bb index 6664b3f728..89bbc01db6 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.3.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.3.bb @@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a SRC_URI = "svn://code.ros.org/svn/opencv/tags/2.3.1;module=opencv;proto=https \ " -SRCREV = "6923" +SRCREV = "7198" PV = "2.3.1" -PR = "r0" +PR = "r2" S = "${WORKDIR}/opencv" diff --git a/meta-oe/recipes-support/opencv/opencv_2.3.bb b/meta-oe/recipes-support/opencv/opencv_2.3.bb index 76688119c9..0716e0fe4a 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.3.bb @@ -7,21 +7,23 @@ LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a ARM_INSTRUCTION_SET = "arm" -DEPENDS = "python-numpy ffmpeg gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" +DEPENDS = "python-numpy gstreamer gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" SRC_URI = "svn://code.ros.org/svn/opencv/tags/2.3.1;module=opencv;proto=https \ file://opencv/0001-Fix-CMakeLists.txt-numpy-detection.patch \ " -SRCREV = "6923" +SRCREV = "7198" PV = "2.3.1" -PR = "r0" +PR = "r2" S = "${WORKDIR}/opencv" EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIRS=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ -DBUILD_PYTHON_SUPPORT=ON \ + -DWITH_FFMPEG=OFF \ + -DWITH_GSTREAMER=ON \ " inherit distutils-base pkgconfig cmake |