opencv: add cvs version that works with recent toolchains

opencv-samples: binary samples to play with

3 files changed, 179 insertions, 0 deletions

diff --git a/packages/opencv/opencv-samples_cvs.bb b/packages/opencv/opencv-samples_cvs.bb
new file mode 100644
index 0000000000..139fc57f5f
--- /dev/null
+++ b/packages/opencv/opencv-samples_cvs.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "opencv"
+
+SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+"
+SRCDATE = "20081115"
+PV = "1.0.0+cvs${SRCDATE}"
+
+S = "${WORKDIR}/opencv"
+
+do_compile() {
+    cd samples/c
+	install -d ${D}/${bindir}
+
+    for i in *.c; do
+        echo "compiling $i"
+        ${CXX} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv`;
+		install -m 0755 `basename $i .c` ${D}/${bindir}
+	done
+    for i in *.cpp; do
+        echo "compiling $i"
+        ${CXX} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv`;
+		install -m 0755 `basename $i .cpp` ${D}/${bindir}    
+	done
+}
+
diff --git a/packages/opencv/opencv/acinclude.m4 b/packages/opencv/opencv/acinclude.m4
new file mode 100644
index 0000000000..53518fb2eb
--- /dev/null
+++ b/packages/opencv/opencv/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff --git a/packages/opencv/opencv_cvs.bb b/packages/opencv/opencv_cvs.bb
new file mode 100644
index 0000000000..cc97a715a0
--- /dev/null
+++ b/packages/opencv/opencv_cvs.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
+
+SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+           file://acinclude.m4"
+
+SRCDATE = "20081115"
+PV = "1.0.0+cvs${SRCDATE}"
+
+S = "${WORKDIR}/opencv"
+
+inherit distutils-base autotools pkgconfig
+
+EXTRA_OECONF = "--disable-debug  --with-gtk --enable-apps --with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR}"
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=${STAGING_INCDIR}/${PYTHON_DIR}
+
+do_configure_prepend() {
+	cp ${WORKDIR}/acinclude.m4 ${S}
+	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
+}
+
+PACKAGES += "${PN}-apps python-opencv"
+
+python populate_packages_prepend () {
+	cv_libdir = bb.data.expand('${libdir}', d)
+	cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+}
+
+FILES_${PN} = ""
+FILES_${PN}-doc += "${datadir}/opencv/"
+FILES_${PN}-apps = "${bindir}/*"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
+
+DESCRIPTION_python-opencv = "Python bindings to opencv"
+FILES_python-opencv = "${libdir}/*/site-packages/*"
+RDEPENDS_python-opencv = "python-core"
+
+do_stage() {
+	autotools_stage_all
+}
+