diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 11:33:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 11:33:38 +0000 |
| commit | 4bc12928cdd84752d31e0ab89515248a712b401a (patch) | |
| tree | dda641db04a7733d5c0027ebfdf92f95ad8f6643 /media-libs/opencv | |
| parent | Add descriptions for video_cards_{r100,r200,r300,r600} used in live mesa. (diff) | |
| download | historical-4bc12928cdd84752d31e0ab89515248a712b401a.tar.gz historical-4bc12928cdd84752d31e0ab89515248a712b401a.tar.bz2 historical-4bc12928cdd84752d31e0ab89515248a712b401a.zip | |
Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.0.0.ebuild | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index ebf2aa7c8e62..e2d8aa6efeb6 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # 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.19 2010/03/09 12:45:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.20 2010/05/12 11:33:38 ssuominen Exp $ + + 12 May 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild: + Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized. 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch: diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 816cb8c39d4b..493aae56ab09 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -2,6 +2,6 @@ AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46ef AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777 DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022 EBUILD opencv-2.0.0-r1.ebuild 2315 RMD160 92a3e36cd71f59b97d70b1f228dc3b48330bf759 SHA1 0017175fb8c702842bd1f020f800a8f4b6d4ea7f SHA256 85bf3c9726d44989c860615c2d7dc6774d1ae424d289f08848a63d3caf381d9d -EBUILD opencv-2.0.0.ebuild 2286 RMD160 45f4291003b6f1e2ae3a6ea3be7b401b6f52d774 SHA1 83d55bc3b6d402d7691ece9f714ebc41b364de21 SHA256 3d79b5439874bae02a6a503b2f21acb8a50a36702d601e14f865c6a7cf5516b0 -MISC ChangeLog 3633 RMD160 968ffa4c532b725ef3d0d57e5d042a6221a62b28 SHA1 df6f54e95f1a641ad3a596d18222fedc825b995e SHA256 dc846c933bf54bb823425693fbb5bcb3f629ab80d0db17139ce1177eab81890c +EBUILD opencv-2.0.0.ebuild 2327 RMD160 9f27eb71e973ca968d0232dcc18c8e5e958a31a9 SHA1 675ecf5832d77923ac3f5be887d68ba91f158caa SHA256 70bd98da973a6738d6dfee8970cea956745b4f15ae08b59ed01d19081b190560 +MISC ChangeLog 3785 RMD160 ba43e4621660b8a6197e9c5cc64f9cd7290298f7 SHA1 f20b922efef549f8d1a21e100120203c89db54ed SHA256 0e3bb5b54b22806849b840e58500d669d8077faf0ffa26ee4e729b0e85110280 MISC metadata.xml 959 RMD160 531c61b88ecf1af6829078553580f7025d369bc0 SHA1 ce297f8ddef36af86f1e711a958a5f9873e1df7d SHA256 7f676e603c47c6182fe0b333395f735993743c22b2989b11e71fed579f7aa359 diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild index 275d17549329..978957690009 100644 --- a/media-libs/opencv/opencv-2.0.0.ebuild +++ b/media-libs/opencv/opencv-2.0.0.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.6 2010/02/06 11:05:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.7 2010/05/12 11:33:38 ssuominen Exp $ EAPI=2 inherit cmake-utils @@ -37,7 +37,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +PATCHES=( "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-libpng14.patch" ) # Skip test suite for -r0, try to solve it in -r1. RESTRICT="test" |