From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OOvbm-0001We-8e for garchives@archives.gentoo.org; Wed, 16 Jun 2010 16:36:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD5EAE0BA1; Wed, 16 Jun 2010 16:36:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 922DBE0BA1 for ; Wed, 16 Jun 2010 16:36:57 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 186D41B418B for ; Wed, 16 Jun 2010 16:36:57 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2166) id E02222C621; Wed, 16 Jun 2010 16:36:55 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.0.0-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog opencv-2.0.0-r1.ebuild X-VCS-Directories: media-libs/opencv X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20100616163655.E02222C621@corvid.gentoo.org> Date: Wed, 16 Jun 2010 16:36:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: beccc388-71fe-423d-9abd-a3b596b98ce5 X-Archives-Hash: 15165f7ee09e4d0b3103bd0a777158b3 ssuominen 10/06/16 16:36:55 Modified: ChangeLog opencv-2.0.0-r1.ebuild Log: Fix building with FFmpeg >=3D 0.6 wrt #324259 by Alexis Ballier. (Portage version: 2.2_rc67/cvs/Linux x86_64) Revision Changes Path 1.21 media-libs/opencv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?rev=3D1.21&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?rev=3D1.21&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?r1=3D1.20&r2=3D1.21 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 12 May 2010 11:33:38 -0000 1.20 +++ ChangeLog 16 Jun 2010 16:36:55 -0000 1.21 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.20 20= 10/05/12 11:33:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.21 20= 10/06/16 16:36:55 ssuominen Exp $ + + 16 Jun 2010; Samuli Suominen + opencv-2.0.0-r1.ebuild: + Fix building with FFmpeg >=3D 0.6 wrt #324259 by Alexis Ballier. =20 12 May 2010; Samuli Suominen opencv-2.0.0.ebuil= d: Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabiliz= ed. 1.5 media-libs/opencv/opencv-2.0.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.0.0-r1.ebuild?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.0.0-r1.ebuild?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.0.0-r1.ebuild?r1=3D1.4&r2=3D1.5 Index: opencv-2.0.0-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuil= d,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv-2.0.0-r1.ebuild 9 Mar 2010 12:45:38 -0000 1.4 +++ opencv-2.0.0-r1.ebuild 16 Jun 2010 16:36:55 -0000 1.5 @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebu= ild,v 1.4 2010/03/09 12:45:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebu= ild,v 1.5 2010/06/16 16:36:55 ssuominen Exp $ =20 EAPI=3D2 -inherit cmake-utils +inherit cmake-utils flag-o-matic =20 MY_P=3DOpenCV-${PV} =20 @@ -38,12 +38,16 @@ =20 S=3D${WORKDIR}/${MY_P} =20 -PATCHES=3D( "${FILESDIR}/${P}-multilib.patch" - "${FILESDIR}/${P}-libpng14.patch" ) +PATCHES=3D( + "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-libpng14.patch" + ) =20 src_configure() { - mycmakeargs=3D"${mycmakeargs} - -DCMAKE_SKIP_RPATH=3DON + append-cppflags -D__STDC_CONSTANT_MACROS + + mycmakeargs=3D( + "-DCMAKE_SKIP_RPATH=3DON" $(cmake-utils_use_build examples) $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) $(cmake-utils_use_build octave OCTAVE_SUPPORT) @@ -51,8 +55,8 @@ $(cmake-utils_use_enable openmp) $(cmake-utils_use ipp USE_IPP) $(cmake-utils_use mmx USE_MMX) - -DUSE_O3=3DOFF - -DUSE_OMIT_FRAME_POINTER=3DOFF + "-DUSE_O3=3DOFF" + "-DUSE_OMIT_FRAME_POINTER=3DOFF" $(cmake-utils_use sse USE_SSE) $(cmake-utils_use sse2 USE_SSE2) $(cmake-utils_use sse3 USE_SSE3) @@ -64,13 +68,15 @@ $(cmake-utils_use_with jpeg) $(cmake-utils_use_with png) $(cmake-utils_use_with tiff) - -DWITH_UNICAP=3DOFF + "-DWITH_UNICAP=3DOFF" $(cmake-utils_use_with v4l) - $(cmake-utils_use_with xine)" + $(cmake-utils_use_with xine) + ) =20 if use python; then - mycmakeargs=3D"${mycmakeargs} - $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)" + mycmakeargs+=3D( + $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT) + ) fi =20 cmake-utils_src_configure