diff options
| -rw-r--r-- | recipes/opencv/opencv-samples_svn.bb | 10 | ||||
| -rw-r--r-- | recipes/opencv/opencv_svn.bb | 18 |
2 files changed, 18 insertions, 10 deletions
diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb index 429510c086..547e668491 100644 --- a/recipes/opencv/opencv-samples_svn.bb +++ b/recipes/opencv/opencv-samples_svn.bb @@ -9,7 +9,7 @@ DEPENDS = "opencv" SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ " -SRCREV = "2027" +SRCREV = "2196" PV = "1.0.0+1.1pre1+svnr${SRCREV}" S = "${WORKDIR}/opencv" @@ -17,17 +17,23 @@ S = "${WORKDIR}/opencv" do_install() { cd samples/c install -d ${D}/${bindir} + install -d ${D}/${datadir}/opencv/samples + + cp * ${D}/${datadir}/opencv/samples || true 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 + rm ${D}/${datadir}/opencv/samples/`basename $i .c` || 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 + rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true done } -FILES_${PN} += "${bindir}" +FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" +FILES_${PN} += "${bindir} ${datadir}/opencv" diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb index ce54d8c773..ab14c58e43 100644 --- a/recipes/opencv/opencv_svn.bb +++ b/recipes/opencv/opencv_svn.bb @@ -11,12 +11,12 @@ DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff gli SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ file://acinclude.m4" -SRCREV = "2027" +SRCREV = "2196" PV = "1.0.0+1.1pre1+svnr${SRCREV}" S = "${WORKDIR}/opencv" -inherit distutils-base autotools pkgconfig +inherit distutils-base autotools_stage pkgconfig cmake EXTRA_OECONF = " \ --disable-debug \ @@ -29,16 +29,19 @@ EXTRA_OECONF = " \ --enable-apps \ --enable-optimization \ --disable-sse \ - --without-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \ + --with-swig \ + --with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \ " export BUILD_SYS 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 " @@ -55,16 +58,15 @@ python populate_packages_prepend () { } FILES_${PN} = "" -FILES_${PN}-doc += "${datadir}/opencv/" -FILES_${PN}-apps = "${bindir}/*" +FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv/" FILES_${PN}-dbg += "${libdir}/.debug" FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" +INSANE_SKIP_python-opencv = True DESCRIPTION_python-opencv = "Python bindings to opencv" FILES_python-opencv = "${libdir}/*/site-packages/*" RDEPENDS_python-opencv = "python-core" -do_stage() { - autotools_stage_all +do_stage_append() { + cp ${S}/include/opencv/*.h ${STAGING_INCDIR}/opencv/ } - |