DELTA 151214 2164 22 SVN 5  aRNcvENDREP DELTA SVN"x^eR]o0}ŕ&uҪ1Xc!{DLAhE$Mլ,yFpoBEk jlq[/<ŕެ",m trOƣXZ-\C*E=))ͣ>·C< 2haOnԚFtT꿲'Kdĸya񚇧7: w^ĉqǶy [v 'ߛP'j4nkZ=co'$hM_K\-z`\A/Bn0 ~F?yK]_tf nB!>i: -W$h49\j/ENDREP DELTA SVN;=;;--- Makefile.in.orig Thu Dec 29 14:20:44 2005 +++ Makefile.in Thu Dec 29 14:21:13 2005 @@ -194,7 +194,7 @@ # All the rest of the distributed files EXTRA_DIST = THANKS COPYING INSTALL README NEWS ChangeLog opencv.spec opencv.spec.in opencv.pc.in opencv.pc autogen.sh _make utils -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(libdir)data/pkgconfig pkgconfig_DATA = opencv.pc all: cvconfig.h $(MAKE) $(AM_MAKEFLAGS) all-recursive ENDREP DELTA SVN--- apps/haartraining/src/cvboost.cpp.orig Thu Dec 29 13:52:01 2005 +++ apps/haartraining/src/cvboost.cpp Thu Dec 29 13:52:08 2005 @@ -40,7 +40,7 @@ //M*/ #include -#include +#include #include #include #include ENDREP DELTA SVNvxvv--- configure.orig Thu Aug 19 03:46:49 2004 +++ configure Mon Feb 28 17:16:51 2005 @@ -21218,7 +21218,7 @@ have_v4l=no -if test x$os_name=xLinux; then +if test x$os_name = xLinux; then cat >>confdefs.h <<\_ACEOF #define HAVE_CAMV4L ENDREP DELTA SVNACAA--- cv/src/Makefile.in.orig Mon Feb 28 16:41:54 2005 +++ cv/src/Makefile.in Mon Feb 28 16:42:14 2005 @@ -177,7 +177,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = -ldl -lpthread -lm +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ ENDREP DELTA SVNGIGG--- cxcore/src/Makefile.in.orig Mon Feb 28 16:40:06 2005 +++ cxcore/src/Makefile.in Mon Feb 28 16:40:18 2005 @@ -137,7 +137,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = -ldl -lpthread -lm +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ ENDREP DELTA SVNy{yy--- cxcore/src/cxswitcher.cpp Mon Feb 28 16:34:30 2005 +++ cxcore/src/cxswitcher.cpp.freebsd Mon Feb 28 16:34:17 2005 @@ -593,8 +593,8 @@ QueryPerformanceCounter( &counter ); return (int64)counter.QuadPart; #else - timeval tv; - timezone tz; + struct timeval tv; // patch for FreeBSD: add "struct" + struct timezone tz; // patch for FreeBSD: add "struct" gettimeofday( &tv, &tz ); return (int64)tv.tv_sec*1000000 + tv.tv_usec; #endif ENDREP DELTA SVNx^]o0Wb[XH?pq[B*ѭ@ÇG[ɖmy EF%$MCQId,JiMp,>pt]΢8#`\]aC1@o@E3_toPm{v23IC=A?5f$eU2*iCDS&E%q^^6#P'"WkZFa!fkjL#1 9ǁ:ۺkc t\v1kC6 f*̥:aF;;{$f*xQEq@"`r۴Tݪ9nnAdLZ@cBMPȵg3ENDREP