Attachment #76332 for bug #110057

View | Details | Raw Unified | Return to bug 110057
Collapse All | Expand All




#

PORTNAME=	opencv
PORTVERSION=1.0.0
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=opencvlibrary
DISTNAME=	opencv-${PORTVERSION}

MAINTAINER=	msabramo@yahoo.com
COMMENT=	Open Source Computer Vision Library from Intel

CFLAGS+=	-I${LOCALBASE}/include/OpenEXR
CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/OpenEXR
LDFLAGS+=	-L${LOCALBASE}/lib
USE_AUTOTOOLS=	libtool:15
HAS_CONFIGURE=	yes
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--without-v4l --without-quicktime --without-carbon \
				--without-1394libs \
				--without-swig # I don't know anything about swig ...
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
				png:${PORTSDIR}/graphics/png \
				tiff:${PORTSDIR}/graphics/tiff \
				jasper:${PORTSDIR}/graphics/jasper \
				IlmImf:${PORTSDIR}/graphics/OpenEXR
USE_GNOME=

OPTIONS=	GTK "Enable GTK+-2.0 support" Off \
			XINE "Enable XINE support" Off \
			FFMPEG "Enable FFMPEG support" Off \
			PYTHON "Enable PYTHON support" Off \
			DEBUG "Build debugging symbols" Off \
			DEMO "Build demo apps" Off
# XXX:
# I cannot disable the following features if they have been installed,
# thus they should be enable now ...
#
#			JPEG "Enable JPEG support" On \
#			PNG	"Enable PNG support" On \
#			TIFF "Enable TIFF support" On \
#			JASPER "Enable JASPER support" Off \
#			OPENEXR "Enable OpenEXR support" Off \

.include <bsd.port.pre.mk>

.if defined(WITH_GTK)
USE_XLIB=	yes
USE_GNOME=	gtk20
CONFIGURE_ARGS+=--with-gtk
.else
CONFIGURE_ARGS+=--without-gtk
.endif

#.if !defined(WITHOUT_JPEG)
#LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
#.endif
#
#.if !defined(WITHOUT_PNG)
#LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png
#.endif
#
#.if !defined(WITHOUT_TIFF)
#LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
#.endif
#
#.if defined(WITH_JASPER)
#LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
#.endif
#
#.if defined(WITH_OPENEXR)
#LIB_DEPENDS+=	libIlmImf:${PORTSDIR}/graphics/OpenEXR
#CFLAGS+=	-I${LOCALBASE}/include/OpenEXR
#CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
#.endif

.if defined(WITH_XINE)
CFLAGS+=	-I${X11BASE}/include
CPPFLAGS+=	-I${X11BASE}/include
LDFLAGS+=	-L${X11BASE}/lib
LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
CONFIGURE_ARGS+=--with-xine
.else
CONFIGURE_ARGS+=--without-xine
.endif

.if defined(WITH_FFMPEG)
LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
CONFIGURE_ARGS+=--with-ffmpeg
.else
CONFIGURE_ARGS+=--without-ffmpeg
.endif

.if defined(WITH_PYTHON)
USE_PYTHON=	yes
CONFIGURE_ARGS+=--with-python
PLIST_SUB+=	PYTHON=""
.else
CONFIGURE_ARGS+=--without-python
PLIST_SUB+=	PYTHON="@comment "
.endif

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug
.else
CONFIGURE_ARGS+=--disable-debug
.endif

.if defined(WITH_DEMO)
CONFIGURE_ARGS+=--enable-apps
PLIST_SUB+=	DEMO=""
.else
CONFIGURE_ARGS+=--disable-apps
PLIST_SUB+=	DEMO="@comment "
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)opencv/distinfo (-3 / +3 lines)
1	MD5 (opencv-0.9.6.tar.gz) = 00fe80e9b82bc29e9dd00934f7fd86db	1	MD5 (opencv-1.0.0.tar.gz) = 146a05005f2d2c16c4ee10ebd7f1dd58
2	SHA256 (opencv-0.9.6.tar.gz) = fbf6482c5bd223d5037eba47a5302653f57127f055bfd116bff1feddcc093d6e	2	SHA256 (opencv-1.0.0.tar.gz) = 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
3	SIZE (opencv-0.9.6.tar.gz) = 10017084	3	SIZE (opencv-1.0.0.tar.gz) = 11146334




--- 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

--- 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@

--- 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@

--- otherlibs/highgui/Makefile.in.orig Mon Feb 28 18:02:19 2005
+++ otherlibs/highgui/Makefile.in      Mon Feb 28 18:02:40 2005
@@ -54,7 +54,7 @@
 libhighgui_la_DEPENDENCIES =
 am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
       cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
-      grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
+      grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
       image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
       window_w32.lo
 libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
@@ -201,7 +201,7 @@
 lib_LTLIBRARIES = libhighgui.la
 libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
     cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
-    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
+    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
     image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
     window_w32.cpp

--- otherlibs/highgui/grfmts.h.orig     Mon Feb 28 17:10:41 2005
+++ otherlibs/highgui/grfmts.h  Mon Feb 28 17:10:45 2005
@@ -47,7 +47,6 @@
 #include "grfmt_sunras.h"
 #include "grfmt_jpeg.h"
 #include "grfmt_pxm.h"
-#include "grfmt_tiff.h"
 #include "grfmt_png.h"

 #endif/*_GRFMTS_H_*/

--- otherlibs/highgui/loadsave.cpp.orig Mon Feb 28 17:12:05 2005
+++ otherlibs/highgui/loadsave.cpp      Mon Feb 28 17:12:09 2005
@@ -299,7 +299,6 @@
     m_factories->AddFactory( new GrFmtJpeg() );
     m_factories->AddFactory( new GrFmtSunRaster() );
     m_factories->AddFactory( new GrFmtPxM() );
-    m_factories->AddFactory( new GrFmtTiff() );
 #ifdef HAVE_PNG
     m_factories->AddFactory( new GrFmtPng() );
 #endif

--- 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

--- tests/cxcore/src/Makefile.in.orig   Mon Feb 28 17:32:29 2005
+++ tests/cxcore/src/Makefile.in        Mon Feb 28 17:32:57 2005
@@ -189,6 +189,7 @@
 EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
 INCLUDES = -I. -I../../../cxcore/include -I../../cxts -I../../..
 cxcoretest_LDADD = -L../../../cxcore/src -lcxcore -L../../cxts -lcxts
+cxcoretest_LDFLAGS = -pthread
 all: all-am

 .SUFFIXES:


Lines 1-11 Link Here

(-)opencv/files/patch-Makefile.in (-9 / +9 lines)
1	--- Makefile.in.orig Thu Dec 29 14:20:44 2005	1	--- Makefile.in.orig Sun Mar 4 22:34:16 2007
2	+++ Makefile.in Thu Dec 29 14:21:13 2005	2	+++ Makefile.in Sun Mar 4 22:34:35 2007
3	@@ -194,7 +194,7 @@	3	@@ -270,7 +270,7 @@
4		4	#EXTRA_DIST = THANKS TODO \
5	# All the rest of the distributed files	5	# opencv.spec opencv.spec.in opencv.pc.in opencv.pc \
6	EXTRA_DIST = THANKS COPYING INSTALL README NEWS ChangeLog opencv.spec opencv.spec.in opencv.pc.in opencv.pc autogen.sh _make utils	6	# _make apps filters
7	-pkgconfigdir = $(libdir)/pkgconfig	7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(libdir)data/pkgconfig	8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = opencv.pc	9	pkgconfig_DATA = opencv.pc
10	all: cvconfig.h	10
11	$(MAKE) $(AM_MAKEFLAGS) all-recursive	11	# The directory where the include files will be installed

