opencv + samples: update to 2.1.0

diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index c52f00a..5acdc4e 100644 (file)
--- 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 1e63e1f..25e469c 100644 (file)
--- 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/
 }