summaryrefslogtreecommitdiff
path: root/recipes/opencv
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-04-23 20:25:15 +0200
committerKoen Kooi <koen@openembedded.org>2010-04-23 20:26:07 +0200
commit6246a13e68dd67d7b2317c26ed0cedbc3e595372 (patch)
treebdde2c67189744b962f5f49b62b7d4c5fea2b10f /recipes/opencv
parentfa68e1521429c3f680b6c8f96e4cce58c7388759 (diff)
opencv + samples: update to 2.1.0
Diffstat (limited to 'recipes/opencv')
-rw-r--r--recipes/opencv/opencv-samples_svn.bb6
-rw-r--r--recipes/opencv/opencv_svn.bb20
2 files changed, 10 insertions, 16 deletions
diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index c52f00adf4..5acdc4e52f 100644
--- a/recipes/opencv/opencv-samples_svn.bb
+++ b/recipes/opencv/opencv-samples_svn.bb
@@ -6,11 +6,11 @@ LICENSE = "GPLv2"
DEPENDS = "opencv"
-SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
+SRC_URI = "svn://code.ros.org/svn/opencv/trunk;module=opencv;proto=https \
"
-SRCREV = "2219"
-PV = "2.0.0+svnr${SRCPV}"
+SRCREV = "2997"
+PV = "2.1.0+svnr${SRCPV}"
S = "${WORKDIR}/opencv"
diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb
index 1e63e1f6d0..25e469cc9d 100644
--- a/recipes/opencv/opencv_svn.bb
+++ b/recipes/opencv/opencv_svn.bb
@@ -8,15 +8,15 @@ ARM_INSTRUCTION_SET = "arm"
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"
+SRC_URI = "svn://code.ros.org/svn/opencv/trunk;module=opencv;proto=https \
+"
-SRCREV = "2219"
-PV = "2.0.0+svnr${SRCPV}"
+SRCREV = "2997"
+PV = "2.1.0+svnr${SRCPV}"
S = "${WORKDIR}/opencv"
-inherit distutils-base autotools_stage pkgconfig cmake
+inherit distutils-base autotools pkgconfig cmake
EXTRA_OECONF = " \
--disable-debug \
@@ -38,12 +38,6 @@ export HOST_SYS
export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON=${STAGING_BINDIR_NATIVE}/python
-do_configure_prepend() {
- cp ${WORKDIR}/acinclude.m4 ${S}
- sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
- sed -i -e s:samples::g -e 's: doc::g' ${S}/Makefile.am
-}
-
TARGET_CC_ARCH += "-I${S}/include "
PACKAGES += "${PN}-apps python-opencv"
@@ -67,6 +61,6 @@ DESCRIPTION_python-opencv = "Python bindings to opencv"
FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*"
RDEPENDS_python-opencv = "python-core"
-do_stage_append() {
- cp ${S}/include/opencv/*.h ${STAGING_INCDIR}/opencv/
+do_install_append() {
+ cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
}