From owner-freebsd-multimedia@FreeBSD.ORG Tue Oct 22 12:07:02 2013 Return-Path: Delivered-To: multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1812D3AC; Tue, 22 Oct 2013 12:07:02 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qe0-x22f.google.com (mail-qe0-x22f.google.com [IPv6:2607:f8b0:400d:c02::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B7E79257E; Tue, 22 Oct 2013 12:07:01 +0000 (UTC) Received: by mail-qe0-f47.google.com with SMTP id b4so4633850qen.6 for ; Tue, 22 Oct 2013 05:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=RTMohwq5g4asWYz2t+R1s+/kJU8s936pu31k871x2vU=; b=pVyHcJhZk3hsFNFKdLscT7STMpIfw1fwfmE4mGyo0owHzP9HJW1luhqrXdj3GH6D6U w5wsfltYqb0+BWvnbMqUWXrq4rFL5FYn1uqlCqlvy1Bmx/WtRlicFDqjDLrzsIsv/zxa DCQ3N09EaD81SjozNFPvyObu86g8ufCg/Dm93Zp5o2wFzGEUxCFMB5LIuM09Xt63SVAd SgR7tmY3+MpT4guI4ihrOgnXMmLpsbwizUjc62UViaE0nHnxz4l7UZNTCsBzQrA7588C mFaMbpd6/GMaXaePqz0cuKsuS4ZhHXGItrwk7kXuszwWMlehnDirvK2cNANwEhTHlEjL /3SA== X-Received: by 10.224.88.193 with SMTP id b1mr29833965qam.81.1382443620911; Tue, 22 Oct 2013 05:07:00 -0700 (PDT) Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68]) by mx.google.com with ESMTPSA id kz8sm41720974qeb.0.2013.10.22.05.07.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Oct 2013 05:07:00 -0700 (PDT) Sender: "Jason E. Hale" From: "Jason E. Hale" To: Andriy Gapon Subject: Re: graphics/opencv dependency on ffmpeg is broken by multimedia/ffmpeg upgrade Date: Tue, 22 Oct 2013 08:06:59 -0400 Message-ID: <2314566.Zj2vrhLriv@mocha.verizon.net> User-Agent: KMail/4.10.5 (FreeBSD/9.2-RC4; KDE/4.10.5; i386; ; ) In-Reply-To: <52666426.5020607@FreeBSD.org> References: <5263F447.40705@FreeBSD.org> <5645227.Ty1j0Gy4S8@mocha.verizon.net> <52666426.5020607@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart10475845.Xjpa3gpugx" Content-Transfer-Encoding: 7Bit Cc: multimedia@freebsd.org X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2013 12:07:02 -0000 This is a multi-part message in MIME format. --nextPart10475845.Xjpa3gpugx Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Tuesday, October 22, 2013 14:40:22 Andriy Gapon wrote: > > > > I committed the patch along with a few other changes in r331209. Thanks! > > Thank you! > > Still the build failed in my environment: > /usr/obj/ports/usr/ports/graphics/opencv/work/OpenCV-2.3.1/modules/contrib/s > rc/spinimages.cpp: In member function 'void > cv::SpinImageModel::selectRandomSubset(float)': > /usr/obj/ports/usr/ports/graphics/opencv/work/OpenCV-2.3.1/modules/contrib/ > src/spinimages.cpp:793:45: error: call of overloaded > 'iota(std::vector::iterator, > std::vector::iterator, int)' is ambiguous > iota(subset.begin(), subset.end(), 0); > > /usr/obj/ports/usr/ports/graphics/opencv/work/OpenCV-2.3.1/modules/contrib/s > rc/spinimages.cpp:793:45: note: candidates are: > /usr/obj/ports/usr/ports/graphics/opencv/work/OpenCV-2.3.1/modules/contrib/s > rc/spinimages.cpp:88:36: note: void {anonymous}::iota(FwIt, FwIt, T) [with > FwIt = > __gnu_cxx::__normal_iterator >; T = int] > template void iota(FwIt first, FwIt last, T value) { > while(first != last) *first++ = value++; } > > /usr/local/lib/gcc48/include/c++/bits/stl_numeric.h:82:5: note: void > std::iota(_ForwardIterator, _ForwardIterator, _Tp) [with _ForwardIterator = > __gnu_cxx::__normal_iterator >; _Tp = int] > iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value) > > The problem seems to be that Makefile has USE_CXXSTD=gnu++11 and C++11 > already includes std::iota: http://en.cppreference.com/w/cpp/algorithm/iota > But spinimages.cpp defines another iota with exactly the same signature. I am working on getting opencv updated to 2.4.6.1, and it looks that function has been renamed. In the meantime, could you see if the attached patch helps (includes a few Makefile typo fixes)? -- Jason E. Hale - jhale@ FreeBSD Ports Committer KDE/FreeBSD Team --nextPart10475845.Xjpa3gpugx Content-Disposition: attachment; filename="opencv.diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="ISO-8859-1"; name="opencv.diff" Index: Makefile =================================================================== --- Makefile (revision 331209) +++ Makefile (working copy) @@ -41,7 +41,7 @@ PORTDOCS= * -OPTIONS_DEFINE= EIGEN2 FFMPEG GSTREAMER GTK2 JASPER JPEG OPENEXR PNG \ +OPTIONS_DEFINE= EIGEN3 FFMPEG GSTREAMER GTK2 JASPER JPEG OPENEXR PNG \ QT4 TBB TIFF V4L XINE EXAMPLES OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L @@ -48,7 +48,7 @@ EIGEN3_DESC= Eigen 3 support EIGEN3_BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3 EIGEN3_CMAKE_ON= -DWITH_EIGEN:BOOL=On -EIGEN3_CMAKE_OFF= -DDWITH_EIGEN:BOOL=Off +EIGEN3_CMAKE_OFF= -DWITH_EIGEN:BOOL=Off FFMPEG_LIB_DEPENDS= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 FFMPEG_CMAKE_ON= -DWITH_FFMPEG:BOOL=On @@ -143,7 +143,7 @@ CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=Off \ -DINSTALL_PYTHON_EXAMPLES:BOOL=Off \ -DBUILD_TESTS:BOOL=Off \ - -DDWITH_EIGEN2:BOOL=Off \ + -DWITH_EIGEN:BOOL=Off \ -DWITH_FFMPEG:BOOL=Off \ -DWITH_GSTREAMER:BOOL=Off \ -DWITH_GTK:BOOL=Off \ Index: files/patch-modules__contrib__src__spinimages.cpp =================================================================== --- files/patch-modules__contrib__src__spinimages.cpp (revision 0) +++ files/patch-modules__contrib__src__spinimages.cpp (working copy) @@ -0,0 +1,37 @@ +--- ./modules/contrib/src/spinimages.cpp.orig 2013-10-22 07:55:31.000000000 -0400 ++++ ./modules/contrib/src/spinimages.cpp 2013-10-22 07:55:51.000000000 -0400 +@@ -85,7 +85,7 @@ + }; + size_t colors_mum = sizeof(colors)/sizeof(colors[0]); + +-template void iota(FwIt first, FwIt last, T value) { while(first != last) *first++ = value++; } ++template void _iota(FwIt first, FwIt last, T value) { while(first != last) *first++ = value++; } + + void computeNormals( const Octree& Octree, const vector& centers, vector& normals, + vector& mask, float normalRadius, int minNeighbors = 20) +@@ -790,14 +790,14 @@ + else if (setSize == vtxSize) + { + subset.resize(vtxSize); +- iota(subset.begin(), subset.end(), 0); ++ _iota(subset.begin(), subset.end(), 0); + } + else + { + RNG& rnd = theRNG(); + + vector left(vtxSize); +- iota(left.begin(), left.end(), (size_t)0); ++ _iota(left.begin(), left.end(), (size_t)0); + + subset.resize(setSize); + for(size_t i = 0; i < setSize; ++i) +@@ -870,7 +870,7 @@ + { + mesh.computeNormals(normalRadius, minNeighbors); + subset.resize(mesh.vtx.size()); +- iota(subset.begin(), subset.end(), 0); ++ _iota(subset.begin(), subset.end(), 0); + } + else + mesh.computeNormals(subset, normalRadius, minNeighbors); Property changes on: files/patch-modules__contrib__src__spinimages.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --nextPart10475845.Xjpa3gpugx--