Date: Wed, 25 Nov 2009 12:04:54 GMT From: Alberto Villa <villa.alberto@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140860: [maintainer update] Update port: graphics/opencv 1.0.0 -> 2.0.0 Message-ID: <200911251204.nAPC4sdn038167@www.freebsd.org> Resent-Message-ID: <200911251210.nAPCA4bW031904@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140860 >Category: ports >Synopsis: [maintainer update] Update port: graphics/opencv 1.0.0 -> 2.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 25 12:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alberto Villa >Release: FreeBSD 8-STABLE >Organization: >Environment: FreeBSD echo.hoth 8.0-RC2 FreeBSD 8.0-RC2 #7: Thu Nov 5 13:16:49 CET 2009 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386 >Description: This is OpenCV 2.0, the source package for Linux, MacOSX and every other Unix-like OS. The major features: =================== * the brand-new C++ interface, in addition to the existing OpenCV 1.x C API. * a lot of new functionality, especially in the area of feature detectors and descriptors * SSE2 optimization of many functions * the revised directory structure and the completely new CMake-based build system * completely new documentation, available offline as PDF (included) and online: http://opencv.willowgarage.com/documentation/index.html and a lot more; please, see the ChangeLog. >How-To-Repeat: >Fix: library soversion changed, needs updating of ports depending on it added files: files/patch-samples-CMakeLists.txt files/patch-src-highgui-cvcap_ffmpeg.cpp files/patch-src-highgui-cvcap_v4l.cpp deleted files: files/patch-Makefile.in files/patch-configure files/patch-interfaces-swig-python-Makefile.in files/patch-otherlibs-highgui-cvcap_ffmpeg.cpp files/patch-otherlibs-highgui-cvcap_v4l.cpp Patch attached with submission follows: diff -ruN /usr/ports/graphics/opencv/Makefile /usr/jail/stratofortress/usr/ports/graphics/opencv/Makefile --- /usr/ports/graphics/opencv/Makefile 2009-08-22 02:23:01.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/Makefile 2009-11-25 09:44:28.179619645 +0100 @@ -1,5 +1,4 @@ -# New ports collection makefile for: opencv - open source computer vision -# library from Intel +# New ports collection makefile for: opencv # Date created: 05 March 2005 # Whom: Marc Abramowitz (http://marc.abramowitz.info) # @@ -7,129 +6,160 @@ # PORTNAME= opencv -PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTVERSION= 2.0.0 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-linux/1.0 +MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/2.0 +DISTNAME= OpenCV-${PORTVERSION} MAINTAINER= villa.alberto@gmail.com COMMENT= Open Source Computer Vision library from Intel -BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat - -CFLAGS+= -I${LOCALBASE}/include/OpenEXR -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/OpenEXR -LDFLAGS+= -L${LOCALBASE}/lib -USE_AUTOTOOLS= libtool:22 -USE_GMAKE= yes +USE_GNOME= pkgconfig +WANT_GSTREAMER= yes +MAKE_JOBS_SAFE= yes +USE_BZIP2= yes +USE_CMAKE= yes +CMAKE_ARGS= -DWITH_1394:BOOL=Off -DWITH_UNICAP:BOOL=Off +CMAKE_SOURCE_PATH= ${WRKSRC} USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-v4l --without-quicktime --without-carbon \ - --without-1394libs \ - --without-swig # I don't know anything about swig ... -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff \ - jasper:${PORTSDIR}/graphics/jasper \ - IlmImf:${PORTSDIR}/graphics/OpenEXR -USE_GNOME= - -NOT_FOR_ARCHS= sparc64 -NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 - -OPTIONS= DEBUG "Build debugging symbols" off \ - DEMO "Build demo apps" off \ - FFMPEG "Enable FFMPEG support" off \ - GTK "Enable GTK+-2.0 support" off \ - PYTHON "Enable PYTHON support" off \ - XINE "Enable XINE support" 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 \ + +PORTDOCS= CMakeLists.txt ChangeLog.htm haartraining.htm index.htm \ + latex_readme.txt license.txt opencv-logo.png \ + opencv-logo2.png opencv.jpg opencv.pdf packaging.txt \ + papers pattern.pdf python.txt vidsurv + +PORTEXAMPLES= c + +OPTIONS= FFMPEG "Include FFmpeg support" off \ + GSTREAMER "Include Gstreamer support" off \ + GTK "Include GTK+ support" off \ + JASPER "Include JPEG 2000 support" on \ + JPEG "Include JPEG support" on \ + PNG "Include PNG support" on \ + PYTHON "Build with Python support" off \ + TIFF "Include TIFF support" on \ + V4L "Include Video4Linux support" on \ + XINE "Include XINE support" off + +# cannot be built with cmake yet +#OCTAVE "Build with Octave support" off \ .include <bsd.port.pre.mk> +.ifndef(NOPORTEXAMPLES) +CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=On -DINSTALL_C_EXAMPLES:BOOL=On +.endif + +.if defined(WITH_FFMPEG) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=On +.else +CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=Off +.endif + +.if defined(WITH_GSTREAMER) +LIB_DEPENDS+= gstreamer-${GST_VERSION}.0:${PORTSDIR}/multimedia/gstreamer +CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=On +.else +CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=Off +.endif + .if defined(WITH_GTK) USE_GNOME= gtk20 -CONFIGURE_ARGS+=--with-gtk +CMAKE_ARGS+= -DWITH_GTK:BOOL=On .else -CONFIGURE_ARGS+=--without-gtk +CMAKE_ARGS+= -DWITH_GTK:BOOL=Off .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(WITHOUT_JASPER) +LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper +CMAKE_ARGS+= -DWITH_JASPER:BOOL=On +.else +CMAKE_ARGS+= -DWITH_JASPER:BOOL=Off +.endif -.if defined(WITH_XINE) -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine -CONFIGURE_ARGS+=--with-xine +.if !defined(WITHOUT_JPEG) +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg +CMAKE_ARGS+= -DWITH_JPEG:BOOL=On .else -CONFIGURE_ARGS+=--without-xine +CMAKE_ARGS+= -DWITH_JPEG:BOOL=Off .endif -.if defined(WITH_FFMPEG) -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -CONFIGURE_ARGS+=--with-ffmpeg +#.if defined(WITH_OCTAVE) +#.include "${PORTSDIR}/Mk/bsd.octave.mk" +#CMAKE_ARGS+= -DBUILD_OCTAVE_SUPPORT:BOOL=On +#.ifndef(NOPORTEXAMPLES) +#CMAKE_ARGS+= -DINSTALL_OCTAVE_EXAMPLES:BOOL=On +#PORTEXAMPLES+= octave +#.endif +#PLIST_SUB+= OCTAVE="" +#.else +#CMAKE_ARGS+= -DBUILD_OCTAVE_SUPPORT:BOOL=Off +#PLIST_SUB+= OCTAVE="@comment " +#.endif + +.if !defined(WITHOUT_PNG) +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png +CMAKE_ARGS+= -DWITH_PNG:BOOL=On .else -CONFIGURE_ARGS+=--without-ffmpeg +CMAKE_ARGS+= -DWITH_PNG:BOOL=Off .endif .if defined(WITH_PYTHON) +.include "${PORTSDIR}/Mk/bsd.python.mk" USE_PYTHON= yes -CONFIGURE_ARGS+=--with-python +CMAKE_ARGS+= -DBUILD_NEW_PYTHON_SUPPORT:BOOL=On +.ifndef(NOPORTEXAMPLES) +CMAKE_ARGS+= -DINSTALL_PYTHON_EXAMPLES:BOOL=On +PORTEXAMPLES+= python +.endif PLIST_SUB+= PYTHON="" .else -CONFIGURE_ARGS+=--without-python +CMAKE_ARGS+= -DBUILD_NEW_PYTHON_SUPPORT:BOOL=Off PLIST_SUB+= PYTHON="@comment " .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug +.if !defined(WITHOUT_TIFF) +LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +CMAKE_ARGS+= -DWITH_TIFF:BOOL=On .else -CONFIGURE_ARGS+=--disable-debug +CMAKE_ARGS+= -DWITH_TIFF:BOOL=Off .endif -.if defined(WITH_DEMO) -CONFIGURE_ARGS+=--enable-apps -PLIST_SUB+= DEMO="" +.if !defined(WITHOUT_V4L) +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat +CMAKE_ARGS+= -DWITH_V4L:BOOL=On \ + -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" .else -CONFIGURE_ARGS+=--disable-apps -PLIST_SUB+= DEMO="@comment " +CMAKE_ARGS+= -DWITH_V4L:BOOL=Off .endif +.if defined(WITH_XINE) +LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +CMAKE_ARGS+= -DWITH_XINE:BOOL=On +.else +CMAKE_ARGS+= -DWITH_XINE:BOOL=Off +.endif + +CONFIGURE_WRKSRC=${WRKSRC}/build +BUILD_WRKSRC=${CONFIGURE_WRKSRC} +INSTALL_WRKSRC=${BUILD_WRKSRC} + pre-configure: - @${REINPLACE_CMD} -e 's/-pthread/-pthread|${PTHREAD_LIBS}/' \ - ${WRKSRC}/autotools/ltmain.sh - @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/Makefile.* + @${MKDIR} ${CONFIGURE_WRKSRC} + @${REINPLACE_CMD} -e 's:set(OPENCV_SOVERSION.*:set(OPENCV_SOVERSION "$${OPENCV_VERSION_MAJOR}"):' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's:-pthread:${PTHREAD_LIBS}:g' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's:lib/pkgconfig:libdata/pkgconfig:g' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's:${PORTNAME}/doc:doc/${PORTNAME}:g' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's:${PORTNAME}/samples:examples/${PORTNAME}:g' \ + ${WRKSRC}/samples/*/CMakeLists.txt +.ifdef(NOPORTDOCS) + @${REINPLACE_CMD} -e '/add_subdirectory(doc)/ d' \ + ${WRKSRC}/CMakeLists.txt +.endif .include <bsd.port.post.mk> diff -ruN /usr/ports/graphics/opencv/distinfo /usr/jail/stratofortress/usr/ports/graphics/opencv/distinfo --- /usr/ports/graphics/opencv/distinfo 2007-04-05 10:29:24.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/distinfo 2009-11-24 13:02:19.074574790 +0100 @@ -1,3 +1,3 @@ -MD5 (opencv-1.0.0.tar.gz) = 146a05005f2d2c16c4ee10ebd7f1dd58 -SHA256 (opencv-1.0.0.tar.gz) = 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e -SIZE (opencv-1.0.0.tar.gz) = 11146334 +MD5 (OpenCV-2.0.0.tar.bz2) = ed27520514baacc5edad7b06ad24130e +SHA256 (OpenCV-2.0.0.tar.bz2) = c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022 +SIZE (OpenCV-2.0.0.tar.bz2) = 12779856 diff -ruN /usr/ports/graphics/opencv/files/patch-Makefile.in /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-Makefile.in --- /usr/ports/graphics/opencv/files/patch-Makefile.in 2007-04-05 10:29:24.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Mar 4 22:34:16 2007 -+++ Makefile.in Sun Mar 4 22:34:35 2007 -@@ -270,7 +270,7 @@ - #EXTRA_DIST = THANKS TODO \ - # opencv.spec opencv.spec.in opencv.pc.in opencv.pc \ - # _make apps filters --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = opencv.pc - - # The directory where the include files will be installed diff -ruN /usr/ports/graphics/opencv/files/patch-configure /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-configure --- /usr/ports/graphics/opencv/files/patch-configure 2007-04-05 10:29:24.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ ---- 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 diff -ruN /usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in --- /usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in 2009-08-18 10:16:07.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ ---- interfaces/swig/python/Makefile.in.orig 2009-08-17 13:05:42.767591162 +0200 -+++ interfaces/swig/python/Makefile.in 2009-08-17 13:12:40.803413956 +0200 -@@ -338,16 +338,14 @@ - - @BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_CXXFLAGS = $(PYTHON_CSPEC) - @BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la --@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ --@BUILD_PYTHON_WRAPPERS_TRUE@ -L$(SWIG_PYTHON_LIBS) -+@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) - - @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \ - @BUILD_PYTHON_WRAPPERS_TRUE@ highgui.i - - @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_CXXFLAGS = $(PYTHON_CSPEC) - @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la --@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ --@BUILD_PYTHON_WRAPPERS_TRUE@ -L$(SWIG_PYTHON_LIBS) -+@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) - - all: all-am - diff -ruN /usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_ffmpeg.cpp /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_ffmpeg.cpp --- /usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_ffmpeg.cpp 2009-08-18 10:16:07.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_ffmpeg.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ ---- otherlibs/highgui/cvcap_ffmpeg.cpp.orig 2006-07-25 00:27:39.000000000 +0200 -+++ otherlibs/highgui/cvcap_ffmpeg.cpp 2009-08-15 23:05:18.343750709 +0200 -@@ -41,9 +41,14 @@ - - #include "_highgui.h" - -+#define __STDC_CONSTANT_MACROS - - extern "C" { - #include <ffmpeg/avformat.h> -+#include <ffmpeg/avcodec.h> -+#include <ffmpeg/swscale.h> -+#include <sys/types.h> /* size_t */ -+#include <sys/errno.h> - } - - #ifdef NDEBUG -@@ -52,6 +57,8 @@ - #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__) - #endif - -+static struct SwsContext *img_convert_ctx; -+ - typedef struct CvCaptureAVI_FFMPEG - { - CvCaptureVTable * vtable; -@@ -214,19 +221,21 @@ - { - if( !capture || !capture->video_st || !capture->picture->data[0] ) - return 0; --#if LIBAVFORMAT_BUILD > 4628 -- img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24, -- (AVPicture*)capture->picture, -- capture->video_st->codec->pix_fmt, -- capture->video_st->codec->width, -- capture->video_st->codec->height ); --#else -- img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24, -- (AVPicture*)capture->picture, -- capture->video_st->codec.pix_fmt, -- capture->video_st->codec.width, -- capture->video_st->codec.height ); --#endif -+ -+ img_convert_ctx = sws_getContext(capture->video_st->codec->width, -+ capture->video_st->codec->height, -+ capture->video_st->codec->pix_fmt, -+ capture->video_st->codec->width, -+ capture->video_st->codec->height, -+ PIX_FMT_BGR24, -+ SWS_BICUBIC, -+ NULL, NULL, NULL); -+ -+ sws_scale(img_convert_ctx, capture->picture->data, -+ capture->picture->linesize, 0, -+ capture->video_st->codec->height, -+ capture->rgb_picture.data, capture->rgb_picture.linesize); -+ - return &capture->frame; - } - -@@ -389,7 +398,11 @@ - picture = avcodec_alloc_frame(); - if (!picture) - return NULL; -+#if LIBAVCODEC_BUILD < 3416064 - size = avpicture_get_size(pix_fmt, width, height); -+#else -+ size = avpicture_get_size((PixelFormat)pix_fmt, width, height); -+#endif - if(alloc){ - picture_buf = (uint8_t *) cvAlloc(size); - if (!picture_buf) -@@ -398,7 +411,11 @@ - return NULL; - } - avpicture_fill((AVPicture *)picture, picture_buf, -+#if LIBAVCODEC_BUILD < 3416064 - pix_fmt, width, height); -+#else -+ (PixelFormat)pix_fmt, width, height); -+#endif - } - else { - } -@@ -713,9 +730,20 @@ - PIX_FMT_BGR24, image->width, image->height); - - // convert to the color format needed by the codec -- if( img_convert((AVPicture *)mywriter->picture, c->pix_fmt, -- (AVPicture *)mywriter->rgb_picture, PIX_FMT_BGR24, -- image->width, image->height) < 0){ -+ img_convert_ctx = sws_getContext(image->width, -+ image->height, -+ PIX_FMT_BGR24, -+ c->width, -+ c->height, -+ c->pix_fmt, -+ SWS_BICUBIC, -+ NULL, NULL, NULL); -+ -+ if ( sws_scale(img_convert_ctx, mywriter->rgb_picture->data, -+ mywriter->rgb_picture->linesize, 0, -+ image->height, -+ mywriter->picture->data, mywriter->picture->linesize) < 0 ) -+ { - CV_ERROR(CV_StsUnsupportedFormat, "FFMPEG::img_convert pixel format conversion from BGR24 not handled"); - } - } -@@ -781,7 +809,11 @@ - - if (!(mywriter->fmt->flags & AVFMT_NOFILE)) { - /* close the output file */ -+#if LIBAVFORMAT_BUILD > 4628 -+ url_fclose(mywriter->oc->pb); -+#else - url_fclose(&mywriter->oc->pb); -+#endif - } - - /* free the stream */ diff -ruN /usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_v4l.cpp /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_v4l.cpp --- /usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_v4l.cpp 2007-12-22 16:16:31.000000000 +0100 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-otherlibs-highgui-cvcap_v4l.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- otherlibs/highgui/cvcap_v4l.cpp.orig 2006-09-27 10:40:03.000000000 +0900 -+++ otherlibs/highgui/cvcap_v4l.cpp 2007-12-15 14:44:37.000000000 +0900 -@@ -209,7 +209,6 @@ - - #include <string.h> - #include <stdlib.h> --#include <asm/types.h> /* for videodev2.h */ - #include <assert.h> - #include <sys/stat.h> - #include <sys/ioctl.h> diff -ruN /usr/ports/graphics/opencv/files/patch-samples-CMakeLists.txt /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-samples-CMakeLists.txt --- /usr/ports/graphics/opencv/files/patch-samples-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-samples-CMakeLists.txt 2009-11-25 02:37:15.166624212 +0100 @@ -0,0 +1,12 @@ +--- samples/CMakeLists.txt.orig 2009-11-25 01:26:49.804760829 +0000 ++++ samples/CMakeLists.txt 2009-11-25 01:36:37.139328594 +0000 +@@ -4,5 +4,9 @@ + # ---------------------------------------------------------------------------- + + add_subdirectory(c) ++if(INSTALL_PYTHON_EXAMPLES) + add_subdirectory(swig_python) ++endif() ++if(INSTALL_OCTAVE_EXAMPLES) + add_subdirectory(octave) ++endif() diff -ruN /usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp --- /usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp 1970-01-01 01:00:00.000000000 +0100 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_ffmpeg.cpp 2009-11-25 04:16:00.991510957 +0100 @@ -0,0 +1,12 @@ +--- src/highgui/cvcap_ffmpeg.cpp.orig 2009-11-25 03:11:36.744288703 +0000 ++++ src/highgui/cvcap_ffmpeg.cpp 2009-11-25 03:13:37.172158178 +0000 +@@ -52,7 +52,8 @@ + #define INT64_C + #define __STDC_CONSTANT_MACROS + // force re-inclusion of stdint.h to get INT64_C macro +-#undef _STDINT_H ++#undef _SYS_STDINT_H_ ++#undef _MACHINE__STDINT_H_ + #include <stdint.h> + #endif + #include <errno.h> diff -ruN /usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp --- /usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp 1970-01-01 01:00:00.000000000 +0100 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp 2009-11-25 04:16:35.118372248 +0100 @@ -0,0 +1,10 @@ +--- src/highgui/cvcap_v4l.cpp.orig 2009-11-25 03:13:51.305028046 +0000 ++++ src/highgui/cvcap_v4l.cpp 2009-11-25 03:15:01.637453337 +0000 +@@ -218,7 +218,6 @@ + + #include <string.h> + #include <stdlib.h> +-#include <asm/types.h> /* for videodev2.h */ + #include <assert.h> + #include <sys/stat.h> + #include <sys/ioctl.h> diff -ruN /usr/ports/graphics/opencv/pkg-descr /usr/jail/stratofortress/usr/ports/graphics/opencv/pkg-descr --- /usr/ports/graphics/opencv/pkg-descr 2005-12-29 04:38:28.000000000 +0100 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/pkg-descr 2009-11-24 15:00:39.129676274 +0100 @@ -3,8 +3,4 @@ IPL and utilizes Intel Integrated Performance Primitives for better performance. -WWW: http://sourceforge.net/projects/opencvlibrary/ - http://www.intel.com/research/mrl/research/opencv/ - -- Marc -http://marc.abramowitz.info +WWW: http://opencv.willowgarage.com diff -ruN /usr/ports/graphics/opencv/pkg-plist /usr/jail/stratofortress/usr/ports/graphics/opencv/pkg-plist --- /usr/ports/graphics/opencv/pkg-plist 2007-04-05 10:29:24.000000000 +0200 +++ /usr/jail/stratofortress/usr/ports/graphics/opencv/pkg-plist 2009-11-25 09:11:34.577277584 +0100 @@ -1,210 +1,67 @@ -%%DEMO%%bin/opencv-createsamples -%%DEMO%%bin/opencv-haartraining -%%DEMO%%bin/opencv-performance +bin/opencv_createsamples +bin/opencv_haartraining +bin/opencv_performance +bin/opencv_traincascade 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/cvwimage.h include/opencv/cxcore.h include/opencv/cxcore.hpp include/opencv/cxerror.h +include/opencv/cxflann.h +include/opencv/cxmat.hpp include/opencv/cxmisc.h +include/opencv/cxoperations.hpp include/opencv/cxtypes.h include/opencv/highgui.h +include/opencv/highgui.hpp include/opencv/ml.h -lib/libcv.a -lib/libcv.la lib/libcv.so -lib/libcv.so.1 -lib/libcvaux.a -lib/libcvaux.la +lib/libcv.so.2 +lib/libcv.so.2.0.0 lib/libcvaux.so -lib/libcvaux.so.1 -%%DEMO%%lib/libcvhaartraining.a -lib/libcxcore.a -lib/libcxcore.la +lib/libcvaux.so.2 +lib/libcvaux.so.2.0.0 lib/libcxcore.so -lib/libcxcore.so.1 -lib/libhighgui.a -lib/libhighgui.la +lib/libcxcore.so.2 +lib/libcxcore.so.2.0.0 lib/libhighgui.so -lib/libhighgui.so.1 -lib/libml.a -lib/libml.la +lib/libhighgui.so.2 +lib/libhighgui.so.2.0.0 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 +lib/libml.so.2 +lib/libml.so.2.0.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cv.so 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%%/OpenCVConfig.cmake +%%DATADIR%%/haarcascades/haarcascade_eye.xml +%%DATADIR%%/haarcascades/haarcascade_eye_tree_eyeglasses.xml %%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_lefteye_2splits.xml %%DATADIR%%/haarcascades/haarcascade_lowerbody.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_big.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_eyepair_small.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_lefteye.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_mouth.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_nose.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_righteye.xml +%%DATADIR%%/haarcascades/haarcascade_mcs_upperbody.xml %%DATADIR%%/haarcascades/haarcascade_profileface.xml +%%DATADIR%%/haarcascades/haarcascade_righteye_2splits.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 +%%DATADIR%%/lbpcascades/lbpcascade_frontalface.xml +@dirrm %%DATADIR%%/lbpcascades @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 +%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%% @dirrm include/opencv >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911251204.nAPC4sdn038167>