Lines 1-11 Link Here

(-)opencv/files/patch-apps_haartraining_src_cvboost.cpp (-11 lines)
1	--- apps/haartraining/src/cvboost.cpp.orig Thu Dec 29 13:52:01 2005
2	+++ apps/haartraining/src/cvboost.cpp Thu Dec 29 13:52:08 2005
3	@@ -40,7 +40,7 @@
4	//M*/
5
6	#include <stdio.h>
7	-#include <malloc.h>
8	+#include <stdlib.h>
9	#include <memory.h>
10	#include <float.h>
11	#include <math.h>




--- configure.orig	Wed Mar  7 19:49:27 2007
+++ configure	Wed Mar  7 19:49:52 2007
@@ -22958,13 +22958,13 @@
 
 
 if test x"$have_png" = "xyes"; then
-    echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng12  $LIBS"
+LIBS="-lpng  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23030,8 +23030,8 @@
 #define HAVE_PNG
 _ACEOF
 
-                   IMAGELIBS="-lpng12 $IMAGELIBS"
-                   LIBS="-lpng12 $LIBS"
+                   IMAGELIBS="-lpng $IMAGELIBS"
+                   LIBS="-lpng $LIBS"
 
 
 for ac_func in png_get_valid png_set_tRNS_to_alpha




--- 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@





--- 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@





--- 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





--- otherlibs/highgui/Makefile.in.orig	Thu Aug 19 20:46:43 2004
+++ otherlibs/highgui/Makefile.in	Thu Dec 29 13:44:02 2005
@@ -54,7 +54,7 @@
 libhighgui_la_DEPENDENCIES =
 am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
 	cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
-	grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
+	grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
 	image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
 	window_w32.lo
 libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
@@ -201,7 +201,7 @@
 lib_LTLIBRARIES = libhighgui.la
 libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
     cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
-    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
+    grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
     image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
     window_w32.cpp
 

Lines 1-11 Link Here

(-)opencv/files/patch-otherlibs_highgui_grfmts.h (-11 lines)
1	--- otherlibs/highgui/grfmts.h.orig Mon Feb 28 17:10:41 2005
2	+++ otherlibs/highgui/grfmts.h Mon Feb 28 17:10:45 2005
3	@@ -47,7 +47,6 @@
4	#include "grfmt_sunras.h"
5	#include "grfmt_jpeg.h"
6	#include "grfmt_pxm.h"
7	-#include "grfmt_tiff.h"
8	#include "grfmt_png.h"
9
10	#endif/_GRFMTS_H_/
11

Lines 1-11 Link Here

(-)opencv/files/patch-otherlibs_highgui_loadsave.cpp (-11 lines)
1	--- otherlibs/highgui/loadsave.cpp.orig Mon Feb 28 17:12:05 2005
2	+++ otherlibs/highgui/loadsave.cpp Mon Feb 28 17:12:09 2005
3	@@ -299,7 +299,6 @@
4	m_factories->AddFactory( new GrFmtJpeg() );
5	m_factories->AddFactory( new GrFmtSunRaster() );
6	m_factories->AddFactory( new GrFmtPxM() );
7	- m_factories->AddFactory( new GrFmtTiff() );
8	#ifdef HAVE_PNG
9	m_factories->AddFactory( new GrFmtPng() );
10	#endif
11

Lines 1-11 Link Here

(-)opencv/files/patch-tests_cxcore_src_Makefile.in (-11 lines)
1	--- tests/cxcore/src/Makefile.in.orig Mon Feb 28 17:32:29 2005
2	+++ tests/cxcore/src/Makefile.in Mon Feb 28 17:32:57 2005
3	@@ -189,6 +189,7 @@
4	EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
5	INCLUDES = -I. -I../../../cxcore/include -I../../cxts -I../../..
6	cxcoretest_LDADD = -L../../../cxcore/src -lcxcore -L../../cxts -lcxts
7	+cxcoretest_LDFLAGS = -pthread
8	all: all-am
9
10	.SUFFIXES:
11




