In an attempt to allow Gregor's patch to #657410 to be uploaded to fix cheese, I've investigated the FTBFS of frei0r and I have a patch (attached).
debdiff ../frei0r_1.1.22git20091109-1.1.dsc ../frei0r_1.1.22git20091109-1.2.dsc diffstat for frei0r_1.1.22git20091109-1.1 frei0r_1.1.22git20091109-1.2 frei0r-1.1.22git20091109/debian/changelog | 10 ++++++++++ frei0r-1.1.22git20091109/debian/control | 1 + frei0r-1.1.22git20091109/debian/rules | 9 +++++++++ src/filter/facedetect/facedetect.c | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) The reason for the FTBFS is that libopencv-objdetect-dev contains the /usr/include/opencv2/objdetect/objdetect.hpp header which has had an ABI-incompatible change to cvHaarDetectObjects - removing the definition with 7 arguments and adding a definition with 8. Old: http://www.emgu.com/wiki/files/1.3.0.0/html/55a16889-537c-534f-f2fa-fbbe60e1d8d4.htm The current header adds a maxSize, so the patch simply sets the maxSize to the same as the minSize. frei0r doesn't have a patch system (source format 1.0 - undeclared), so I haven't added one - simply added a suitable clean target so that the autotools changes are handled. The rebuilt package also allows the frei0r-plugins package to install cleanly, so I've merged with 657942. There is an RFS but it doesn't look ready and includes lots more changes than just fixing the FTBFS. http://lists.debian.org/debian-mentors/2012/02/msg00013.html Please let me know if this is OK to upload. -- Neil Williams ============= http://www.linux.codehelp.co.uk/
diffstat for frei0r_1.1.22git20091109-1.1 frei0r_1.1.22git20091109-1.2 frei0r-1.1.22git20091109/debian/changelog | 10 ++++++++++ frei0r-1.1.22git20091109/debian/control | 1 + frei0r-1.1.22git20091109/debian/rules | 9 +++++++++ src/filter/facedetect/facedetect.c | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff -u frei0r-1.1.22git20091109/debian/control frei0r-1.1.22git20091109/debian/control --- frei0r-1.1.22git20091109/debian/control +++ frei0r-1.1.22git20091109/debian/control @@ -8,6 +8,7 @@ Vcs-Browser: http://git.dyne.org/?r=frei0r Homepage: http://www.piksel.org/frei0r Build-Depends: cdbs, debhelper (>> 5.0.0), pkg-config, libcv-dev, libgavl-dev (>= 1.1.0), + libtool, autoconf, automake, libcvaux-dev, libhighgui-dev Standards-Version: 3.8.3 diff -u frei0r-1.1.22git20091109/debian/rules frei0r-1.1.22git20091109/debian/rules --- frei0r-1.1.22git20091109/debian/rules +++ frei0r-1.1.22git20091109/debian/rules @@ -8,0 +9,9 @@ +clean:: + $(RM) Makefile.in aclocal.m4 configure doc/Makefile.in + $(RM) doc/html/Makefile.in include/Makefile.in ltmain.sh + $(RM) m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 + $(RM) m4/lt~obsolete.m4 m4/ltsugar.m4 src/Makefile.in + +makebuilddir:: + libtoolize -f + autoreconf -fs diff -u frei0r-1.1.22git20091109/debian/changelog frei0r-1.1.22git20091109/debian/changelog --- frei0r-1.1.22git20091109/debian/changelog +++ frei0r-1.1.22git20091109/debian/changelog @@ -1,3 +1,13 @@ +frei0r (1.1.22git20091109-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: filter/facedetect/facedetect.c:231:36: error: too few + arguments to function 'cvHaarDetectObjects'" Supply minimum and + maximum sizes to mimic previous single size requirement. + (Closes: #652759) + + -- Neil Williams <codeh...@debian.org> Sat, 03 Mar 2012 00:13:03 +0000 + frei0r (1.1.22git20091109-1.1) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- frei0r-1.1.22git20091109.orig/src/filter/facedetect/facedetect.c +++ frei0r-1.1.22git20091109/src/filter/facedetect/facedetect.c @@ -228,7 +228,7 @@ double t = (double)cvGetTickCount(); faces = cvHaarDetectObjects( small_img, cascade, storage, 1.1, 2, 0/*CV_HAAR_DO_CANNY_PRUNING*/, - cvSize(30, 30) ); + cvSize(30, 30), cvSize(30, 30) ); t = (double)cvGetTickCount() - t; //printf( "detection time = %gms\n", t/((double)cvGetTickFrequency()*1000.) );
pgpMOfMXNtQFL.pgp
Description: PGP signature