From 1237a5635ae6df9f8bb7afbc4ef73485312bca68 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jun 2009 10:38:28 +0200 Subject: opencv: upstream moved to svn, update recipes --- recipes/opencv/opencv-samples_cvs.bb | 34 ----------------- recipes/opencv/opencv-samples_svn.bb | 33 +++++++++++++++++ recipes/opencv/opencv_cvs.bb | 63 -------------------------------- recipes/opencv/opencv_svn.bb | 71 ++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 97 deletions(-) delete mode 100644 recipes/opencv/opencv-samples_cvs.bb create mode 100644 recipes/opencv/opencv-samples_svn.bb delete mode 100644 recipes/opencv/opencv_cvs.bb create mode 100644 recipes/opencv/opencv_svn.bb diff --git a/recipes/opencv/opencv-samples_cvs.bb b/recipes/opencv/opencv-samples_cvs.bb deleted file mode 100644 index 0490f8b015..0000000000 --- a/recipes/opencv/opencv-samples_cvs.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPLv2" - -PR = "r2" - -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_install() { - cd samples/c - install -d ${D}/${bindir} - - 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} - 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} - done -} - -FILES_${PN} += "${bindir}" diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb new file mode 100644 index 0000000000..4eeb39486f --- /dev/null +++ b/recipes/opencv/opencv-samples_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" + +DEPENDS = "opencv" + +SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ +" + +SRCREV = "1820" +PV = "1.0.0+svnr${SRCREV}" + +S = "${WORKDIR}/opencv" + +do_install() { + cd samples/c + install -d ${D}/${bindir} + + 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` || 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` || true + install -m 0755 `basename $i .cpp` ${D}/${bindir} || true + done +} + +FILES_${PN} += "${bindir}" diff --git a/recipes/opencv/opencv_cvs.bb b/recipes/opencv/opencv_cvs.bb deleted file mode 100644 index ade12c10c2..0000000000 --- a/recipes/opencv/opencv_cvs.bb +++ /dev/null @@ -1,63 +0,0 @@ -DESCRIPTION = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPLv2" - -ARM_INSTRUCTION_SET = "arm" - -PR = "r1" - -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="-I${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 -} - diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb new file mode 100644 index 0000000000..3bfa33cd9d --- /dev/null +++ b/recipes/opencv/opencv_svn.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" + +ARM_INSTRUCTION_SET = "arm" + +PR = "r1" + +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" + +SRCREV = "1820" +PV = "1.0.0+svnr${SRCREV}" + +S = "${WORKDIR}/opencv" + +inherit distutils-base autotools pkgconfig + +EXTRA_OECONF = " \ + --disable-debug \ + --with-gtk \ + --without-quicktime \ + --with-gthread \ + --without-gstreamer \ + --with-v4l \ + --enable-apps \ + --enable-optimization \ + --disable-sse \ + --without-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \ + " + +export BUILD_SYS +export HOST_SYS +export PYTHON_CSPEC="-I${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 +} + +TARGET_CC_ARCH += "-I${S}/include " + +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 +} + -- cgit v1.2.3