%%DEMO%%bin/opencv-createsamples
%%DEMO%%bin/opencv-haartraining
%%DEMO%%bin/opencv-performance
lib/libcv.a
lib/libcv.la
lib/libcv.so
lib/libcv.so.9
lib/libcvaux.a
lib/libcvaux.la
lib/libcvaux.so
lib/libcvaux.so.9
lib/libcvhaartraining.a
lib/libhighgui.a
lib/libhighgui.la
lib/libhighgui.so
lib/libhighgui.so.9
lib/libcxts.a
lib/libcxcore.a
lib/libcxcore.la
lib/libcxcore.so
lib/libcxcore.so.9
libdata/pkgconfig/opencv.pc
include/opencv/cv.h
include/opencv/cv.hpp
include/opencv/cvaux.h
include/opencv/cvaux.hpp
include/opencv/cvcompat.h
%%DEMO%%include/opencv/cvhaartraining.h
include/opencv/cvmat.hpp
include/opencv/cvtypes.h
include/opencv/cvver.h
include/opencv/cvvidsurv.hpp
include/opencv/cxcore.h
include/opencv/cxcore.hpp
include/opencv/cxerror.h
include/opencv/cxmisc.h
include/opencv/cxtypes.h
include/opencv/highgui.h
include/opencv/ml.h
lib/libcv.a
lib/libcv.la
lib/libcv.so
lib/libcv.so.1
lib/libcvaux.a
lib/libcvaux.la
lib/libcvaux.so
lib/libcvaux.so.1
%%DEMO%%lib/libcvhaartraining.a
lib/libcxcore.a
lib/libcxcore.la
lib/libcxcore.so
lib/libcxcore.so.1
lib/libhighgui.a
lib/libhighgui.la
lib/libhighgui.so
lib/libhighgui.so.1
lib/libml.a
lib/libml.la
lib/libml.so
lib/libml.so.1
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.py
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyc
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyo
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.a
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.la
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.so
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.a
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.la
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.so
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.py
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyc
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyo
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.py
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyc
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyo
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.py
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyc
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyo
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.py
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyc
%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyo
libdata/pkgconfig/opencv.pc
%%DATADIR%%/doc/cvcam.rtf
%%DATADIR%%/doc/faq.htm
%%DATADIR%%/doc/index.htm
%%DATADIR%%/doc/license.txt
%%DATADIR%%/doc/opencv.jpg
%%DATADIR%%/doc/opencvman_old.pdf
%%DATADIR%%/doc/papers/algo_tracking.pdf
%%DATADIR%%/doc/papers/avbpa99.ps
%%DATADIR%%/doc/papers/camshift.pdf
%%DATADIR%%/doc/python-wrappers-on-windows.txt
%%DATADIR%%/doc/python.txt
%%DATADIR%%/doc/ref/opencvref.css
%%DATADIR%%/doc/ref/opencvref_cv.htm
%%DATADIR%%/doc/ref/opencvref_cvaux.htm
%%DATADIR%%/doc/ref/opencvref_cxcore.htm
%%DATADIR%%/doc/ref/opencvref_highgui.htm
%%DATADIR%%/doc/ref/opencvref_ml.htm
%%DATADIR%%/doc/ref/pics/backprojectpatch.png
%%DATADIR%%/doc/ref/pics/boundingrect.png
%%DATADIR%%/doc/ref/pics/building.jpg
%%DATADIR%%/doc/ref/pics/contoursecarea.png
%%DATADIR%%/doc/ref/pics/cornersubpix.png
%%DATADIR%%/doc/ref/pics/defects.png
%%DATADIR%%/doc/ref/pics/ellipse.png
%%DATADIR%%/doc/ref/pics/em1.png
%%DATADIR%%/doc/ref/pics/em3.png
%%DATADIR%%/doc/ref/pics/em4.png
%%DATADIR%%/doc/ref/pics/em5.png
%%DATADIR%%/doc/ref/pics/em6.png
%%DATADIR%%/doc/ref/pics/em7.png
%%DATADIR%%/doc/ref/pics/em8.png
%%DATADIR%%/doc/ref/pics/em9.png
%%DATADIR%%/doc/ref/pics/errmsg.png
%%DATADIR%%/doc/ref/pics/face.png
%%DATADIR%%/doc/ref/pics/haarfeatures.png
%%DATADIR%%/doc/ref/pics/houghp.png
%%DATADIR%%/doc/ref/pics/inv_logpolar.jpg
%%DATADIR%%/doc/ref/pics/left.jpg
%%DATADIR%%/doc/ref/pics/logpolar.jpg
%%DATADIR%%/doc/ref/pics/maxrect.png
%%DATADIR%%/doc/ref/pics/memstorage1.png
%%DATADIR%%/doc/ref/pics/memstorage2.png
%%DATADIR%%/doc/ref/pics/minareabox.png
%%DATADIR%%/doc/ref/pics/mlp_.png
%%DATADIR%%/doc/ref/pics/neuron_model.png
%%DATADIR%%/doc/ref/pics/pointpolygon.png
%%DATADIR%%/doc/ref/pics/quadedge.png
%%DATADIR%%/doc/ref/pics/right.jpg
%%DATADIR%%/doc/ref/pics/sigmoid_bipolar.png
%%DATADIR%%/doc/ref/pics/subdiv.png
%%DATADIR%%/doc/ref/pics/threshold.png
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt2.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_alt_tree.xml
%%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml
%%DATADIR%%/haarcascades/haarcascade_fullbody.xml
%%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
%%DATADIR%%/haarcascades/haarcascade_profileface.xml
%%DATADIR%%/haarcascades/haarcascade_upperbody.xml
%%DATADIR%%/readme.txt
%%DATADIR%%/samples/c/agaricus-lepiota.data
%%DATADIR%%/samples/c/airplane.jpg
%%DATADIR%%/samples/c/baboon.jpg
%%DATADIR%%/samples/c/blobtrack.cpp
%%DATADIR%%/samples/c/build_all.sh
%%DATADIR%%/samples/c/camshiftdemo.c
%%DATADIR%%/samples/c/contours.c
%%DATADIR%%/samples/c/convert_cascade.c
%%DATADIR%%/samples/c/convexhull.c
%%DATADIR%%/samples/c/cvsample.dsp
%%DATADIR%%/samples/c/cvsample.vcproj
%%DATADIR%%/samples/c/delaunay.c
%%DATADIR%%/samples/c/demhist.c
%%DATADIR%%/samples/c/dft.c
%%DATADIR%%/samples/c/distrans.c
%%DATADIR%%/samples/c/drawing.c
%%DATADIR%%/samples/c/edge.c
%%DATADIR%%/samples/c/facedetect.c
%%DATADIR%%/samples/c/facedetect.cmd
%%DATADIR%%/samples/c/ffilldemo.c
%%DATADIR%%/samples/c/fitellipse.c
%%DATADIR%%/samples/c/fruits.jpg
%%DATADIR%%/samples/c/houghlines.c
%%DATADIR%%/samples/c/image.cpp
%%DATADIR%%/samples/c/inpaint.cpp
%%DATADIR%%/samples/c/kalman.c
%%DATADIR%%/samples/c/kmeans.c
%%DATADIR%%/samples/c/laplace.c
%%DATADIR%%/samples/c/lena.jpg
%%DATADIR%%/samples/c/letter-recognition.data
%%DATADIR%%/samples/c/letter_recog.cpp
%%DATADIR%%/samples/c/lkdemo.c
%%DATADIR%%/samples/c/makefile.gnu
%%DATADIR%%/samples/c/makefile.ms
%%DATADIR%%/samples/c/minarea.c
%%DATADIR%%/samples/c/morphology.c
%%DATADIR%%/samples/c/motempl.c
%%DATADIR%%/samples/c/mushroom.cpp
%%DATADIR%%/samples/c/pic1.png
%%DATADIR%%/samples/c/pic2.png
%%DATADIR%%/samples/c/pic3.png
%%DATADIR%%/samples/c/pic4.png
%%DATADIR%%/samples/c/pic5.png
%%DATADIR%%/samples/c/pic6.png
%%DATADIR%%/samples/c/pyramid_segmentation.c
%%DATADIR%%/samples/c/squares.c
%%DATADIR%%/samples/c/stuff.jpg
%%DATADIR%%/samples/c/watershed.cpp
%%DATADIR%%/samples/python/cam-histo.py
%%DATADIR%%/samples/python/capture-cam.py
%%DATADIR%%/samples/python/chessboard.py
%%DATADIR%%/samples/python/contours.py
%%DATADIR%%/samples/python/convexhull.py
%%DATADIR%%/samples/python/delaunay.py
%%DATADIR%%/samples/python/demhist.py
%%DATADIR%%/samples/python/dft.py
%%DATADIR%%/samples/python/distrans.py
%%DATADIR%%/samples/python/drawing.py
%%DATADIR%%/samples/python/edge.py
%%DATADIR%%/samples/python/facedetect.py
%%DATADIR%%/samples/python/ffilldemo.py
%%DATADIR%%/samples/python/fitellipse.py
%%DATADIR%%/samples/python/houghlines.py
%%DATADIR%%/samples/python/inpaint.py
%%DATADIR%%/samples/python/kalman.py
%%DATADIR%%/samples/python/kmeans.py
%%DATADIR%%/samples/python/laplace.py
%%DATADIR%%/samples/python/lkdemo.py
%%DATADIR%%/samples/python/logpolar.py
%%DATADIR%%/samples/python/minarea.py
%%DATADIR%%/samples/python/minidemo.py
%%DATADIR%%/samples/python/morphology.py
%%DATADIR%%/samples/python/motempl.py
%%DATADIR%%/samples/python/pyramid_segmentation.py
%%DATADIR%%/samples/python/squares.py
%%DATADIR%%/samples/python/watershed.py
@dirrm %%DATADIR%%/samples/python
@dirrm %%DATADIR%%/samples/c
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/haarcascades
@dirrm %%DATADIR%%/doc/ref/pics
@dirrm %%DATADIR%%/doc/ref
@dirrm %%DATADIR%%/doc/papers
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
%%PYTHON%%@dirrm %%PYTHONPREFIX_SITELIBDIR%%/opencv
@dirrm include/opencv
share/opencv/readme.txt
share/opencv/doc/cvcam.rtf
share/opencv/doc/faq.htm
share/opencv/doc/index.htm
share/opencv/doc/license.txt
share/opencv/doc/opencv.jpg
share/opencv/doc/opencvman_old.pdf
share/opencv/haarcascades/haarcascade_frontalface_alt.xml
share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
share/opencv/haarcascades/haarcascade_frontalface_default.xml
share/opencv/haarcascades/haarcascade_fullbody.xml
share/opencv/haarcascades/haarcascade_lowerbody.xml
share/opencv/haarcascades/haarcascade_profileface.xml
share/opencv/haarcascades/haarcascade_upperbody.xml
@dirrm share/opencv/haarcascades
share/opencv/doc/papers/algo_tracking.pdf
share/opencv/doc/papers/avbpa99.ps
share/opencv/doc/papers/camshift.pdf
@dirrm share/opencv/doc/papers
share/opencv/doc/ref/opencvref.css
share/opencv/doc/ref/opencvref_cv.htm
share/opencv/doc/ref/opencvref_cvaux.htm
share/opencv/doc/ref/opencvref_cxcore.htm
share/opencv/doc/ref/opencvref_highgui.htm
share/opencv/samples/c/airplane.jpg
share/opencv/samples/c/baboon.jpg
share/opencv/samples/c/build_all.sh
share/opencv/samples/c/camshiftdemo.c
share/opencv/samples/c/contours.c
share/opencv/samples/c/convexhull.c
share/opencv/samples/c/cvsample.dsp
share/opencv/samples/c/cvsample.vcproj
share/opencv/samples/c/delaunay.c
share/opencv/samples/c/demhist.c
share/opencv/samples/c/distrans.c
share/opencv/samples/c/drawing.c
share/opencv/samples/c/edge.c
share/opencv/samples/c/facedetect.c
share/opencv/samples/c/facedetect.cmd
share/opencv/samples/c/ffilldemo.c
share/opencv/samples/c/fitellipse.c
share/opencv/samples/c/fruits.jpg
share/opencv/samples/c/kalman.c
share/opencv/samples/c/kmeans.c
share/opencv/samples/c/laplace.c
share/opencv/samples/c/lena.jpg
share/opencv/samples/c/lkdemo.c
share/opencv/samples/c/makefile.gcc
share/opencv/samples/c/makefile.gen
share/opencv/samples/c/minarea.c
share/opencv/samples/c/morphology.c
share/opencv/samples/c/motempl.c
share/opencv/samples/c/pic1.png
share/opencv/samples/c/pic2.png
share/opencv/samples/c/pic3.png
share/opencv/samples/c/pic4.png
share/opencv/samples/c/pic5.png
share/opencv/samples/c/pic6.png
share/opencv/samples/c/pyramid_segmentation.c
share/opencv/samples/c/squares.c
share/opencv/samples/c/stuff.jpg
@dirrm share/opencv/samples/c
@dirrm share/opencv/samples
share/opencv/doc/ref/pics/backprojectpatch.png
share/opencv/doc/ref/pics/boundingrect.png
share/opencv/doc/ref/pics/building.jpg
share/opencv/doc/ref/pics/contoursecarea.png
share/opencv/doc/ref/pics/cornersubpix.png
share/opencv/doc/ref/pics/defects.png
share/opencv/doc/ref/pics/ellipse.png
share/opencv/doc/ref/pics/errmsg.png
share/opencv/doc/ref/pics/face.png
share/opencv/doc/ref/pics/haarfeatures.png
share/opencv/doc/ref/pics/houghp.png
share/opencv/doc/ref/pics/left.jpg
share/opencv/doc/ref/pics/maxrect.png
share/opencv/doc/ref/pics/memstorage1.png
share/opencv/doc/ref/pics/memstorage2.png
share/opencv/doc/ref/pics/minareabox.png
share/opencv/doc/ref/pics/quadedge.png
share/opencv/doc/ref/pics/right.jpg
share/opencv/doc/ref/pics/subdiv.png
share/opencv/doc/ref/pics/threshold.png
@dirrm share/opencv/doc/ref/pics
@dirrm share/opencv/doc/ref
@dirrm share/opencv/doc
@dirrm share/opencv

