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 1RCAKG-0005dd-Na for garchives@archives.gentoo.org; Fri, 07 Oct 2011 13:18:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B894321C065; Fri, 7 Oct 2011 13:18:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7861421C065 for ; Fri, 7 Oct 2011 13:18:48 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C04361B4017 for ; Fri, 7 Oct 2011 13:18:47 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id E33FA2004B; Fri, 7 Oct 2011 13:18:45 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.3.0-r1.ebuild opencv-2.3.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog opencv-2.3.0-r1.ebuild opencv-2.3.0.ebuild X-VCS-Directories: media-libs/opencv X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20111007131845.E33FA2004B@flycatcher.gentoo.org> Date: Fri, 7 Oct 2011 13:18:45 +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: X-Archives-Hash: 52b50d056815738d22ce9c35edeae6f8 dilfridge 11/10/07 13:18:45 Modified: ChangeLog opencv-2.3.0-r1.ebuild opencv-2.3.0.ebuild Log: flann is now completely integrated, and it makes no sense to unbundle i= t anymore; cleanups =20 (Portage version: 2.1.10.20/cvs/Linux x86_64) Revision Changes Path 1.50 media-libs/opencv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?rev=3D1.50&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?rev=3D1.50&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= ChangeLog?r1=3D1.49&r2=3D1.50 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.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 6 Oct 2011 22:32:26 -0000 1.49 +++ ChangeLog 7 Oct 2011 13:18:45 -0000 1.50 @@ -1,6 +1,11 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.49 20= 11/10/06 22:32:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.50 20= 11/10/07 13:18:45 dilfridge Exp $ + + 07 Oct 2011; Andreas K. Huettel opencv-2.3.0.eb= uild, + opencv-2.3.0-r1.ebuild: + flann is now completely integrated, and it makes no sense to unbundle = it + anymore; cleanups =20 *opencv-2.3.0-r1 (06 Oct 2011) =20 1.2 media-libs/opencv/opencv-2.3.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0-r1.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0-r1.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0-r1.ebuild?r1=3D1.1&r2=3D1.2 Index: opencv-2.3.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.3.0-r1.ebuil= d,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv-2.3.0-r1.ebuild 6 Oct 2011 22:32:26 -0000 1.1 +++ opencv-2.3.0-r1.ebuild 7 Oct 2011 13:18:45 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebu= ild,v 1.1 2011/10/06 22:32:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebu= ild,v 1.2 2011/10/07 13:18:45 dilfridge Exp $ =20 EAPI=3D3 =20 @@ -22,7 +22,6 @@ RDEPEND=3D" app-arch/bzip2 sys-libs/zlib - sci-libs/flann cuda? ( >=3Ddev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) @@ -61,6 +60,7 @@ "${FILESDIR}/${PN}-2.3.0-ffmpeg.patch" "${FILESDIR}/${PN}-2.3.0-numpy.patch" "${FILESDIR}/${PN}-2.3.0-symlink.patch" + "${FILESDIR}/${PN}-2.3.0-libpng15.patch" ) =20 CMAKE_BUILD_TYPE=3D"Release" @@ -77,8 +77,6 @@ =20 src_prepare() { base_src_prepare - # include missing zlib.h for libpng>1.5. Bug #383571 - epatch "${FILESDIR}"/${P}-libpng15.patch =20 # remove bundled stuff rm -rf 3rdparty 1.6 media-libs/opencv/opencv-2.3.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0.ebuild?rev=3D1.6&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0.ebuild?rev=3D1.6&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/= opencv-2.3.0.ebuild?r1=3D1.5&r2=3D1.6 Index: opencv-2.3.0.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.3.0.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- opencv-2.3.0.ebuild 6 Oct 2011 22:32:26 -0000 1.5 +++ opencv-2.3.0.ebuild 7 Oct 2011 13:18:45 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild= ,v 1.5 2011/10/06 22:32:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild= ,v 1.6 2011/10/07 13:18:45 dilfridge Exp $ =20 EAPI=3D3 =20 @@ -22,7 +22,6 @@ RDEPEND=3D" app-arch/bzip2 sys-libs/zlib - sci-libs/flann cuda? ( >=3Ddev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) @@ -60,6 +59,7 @@ "${FILESDIR}/${PN}-2.3.0-ffmpeg.patch" "${FILESDIR}/${PN}-2.3.0-numpy.patch" "${FILESDIR}/${PN}-2.3.0-symlink.patch" + "${FILESDIR}/${PN}-2.3.0-libpng15.patch" ) =20 CMAKE_BUILD_TYPE=3D"Release" @@ -76,8 +76,6 @@ =20 src_prepare() { base_src_prepare - # include missing zlib.h for libpng>1.5. Bug #383571 - epatch "${FILESDIR}"/${P}-libpng15.patch =20 # remove bundled stuff rm -rf 3rdparty