From 418dde34e9824c7201e1e009536c25d2937e128f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Sep 2009 11:07:32 +0200 Subject: opencv: update to latest svn, tweak buildsystem a bit * the autofoo buildsystem has problems with exporting symbols * the cmake buildsystem introduces bad RPATHs into the python extensions --- recipes/opencv/opencv-samples_svn.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'recipes/opencv/opencv-samples_svn.bb') 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" -- cgit v1.2.3