Return to bug 110057

Lines 7-31 Link Here

(-)opencv/Makefile (-12 / +106 lines)
7	#	7	#
8		8
9	PORTNAME= opencv	9	PORTNAME= opencv
10	PORTVERSION= 0.9.6	10	PORTVERSION=1.0.0
11	PORTREVISION= 1
12	CATEGORIES= graphics	11	CATEGORIES= graphics
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES=${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= opencvlibrary	13	MASTER_SITE_SUBDIR=opencvlibrary
15	DISTNAME= opencv-${PORTVERSION}
16		14
17	MAINTAINER= msabramo@yahoo.com	15	MAINTAINER= msabramo@yahoo.com
18	COMMENT= Open Source Computer Vision Library from Intel	16	COMMENT= Open Source Computer Vision Library from Intel
19		17
		18	CFLAGS+= -I${LOCALBASE}/include/OpenEXR
		19	CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/OpenEXR
		20	LDFLAGS+= -L${LOCALBASE}/lib
20	USE_AUTOTOOLS= libtool:15	21	USE_AUTOTOOLS= libtool:15
21	HAS_CONFIGURE= yes
22	GNU_CONFIGURE= yes
23	USE_GMAKE= yes	22	USE_GMAKE= yes
24	INSTALLS_SHLIB= yes	23	USE_LDCONFIG= yes
		24	GNU_CONFIGURE= yes
		25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		26	CONFIGURE_ARGS= --without-v4l --without-quicktime --without-carbon \
		27	--without-1394libs \
		28	--without-swig # I don't know anything about swig ...
		29	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		30	LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
		31	png:${PORTSDIR}/graphics/png \
		32	tiff:${PORTSDIR}/graphics/tiff \
		33	jasper:${PORTSDIR}/graphics/jasper \
		34	IlmImf:${PORTSDIR}/graphics/OpenEXR
		35	USE_GNOME=
25		36
26	LDFLAGS= ${PTHREAD_LIBS}	37	OPTIONS= GTK "Enable GTK+-2.0 support" Off \
27	CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"	38	XINE "Enable XINE support" Off \
		39	FFMPEG "Enable FFMPEG support" Off \
		40	PYTHON "Enable PYTHON support" Off \
		41	DEBUG "Build debugging symbols" Off \
		42	DEMO "Build demo apps" Off
		43	# XXX:
		44	# I cannot disable the following features if they have been installed,
		45	# thus they should be enable now ...
		46	#
		47	# JPEG "Enable JPEG support" On \
		48	# PNG "Enable PNG support" On \
		49	# TIFF "Enable TIFF support" On \
		50	# JASPER "Enable JASPER support" Off \
		51	# OPENEXR "Enable OpenEXR support" Off \
28		52
29	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	53	.include <bsd.port.pre.mk>
		54
		55	.if defined(WITH_GTK)
		56	USE_XLIB= yes
		57	USE_GNOME= gtk20
		58	CONFIGURE_ARGS+=--with-gtk
		59	.else
		60	CONFIGURE_ARGS+=--without-gtk
		61	.endif
		62
		63	#.if !defined(WITHOUT_JPEG)
		64	#LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
		65	#.endif
		66	#
		67	#.if !defined(WITHOUT_PNG)
		68	#LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
		69	#.endif
		70	#
		71	#.if !defined(WITHOUT_TIFF)
		72	#LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
		73	#.endif
		74	#
		75	#.if defined(WITH_JASPER)
		76	#LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
		77	#.endif
		78	#
		79	#.if defined(WITH_OPENEXR)
		80	#LIB_DEPENDS+= libIlmImf:${PORTSDIR}/graphics/OpenEXR
		81	#CFLAGS+= -I${LOCALBASE}/include/OpenEXR
		82	#CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR
		83	#.endif
		84
		85	.if defined(WITH_XINE)
		86	CFLAGS+= -I${X11BASE}/include
		87	CPPFLAGS+= -I${X11BASE}/include
		88	LDFLAGS+= -L${X11BASE}/lib
		89	LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
		90	CONFIGURE_ARGS+=--with-xine
		91	.else
		92	CONFIGURE_ARGS+=--without-xine
		93	.endif
		94
		95	.if defined(WITH_FFMPEG)
		96	LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
		97	CONFIGURE_ARGS+=--with-ffmpeg
		98	.else
		99	CONFIGURE_ARGS+=--without-ffmpeg
		100	.endif
		101
		102	.if defined(WITH_PYTHON)
		103	USE_PYTHON= yes
		104	CONFIGURE_ARGS+=--with-python
		105	PLIST_SUB+= PYTHON=""
		106	.else
		107	CONFIGURE_ARGS+=--without-python
		108	PLIST_SUB+= PYTHON="@comment "
		109	.endif
		110
		111	.if defined(WITH_DEBUG)
		112	CONFIGURE_ARGS+=--enable-debug
		113	.else
		114	CONFIGURE_ARGS+=--disable-debug
		115	.endif
		116
		117	.if defined(WITH_DEMO)
118	CONFIGURE_ARGS+=--enable-apps
119	PLIST_SUB+= DEMO=""
120	.else
121	CONFIGURE_ARGS+=--disable-apps
122	PLIST_SUB+= DEMO="@comment "
123	.endif
30		124
31	.include <bsd.port.mk>	125	.include <bsd.port.post.mk>

Lines 1-103 Link Here

(-)opencv/files/nopatch-aa (-103 lines)
1	--- cxcore/src/cxswitcher.cpp Mon Feb 28 16:34:30 2005
2	+++ cxcore/src/cxswitcher.cpp.freebsd Mon Feb 28 16:34:17 2005
3	@@ -593,8 +593,8 @@
4	QueryPerformanceCounter( &counter );
5	return (int64)counter.QuadPart;
6	#else
7	- timeval tv;
8	- timezone tz;
9	+ struct timeval tv; // patch for FreeBSD: add "struct"
10	+ struct timezone tz; // patch for FreeBSD: add "struct"
11	gettimeofday( &tv, &tz );
12	return (int64)tv.tv_sec*1000000 + tv.tv_usec;
13	#endif
14
15	--- cxcore/src/Makefile.in.orig Mon Feb 28 16:40:06 2005
16	+++ cxcore/src/Makefile.in Mon Feb 28 16:40:18 2005
17	@@ -137,7 +137,7 @@
18	INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
19	LDFLAGS = @LDFLAGS@
20	LIBOBJS = @LIBOBJS@
21	-LIBS = -ldl -lpthread -lm
22	+LIBS = @LIBS@
23	LIBTOOL = @LIBTOOL@
24	LN_S = @LN_S@
25	LTLIBOBJS = @LTLIBOBJS@
26
27	--- cv/src/Makefile.in.orig Mon Feb 28 16:41:54 2005
28	+++ cv/src/Makefile.in Mon Feb 28 16:42:14 2005
29	@@ -177,7 +177,7 @@
30	INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
31	LDFLAGS = @LDFLAGS@
32	LIBOBJS = @LIBOBJS@
33	-LIBS = -ldl -lpthread -lm
34	+LIBS = @LIBS@
35	LIBTOOL = @LIBTOOL@
36	LN_S = @LN_S@
37	LTLIBOBJS = @LTLIBOBJS@
38
39	--- otherlibs/highgui/Makefile.in.orig Mon Feb 28 18:02:19 2005
40	+++ otherlibs/highgui/Makefile.in Mon Feb 28 18:02:40 2005
41	@@ -54,7 +54,7 @@
42	libhighgui_la_DEPENDENCIES =
43	am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
44	cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
45	- grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
46	+ grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
47	image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
48	window_w32.lo
49	libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
50	@@ -201,7 +201,7 @@
51	lib_LTLIBRARIES = libhighgui.la
52	libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
53	cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
54	- grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
55	+ grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
56	image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
57	window_w32.cpp
58
59	--- otherlibs/highgui/grfmts.h.orig Mon Feb 28 17:10:41 2005
60	+++ otherlibs/highgui/grfmts.h Mon Feb 28 17:10:45 2005
61	@@ -47,7 +47,6 @@
62	#include "grfmt_sunras.h"
63	#include "grfmt_jpeg.h"
64	#include "grfmt_pxm.h"
65	-#include "grfmt_tiff.h"
66	#include "grfmt_png.h"
67
68	#endif/_GRFMTS_H_/
69
70	--- otherlibs/highgui/loadsave.cpp.orig Mon Feb 28 17:12:05 2005
71	+++ otherlibs/highgui/loadsave.cpp Mon Feb 28 17:12:09 2005
72	@@ -299,7 +299,6 @@
73	m_factories->AddFactory( new GrFmtJpeg() );
74	m_factories->AddFactory( new GrFmtSunRaster() );
75	m_factories->AddFactory( new GrFmtPxM() );
76	- m_factories->AddFactory( new GrFmtTiff() );
77	#ifdef HAVE_PNG
78	m_factories->AddFactory( new GrFmtPng() );
79	#endif
80
81	--- configure.orig Thu Aug 19 03:46:49 2004
82	+++ configure Mon Feb 28 17:16:51 2005
83	@@ -21218,7 +21218,7 @@
84
85
86	have_v4l=no
87	-if test x$os_name=xLinux; then
88	+if test x$os_name = xLinux; then
89
90	cat >>confdefs.h <<\_ACEOF
91	#define HAVE_CAMV4L
92
93	--- tests/cxcore/src/Makefile.in.orig Mon Feb 28 17:32:29 2005
94	+++ tests/cxcore/src/Makefile.in Mon Feb 28 17:32:57 2005
95	@@ -189,6 +189,7 @@
96	EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
97	INCLUDES = -I. -I../../../cxcore/include -I../../cxts -I../../..
98	cxcoretest_LDADD = -L../../../cxcore/src -lcxcore -L../../cxts -lcxts
99	+cxcoretest_LDFLAGS = -pthread
100	all: all-am
101
102	.SUFFIXES:
103

Lines 1-12 Link Here

(-)opencv/files/patch-configure (-12 / +30 lines)
1	--- configure.orig Thu Aug 19 03:46:49 2004	1	--- configure.orig Wed Mar 7 19:49:27 2007
2	+++ configure Mon Feb 28 17:16:51 2005	2	+++ configure Wed Mar 7 19:49:52 2007
3	@@ -21218,7 +21218,7 @@	3	@@ -22958,13 +22958,13 @@
4		4
5		5
6	have_v4l=no	6	if test x"$have_png" = "xyes"; then
7	-if test x$os_name=xLinux; then	7	- echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
8	+if test x$os_name = xLinux; then	8	-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
9		9	+ echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
10	cat >>confdefs.h <<\_ACEOF	10	+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
11	#define HAVE_CAMV4L	11	if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
12		12	echo $ECHO_N "(cached) $ECHO_C" >&6
		13	else
		14	ac_check_lib_save_LIBS=$LIBS
		15	-LIBS="-lpng12 $LIBS"
		16	+LIBS="-lpng $LIBS"
		17	cat >conftest.$ac_ext <<_ACEOF
		18	/* confdefs.h. */
		19	_ACEOF
		20	@@ -23030,8 +23030,8 @@
		21	#define HAVE_PNG
		22	_ACEOF
		23
		24	- IMAGELIBS="-lpng12 $IMAGELIBS"
		25	- LIBS="-lpng12 $LIBS"
		26	+ IMAGELIBS="-lpng $IMAGELIBS"
		27	+ LIBS="-lpng $LIBS"
		28
		29
		30	for ac_func in png_get_valid png_set_tRNS_to_alpha

Lines 1-12 Link Here

(-)opencv/files/patch-cv_src_Makefile.in (-12 lines)
1	--- cv/src/Makefile.in.orig Mon Feb 28 16:41:54 2005
2	+++ cv/src/Makefile.in Mon Feb 28 16:42:14 2005
3	@@ -177,7 +177,7 @@
4	INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
5	LDFLAGS = @LDFLAGS@
6	LIBOBJS = @LIBOBJS@
7	-LIBS = -ldl -lpthread -lm
8	+LIBS = @LIBS@
9	LIBTOOL = @LIBTOOL@
10	LN_S = @LN_S@
11	LTLIBOBJS = @LTLIBOBJS@
12

Lines 1-12 Link Here

(-)opencv/files/patch-cxcore_src_Makefile.in (-12 lines)
1	--- cxcore/src/Makefile.in.orig Mon Feb 28 16:40:06 2005
2	+++ cxcore/src/Makefile.in Mon Feb 28 16:40:18 2005
3	@@ -137,7 +137,7 @@
4	INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
5	LDFLAGS = @LDFLAGS@
6	LIBOBJS = @LIBOBJS@
7	-LIBS = -ldl -lpthread -lm
8	+LIBS = @LIBS@
9	LIBTOOL = @LIBTOOL@
10	LN_S = @LN_S@
11	LTLIBOBJS = @LTLIBOBJS@
12

Lines 1-14 Link Here

(-)opencv/files/patch-cxcore_src_cxswitcher.cpp (-14 lines)
1	--- cxcore/src/cxswitcher.cpp Mon Feb 28 16:34:30 2005
2	+++ cxcore/src/cxswitcher.cpp.freebsd Mon Feb 28 16:34:17 2005
3	@@ -593,8 +593,8 @@
4	QueryPerformanceCounter( &counter );
5	return (int64)counter.QuadPart;
6	#else
7	- timeval tv;
8	- timezone tz;
9	+ struct timeval tv; // patch for FreeBSD: add "struct"
10	+ struct timezone tz; // patch for FreeBSD: add "struct"
11	gettimeofday( &tv, &tz );
12	return (int64)tv.tv_sec*1000000 + tv.tv_usec;
13	#endif
14

Lines 1-20 Link Here

(-)opencv/files/patch-otherlibs_highgui_Makefile.in (-20 lines)
1	--- otherlibs/highgui/Makefile.in.orig Thu Aug 19 20:46:43 2004
2	+++ otherlibs/highgui/Makefile.in Thu Dec 29 13:44:02 2005
3	@@ -54,7 +54,7 @@
4	libhighgui_la_DEPENDENCIES =
5	am_libhighgui_la_OBJECTS = bitstrm.lo cvcap.lo cvcap_dc1394.lo \
6	cvcap_v4l.lo grfmt_base.lo grfmt_bmp.lo grfmt_jpeg.lo \
7	- grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo grfmt_tiff.lo \
8	+ grfmt_png.lo grfmt_pxm.lo grfmt_sunras.lo \
9	image.lo loadsave.lo precomp.lo utils.lo window_lnx.lo \
10	window_w32.lo
11	libhighgui_la_OBJECTS = $(am_libhighgui_la_OBJECTS)
12	@@ -201,7 +201,7 @@
13	lib_LTLIBRARIES = libhighgui.la
14	libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
15	cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
16	- grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
17	+ grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp \
18	image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
19	window_w32.cpp
20

Lines 1-124 Link Here

(-)opencv/pkg-plist (-111 / +197 lines)
1	bin/opencv-haartraining	1	%%DEMO%%bin/opencv-createsamples
2	bin/opencv-createsamples	2	%%DEMO%%bin/opencv-haartraining
3	bin/opencv-performance	3	%%DEMO%%bin/opencv-performance
4	lib/libcv.a
5	lib/libcv.la
6	lib/libcv.so
7	lib/libcv.so.9
8	lib/libcvaux.a
9	lib/libcvaux.la
10	lib/libcvaux.so
11	lib/libcvaux.so.9
12	lib/libcvhaartraining.a
13	lib/libhighgui.a
14	lib/libhighgui.la
15	lib/libhighgui.so
16	lib/libhighgui.so.9
17	lib/libcxts.a
18	lib/libcxcore.a
19	lib/libcxcore.la
20	lib/libcxcore.so
21	lib/libcxcore.so.9
22	libdata/pkgconfig/opencv.pc
23	include/opencv/cv.h	4	include/opencv/cv.h
24	include/opencv/cv.hpp	5	include/opencv/cv.hpp
25	include/opencv/cvaux.h	6	include/opencv/cvaux.h
26	include/opencv/cvaux.hpp	7	include/opencv/cvaux.hpp
27	include/opencv/cvcompat.h	8	include/opencv/cvcompat.h
28	include/opencv/cvhaartraining.h	9	%%DEMO%%include/opencv/cvhaartraining.h
29	include/opencv/cvmat.hpp	10	include/opencv/cvmat.hpp
30	include/opencv/cvtypes.h	11	include/opencv/cvtypes.h
		12	include/opencv/cvver.h
		13	include/opencv/cvvidsurv.hpp
31	include/opencv/cxcore.h	14	include/opencv/cxcore.h
		15	include/opencv/cxcore.hpp
32	include/opencv/cxerror.h	16	include/opencv/cxerror.h
33	include/opencv/cxmisc.h	17	include/opencv/cxmisc.h
34	include/opencv/cxtypes.h	18	include/opencv/cxtypes.h
35	include/opencv/highgui.h	19	include/opencv/highgui.h
		20	include/opencv/ml.h
		21	lib/libcv.a
		22	lib/libcv.la
		23	lib/libcv.so
		24	lib/libcv.so.1
		25	lib/libcvaux.a
		26	lib/libcvaux.la
		27	lib/libcvaux.so
		28	lib/libcvaux.so.1
		29	%%DEMO%%lib/libcvhaartraining.a
		30	lib/libcxcore.a
		31	lib/libcxcore.la
		32	lib/libcxcore.so
		33	lib/libcxcore.so.1
		34	lib/libhighgui.a
		35	lib/libhighgui.la
		36	lib/libhighgui.so
		37	lib/libhighgui.so.1
		38	lib/libml.a
		39	lib/libml.la
		40	lib/libml.so
		41	lib/libml.so.1
		42	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.py
		43	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyc
		44	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/__init__.pyo
		45	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.a
		46	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.la
		47	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_cv.so
		48	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.a
		49	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.la
		50	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/_highgui.so
		51	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.py
		52	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyc
		53	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/adaptors.pyo
		54	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.py
		55	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyc
		56	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/cv.pyo
		57	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.py
		58	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyc
		59	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/highgui.pyo
		60	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.py
		61	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyc
		62	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/opencv/matlab_syntax.pyo
		63	libdata/pkgconfig/opencv.pc
		64	%%DATADIR%%/doc/cvcam.rtf
		65	%%DATADIR%%/doc/faq.htm
		66	%%DATADIR%%/doc/index.htm
		67	%%DATADIR%%/doc/license.txt
		68	%%DATADIR%%/doc/opencv.jpg
		69	%%DATADIR%%/doc/opencvman_old.pdf
		70	%%DATADIR%%/doc/papers/algo_tracking.pdf
		71	%%DATADIR%%/doc/papers/avbpa99.ps
		72	%%DATADIR%%/doc/papers/camshift.pdf
		73	%%DATADIR%%/doc/python-wrappers-on-windows.txt
		74	%%DATADIR%%/doc/python.txt
		75	%%DATADIR%%/doc/ref/opencvref.css
		76	%%DATADIR%%/doc/ref/opencvref_cv.htm
		77	%%DATADIR%%/doc/ref/opencvref_cvaux.htm
		78	%%DATADIR%%/doc/ref/opencvref_cxcore.htm
		79	%%DATADIR%%/doc/ref/opencvref_highgui.htm
		80	%%DATADIR%%/doc/ref/opencvref_ml.htm
		81	%%DATADIR%%/doc/ref/pics/backprojectpatch.png
		82	%%DATADIR%%/doc/ref/pics/boundingrect.png
		83	%%DATADIR%%/doc/ref/pics/building.jpg
84	%%DATADIR%%/doc/ref/pics/contoursecarea.png
85	%%DATADIR%%/doc/ref/pics/cornersubpix.png
86	%%DATADIR%%/doc/ref/pics/defects.png
87	%%DATADIR%%/doc/ref/pics/ellipse.png
88	%%DATADIR%%/doc/ref/pics/em1.png
89	%%DATADIR%%/doc/ref/pics/em3.png
90	%%DATADIR%%/doc/ref/pics/em4.png
91	%%DATADIR%%/doc/ref/pics/em5.png
92	%%DATADIR%%/doc/ref/pics/em6.png
93	%%DATADIR%%/doc/ref/pics/em7.png
94	%%DATADIR%%/doc/ref/pics/em8.png
95	%%DATADIR%%/doc/ref/pics/em9.png
96	%%DATADIR%%/doc/ref/pics/errmsg.png
97	%%DATADIR%%/doc/ref/pics/face.png
98	%%DATADIR%%/doc/ref/pics/haarfeatures.png
99	%%DATADIR%%/doc/ref/pics/houghp.png
100	%%DATADIR%%/doc/ref/pics/inv_logpolar.jpg
101	%%DATADIR%%/doc/ref/pics/left.jpg
102	%%DATADIR%%/doc/ref/pics/logpolar.jpg
103	%%DATADIR%%/doc/ref/pics/maxrect.png
104	%%DATADIR%%/doc/ref/pics/memstorage1.png
105	%%DATADIR%%/doc/ref/pics/memstorage2.png
106	%%DATADIR%%/doc/ref/pics/minareabox.png
107	%%DATADIR%%/doc/ref/pics/mlp_.png
108	%%DATADIR%%/doc/ref/pics/neuron_model.png
109	%%DATADIR%%/doc/ref/pics/pointpolygon.png
110	%%DATADIR%%/doc/ref/pics/quadedge.png
111	%%DATADIR%%/doc/ref/pics/right.jpg
112	%%DATADIR%%/doc/ref/pics/sigmoid_bipolar.png
113	%%DATADIR%%/doc/ref/pics/subdiv.png
114	%%DATADIR%%/doc/ref/pics/threshold.png
115	%%DATADIR%%/haarcascades/haarcascade_frontalface_alt.xml
116	%%DATADIR%%/haarcascades/haarcascade_frontalface_alt2.xml
117	%%DATADIR%%/haarcascades/haarcascade_frontalface_alt_tree.xml
118	%%DATADIR%%/haarcascades/haarcascade_frontalface_default.xml
119	%%DATADIR%%/haarcascades/haarcascade_fullbody.xml
120	%%DATADIR%%/haarcascades/haarcascade_lowerbody.xml
121	%%DATADIR%%/haarcascades/haarcascade_profileface.xml
122	%%DATADIR%%/haarcascades/haarcascade_upperbody.xml
123	%%DATADIR%%/readme.txt
124	%%DATADIR%%/samples/c/agaricus-lepiota.data
125	%%DATADIR%%/samples/c/airplane.jpg
126	%%DATADIR%%/samples/c/baboon.jpg
127	%%DATADIR%%/samples/c/blobtrack.cpp
128	%%DATADIR%%/samples/c/build_all.sh
129	%%DATADIR%%/samples/c/camshiftdemo.c
130	%%DATADIR%%/samples/c/contours.c
131	%%DATADIR%%/samples/c/convert_cascade.c
132	%%DATADIR%%/samples/c/convexhull.c
133	%%DATADIR%%/samples/c/cvsample.dsp
134	%%DATADIR%%/samples/c/cvsample.vcproj
135	%%DATADIR%%/samples/c/delaunay.c
136	%%DATADIR%%/samples/c/demhist.c
137	%%DATADIR%%/samples/c/dft.c
138	%%DATADIR%%/samples/c/distrans.c
139	%%DATADIR%%/samples/c/drawing.c
140	%%DATADIR%%/samples/c/edge.c
141	%%DATADIR%%/samples/c/facedetect.c
142	%%DATADIR%%/samples/c/facedetect.cmd
143	%%DATADIR%%/samples/c/ffilldemo.c
144	%%DATADIR%%/samples/c/fitellipse.c
145	%%DATADIR%%/samples/c/fruits.jpg
146	%%DATADIR%%/samples/c/houghlines.c
147	%%DATADIR%%/samples/c/image.cpp
148	%%DATADIR%%/samples/c/inpaint.cpp
149	%%DATADIR%%/samples/c/kalman.c
150	%%DATADIR%%/samples/c/kmeans.c
151	%%DATADIR%%/samples/c/laplace.c
152	%%DATADIR%%/samples/c/lena.jpg
153	%%DATADIR%%/samples/c/letter-recognition.data
154	%%DATADIR%%/samples/c/letter_recog.cpp
155	%%DATADIR%%/samples/c/lkdemo.c
156	%%DATADIR%%/samples/c/makefile.gnu
157	%%DATADIR%%/samples/c/makefile.ms
158	%%DATADIR%%/samples/c/minarea.c
159	%%DATADIR%%/samples/c/morphology.c
160	%%DATADIR%%/samples/c/motempl.c
161	%%DATADIR%%/samples/c/mushroom.cpp
162	%%DATADIR%%/samples/c/pic1.png
163	%%DATADIR%%/samples/c/pic2.png
164	%%DATADIR%%/samples/c/pic3.png
165	%%DATADIR%%/samples/c/pic4.png
166	%%DATADIR%%/samples/c/pic5.png
167	%%DATADIR%%/samples/c/pic6.png
168	%%DATADIR%%/samples/c/pyramid_segmentation.c
169	%%DATADIR%%/samples/c/squares.c
170	%%DATADIR%%/samples/c/stuff.jpg
171	%%DATADIR%%/samples/c/watershed.cpp
172	%%DATADIR%%/samples/python/cam-histo.py
173	%%DATADIR%%/samples/python/capture-cam.py
174	%%DATADIR%%/samples/python/chessboard.py
175	%%DATADIR%%/samples/python/contours.py
176	%%DATADIR%%/samples/python/convexhull.py
177	%%DATADIR%%/samples/python/delaunay.py
178	%%DATADIR%%/samples/python/demhist.py
179	%%DATADIR%%/samples/python/dft.py
180	%%DATADIR%%/samples/python/distrans.py
181	%%DATADIR%%/samples/python/drawing.py
182	%%DATADIR%%/samples/python/edge.py
183	%%DATADIR%%/samples/python/facedetect.py
184	%%DATADIR%%/samples/python/ffilldemo.py
185	%%DATADIR%%/samples/python/fitellipse.py
186	%%DATADIR%%/samples/python/houghlines.py
187	%%DATADIR%%/samples/python/inpaint.py
188	%%DATADIR%%/samples/python/kalman.py
189	%%DATADIR%%/samples/python/kmeans.py
190	%%DATADIR%%/samples/python/laplace.py
191	%%DATADIR%%/samples/python/lkdemo.py
192	%%DATADIR%%/samples/python/logpolar.py
193	%%DATADIR%%/samples/python/minarea.py
194	%%DATADIR%%/samples/python/minidemo.py
195	%%DATADIR%%/samples/python/morphology.py
196	%%DATADIR%%/samples/python/motempl.py
197	%%DATADIR%%/samples/python/pyramid_segmentation.py
198	%%DATADIR%%/samples/python/squares.py
199	%%DATADIR%%/samples/python/watershed.py
200	@dirrm %%DATADIR%%/samples/python
201	@dirrm %%DATADIR%%/samples/c
202	@dirrm %%DATADIR%%/samples
203	@dirrm %%DATADIR%%/haarcascades
204	@dirrm %%DATADIR%%/doc/ref/pics
205	@dirrm %%DATADIR%%/doc/ref
206	@dirrm %%DATADIR%%/doc/papers
207	@dirrm %%DATADIR%%/doc
208	@dirrm %%DATADIR%%
209	%%PYTHON%%@dirrm %%PYTHONPREFIX_SITELIBDIR%%/opencv
36	@dirrm include/opencv	210	@dirrm include/opencv
37	share/opencv/readme.txt
38	share/opencv/doc/cvcam.rtf
39	share/opencv/doc/faq.htm
40	share/opencv/doc/index.htm
41	share/opencv/doc/license.txt
42	share/opencv/doc/opencv.jpg
43	share/opencv/doc/opencvman_old.pdf
44	share/opencv/haarcascades/haarcascade_frontalface_alt.xml
45	share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
46	share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
47	share/opencv/haarcascades/haarcascade_frontalface_default.xml
48	share/opencv/haarcascades/haarcascade_fullbody.xml
49	share/opencv/haarcascades/haarcascade_lowerbody.xml
50	share/opencv/haarcascades/haarcascade_profileface.xml
51	share/opencv/haarcascades/haarcascade_upperbody.xml
52	@dirrm share/opencv/haarcascades
53	share/opencv/doc/papers/algo_tracking.pdf
54	share/opencv/doc/papers/avbpa99.ps
55	share/opencv/doc/papers/camshift.pdf
56	@dirrm share/opencv/doc/papers
57	share/opencv/doc/ref/opencvref.css
58	share/opencv/doc/ref/opencvref_cv.htm
59	share/opencv/doc/ref/opencvref_cvaux.htm
60	share/opencv/doc/ref/opencvref_cxcore.htm
61	share/opencv/doc/ref/opencvref_highgui.htm
62	share/opencv/samples/c/airplane.jpg
63	share/opencv/samples/c/baboon.jpg
64	share/opencv/samples/c/build_all.sh
65	share/opencv/samples/c/camshiftdemo.c
66	share/opencv/samples/c/contours.c
67	share/opencv/samples/c/convexhull.c
68	share/opencv/samples/c/cvsample.dsp
69	share/opencv/samples/c/cvsample.vcproj
70	share/opencv/samples/c/delaunay.c
71	share/opencv/samples/c/demhist.c
72	share/opencv/samples/c/distrans.c
73	share/opencv/samples/c/drawing.c
74	share/opencv/samples/c/edge.c
75	share/opencv/samples/c/facedetect.c
76	share/opencv/samples/c/facedetect.cmd
77	share/opencv/samples/c/ffilldemo.c
78	share/opencv/samples/c/fitellipse.c
79	share/opencv/samples/c/fruits.jpg
80	share/opencv/samples/c/kalman.c
81	share/opencv/samples/c/kmeans.c
82	share/opencv/samples/c/laplace.c
83	share/opencv/samples/c/lena.jpg
84	share/opencv/samples/c/lkdemo.c
85	share/opencv/samples/c/makefile.gcc
86	share/opencv/samples/c/makefile.gen
87	share/opencv/samples/c/minarea.c
88	share/opencv/samples/c/morphology.c
89	share/opencv/samples/c/motempl.c
90	share/opencv/samples/c/pic1.png
91	share/opencv/samples/c/pic2.png
92	share/opencv/samples/c/pic3.png
93	share/opencv/samples/c/pic4.png
94	share/opencv/samples/c/pic5.png
95	share/opencv/samples/c/pic6.png
96	share/opencv/samples/c/pyramid_segmentation.c
97	share/opencv/samples/c/squares.c
98	share/opencv/samples/c/stuff.jpg
99	@dirrm share/opencv/samples/c
100	@dirrm share/opencv/samples
101	share/opencv/doc/ref/pics/backprojectpatch.png
102	share/opencv/doc/ref/pics/boundingrect.png
103	share/opencv/doc/ref/pics/building.jpg
104	share/opencv/doc/ref/pics/contoursecarea.png
105	share/opencv/doc/ref/pics/cornersubpix.png
106	share/opencv/doc/ref/pics/defects.png
107	share/opencv/doc/ref/pics/ellipse.png
108	share/opencv/doc/ref/pics/errmsg.png
109	share/opencv/doc/ref/pics/face.png
110	share/opencv/doc/ref/pics/haarfeatures.png
111	share/opencv/doc/ref/pics/houghp.png
112	share/opencv/doc/ref/pics/left.jpg
113	share/opencv/doc/ref/pics/maxrect.png
114	share/opencv/doc/ref/pics/memstorage1.png
115	share/opencv/doc/ref/pics/memstorage2.png
116	share/opencv/doc/ref/pics/minareabox.png
117	share/opencv/doc/ref/pics/quadedge.png
118	share/opencv/doc/ref/pics/right.jpg
119	share/opencv/doc/ref/pics/subdiv.png
120	share/opencv/doc/ref/pics/threshold.png
121	@dirrm share/opencv/doc/ref/pics
122	@dirrm share/opencv/doc/ref
123	@dirrm share/opencv/doc
124	@dirrm share/opencv