opencv: upstream moved to svn, update recipes

2 files changed, 21 insertions, 14 deletions

diff --git a/recipes/opencv/opencv-samples_cvs.bb b/recipes/opencv/opencv-samples_svn.bb
index 0490f8b015..4eeb39486f 100644
--- a/recipes/opencv/opencv-samples_cvs.bb
+++ b/recipes/opencv/opencv-samples_svn.bb
@@ -4,14 +4,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
-PR = "r2"
-
 DEPENDS = "opencv"
 
-SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
 "
-SRCDATE = "20081115"
-PV = "1.0.0+cvs${SRCDATE}"
+
+SRCREV = "1820"
+PV = "1.0.0+svnr${SRCREV}"
 
 S = "${WORKDIR}/opencv"
 
@@ -21,13 +20,13 @@ do_install() {
 
     for i in *.c; do
         echo "compiling $i"
-        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv`;
-		install -m 0755 `basename $i .c` ${D}/${bindir}
+        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true
+		install -m 0755 `basename $i .c` ${D}/${bindir} || true
 	done
     for i in *.cpp; do
         echo "compiling $i"
-        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv`;
-		install -m 0755 `basename $i .cpp` ${D}/${bindir}    
+        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true
+		install -m 0755 `basename $i .cpp` ${D}/${bindir} || true
 	done
 }
 
diff --git a/recipes/opencv/opencv_cvs.bb b/recipes/opencv/opencv_svn.bb
index ade12c10c2..3bfa33cd9d 100644
--- a/recipes/opencv/opencv_cvs.bb
+++ b/recipes/opencv/opencv_svn.bb
@@ -8,13 +8,13 @@ ARM_INSTRUCTION_SET = "arm"
 
 PR = "r1"
 
-DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
+DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 
-SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
            file://acinclude.m4"
 
-SRCDATE = "20081115"
-PV = "1.0.0+cvs${SRCDATE}"
+SRCREV = "1820"
+PV = "1.0.0+svnr${SRCREV}"
 
 S = "${WORKDIR}/opencv"
 
@@ -23,8 +23,14 @@ inherit distutils-base autotools pkgconfig
 EXTRA_OECONF = " \
 		--disable-debug \
 		--with-gtk \
+		--without-quicktime \
+		--with-gthread \
+		--without-gstreamer \
+		--with-v4l \
 		--enable-apps \
-		--with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \
+		--enable-optimization \
+		--disable-sse \
+		--without-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \
 		"
 
 export BUILD_SYS
@@ -36,6 +42,8 @@ do_configure_prepend() {
 	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
 }
 
+TARGET_CC_ARCH += "-I${S}/include "
+
 PACKAGES += "${PN}-apps python-opencv"
 
 python populate_packages_prepend () {