summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-06-11 21:10:36 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-06-11 21:10:36 +0000
commit0397d496c5948f35af1f2239e204e77fa649d62c (patch)
tree2a0b1fc49b3519568a18d2051bcb7052c5388300 /media-libs/opencv
parentVersion bump, as requested by Agostino "ago" Sarubbo in bug #454534. Adds a m... (diff)
downloadhistorical-0397d496c5948f35af1f2239e204e77fa649d62c.tar.gz
historical-0397d496c5948f35af1f2239e204e77fa649d62c.tar.bz2
historical-0397d496c5948f35af1f2239e204e77fa649d62c.zip
Add workaround for bug 413429
Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'media-libs/opencv')
-rw-r--r--media-libs/opencv/ChangeLog5
-rw-r--r--media-libs/opencv/Manifest34
-rw-r--r--media-libs/opencv/opencv-2.4.5.ebuild5
3 files changed, 26 insertions, 18 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7b4e9f75c825..72e1fa790cab 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.93 2013/05/02 16:53:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.94 2013/06/11 21:10:19 dilfridge Exp $
+
+ 11 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.5.ebuild:
+ Add workaround for bug 413429
02 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
Clean up useflag descriptions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d6603fbb544a..0bf06ceaaf2a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,23 +17,25 @@ DIST OpenCV-2.4.4a.tar.bz2 74636004 SHA256 e663cf6e4762c8be2f80f9bca8fb32c01d65e
DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
EBUILD opencv-2.4.3.ebuild 4780 SHA256 384324386e196d6238b9000db1a100116196c2506883acda04ac353a5678881e SHA512 e4b7f9b4489aecde56ab2650933974457d145dfd76faae464458ae41105c30b5f2dc600b7ff2890d762d300739e21f5ff290d2eb6ef4f91bba3f47cbed1db2e9 WHIRLPOOL 46007ca0dac016fcea8fd509d1c07a0e500c7616f97084fca3fb003a50efc781a3127c1c286dfe9ede13ee6dc9a84e2072cf5721e952767a0fa5df33ecee582f
EBUILD opencv-2.4.4a.ebuild 5169 SHA256 8a8fbd17d1adb4cebae4f40cf839327c436a22cc54044e5053f327e891b6fd56 SHA512 dbb1deba4d434fdc66b7cc8738440b4d291224102b5fd6dc0f7714a8f5fa8e4d28877dfb8ba1bdec9246c9483d0b8157d751756ba44e5015e183e9257050a6e9 WHIRLPOOL d403127a4702efc5f1d75fa19a699a5edc3588862a687f218c7bdd0cd3c171d119e0581c62aac0c270cb1d8c4f8126ed087e53159b7680e2fd6e321e20fe8d75
-EBUILD opencv-2.4.5.ebuild 5118 SHA256 3227236d17ecf5870c406433f9a8938929c8472dfa2e8db2db01344db73ad802 SHA512 14c2e52656f6fef4ed9a0a3889adb3a7e9589cfaac663856a43dce8ce54b49cfe0132c77dcbbef61bb9a52f681d2f89634636a0da79f254f37faac96cd1019a3 WHIRLPOOL 5e5a719b61fcb291167886de236f7b1569a38fdccf422546060ecf4a90b75279a9ae18ff4f53c2351389f9f999d6310081af91994eff96027e8916e05512be1d
-MISC ChangeLog 16316 SHA256 ced036fbb3c8d54ef09f5ac6524f0e490c1021bac92931d2d6a1716335237821 SHA512 f318964347987e1fce3693a27a6546400bd83dcfb0b50271c8bccd01549438ab5b2ca4510a9a20b12e99f418665e4bd493a078a99416197d63eb5883900d84f9 WHIRLPOOL 2acdd2e21110823767f70edb70cf547eeb26a961bd777b25605dab4df0c3adcd6b098a97d9acafa378733b24540dd8d3c1634f85e65dddad53514b3b282110f0
+EBUILD opencv-2.4.5.ebuild 5166 SHA256 dd4943a9d9933d4a95bf214a11f3c82970d6ad9395e331306dace1aeca2eedd4 SHA512 d2b13c514494c4ae38ae51e313f9fcf3cf5039c341a0487b74ecae557a4a0b2b0cfc13c9451f0a86f86817bdec1e32b27f881801ecb0babb691ad6c0a692a395 WHIRLPOOL 1802c120654b97c64e345b02cd5f896265dc823f8757767d5f09758bfcf9b8876c9af7b1a3aec06b1b542fe42edc3a7b8c274f73b13674f46e4479b96f1de57c
+MISC ChangeLog 16427 SHA256 5d8ac7132c8cec4dd70e310f5c1fa548d97f5e8594eefb89058d5261b91b1c14 SHA512 c8ff00bf381a97d74ff8eda7ef3b7256e841ebce157b50bd16e691f6f2adeba38258f4330600911984d1f18199a087ccd46bbb7b21bd93ea80acc9c90ce4e178 WHIRLPOOL d3c3ad3b5b9e1a7563eb46b1ab0ef4cec5e74e855b1a55f799075d008a2980d7dff04d8b67155601bf795ff76d17a49ec57ca1575317f72574ea8756947b0d33
MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJRgprAAAoJEJS/30SErRQvwh4P/05vSfYHqywy2GzK6wvaWEKy
-tRAUJ5/f9Pq7be1v639krZKLSyilKKAuD2QJOxtVZCsmrzWKtEIwf1IxCYxm4hcm
-FutlhVOUj7XxwheKpJRJV/w4RmCTwp85rw/jOnO7Z+AExG3cl8/c2OArZHKb98ZV
-adftNYcZeNDkg7abQtReboBs2ooOtZ5L9laRf7Smmj6u0wZjN6np2fN7e0PoBJep
-gm0gLlW+5dQkbPtyZyFjklnGMD7zYY14DiV5dS40ckOokd2W9JLY7kh9dciGBeVI
-r+5nMUoPN9hbzP1ey/VIF5FgaZuMl6eS2FU9UYwI4VFGLzW9wxCRO10v0A7TnAuz
-fXdM4mJqtN6LOWZhyZRjvQ2QsHEaeKNDIFK5Urog78EWbvG4TPuHvezn9K5VS6Sj
-4OkbJojd7eXMdFqy/kW+stISkWVaJO6N898+gIgIivS2d5euL7Rca/825qSubXLy
-VZc5P3pLDwdp2484VCc3OEugvA1ZaMBJ4Axzm4Pu6onOadZH2eLkozl58fttgj/2
-QPVrJKv/J6F4BpzCp1wmpAWVkEgB3GCe04kqlC9j6VGiae24d3OJwFPgzp9fwKhk
-Z0YOk0QldzvgMcyApAbzA6ZCPNiwa8+nZGyqKOK2XbhHZoMNsrwR5xlZ16xOGbmz
-xd7DJpq5+2bRtVMuoqrE
-=mL3Y
+iQJ8BAEBCABmBQJRt5KyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcvH8QAIfJ7dkYxYIGhgHskZYZDf5c
+ZKRng6AWL77OaTq67d2Bk3Lr3ykeNjx7JBFuReTp/dYh/8ENiyIsM5HmCjlz+qRO
++wTy0QPrTZCE1I98b7QKSOy92lPlidg+YkG3PjAN39+Mq78eq/80nAIiEOGeCym2
+fHi1DOoCvu5mBK+mHvOEQMrrtZnEzQaCl7LXsvycxX80lBF61nz5C/Tyak3Tf3sj
+lhcmIUI0criHuHUq0S2KPnr3trll9KFdhKjYZ3w8zyqzOCiU0oZd2DJ8RncuPhEZ
+v3ThralQQYdbI/piftV2FMc2gOR8YsOoY7lhIHtqEtysKFND3TGWXxEGyF2b7U+u
+wYvM4MVEtBAKwTxiMwBSbmVawBzys675bepjaZgRm9rvGC9uhi+tcG42sp9gEhNu
+mSKI03dr5u7J1fCPo2LJphrIKMnqA5AZ2e3EYYD/Bw9VFMADgQ8DXr96ZBvNdwGF
+OKB4S/M1EgjGEt/URvmhbF9bO3kUCVZdL4uK0Jec+l2BYSSst5ll8cV4O0LSe/Ja
+Alw7BtsEXpx3r4ZtXzgGUSM/2lncHkfjdHdeNwgCJMdxvk4MXU4FilK2WplzUOQ8
+FKQCp2mDV15CWnukZQu0fTYyHRwmp2k1GiZ7ZViCXzhdE7ovgJPa7U7yEqQTu9hU
+JEzdFL8lUYoMTFwIwFYV
+=3qf3
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.5.ebuild b/media-libs/opencv/opencv-2.4.5.ebuild
index ed053e02dabc..dc60a66084f7 100644
--- a/media-libs/opencv/opencv-2.4.5.ebuild
+++ b/media-libs/opencv/opencv-2.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.5.ebuild,v 1.1 2013/05/02 16:49:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.5.ebuild,v 1.2 2013/06/11 21:10:19 dilfridge Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -186,5 +186,8 @@ src_configure() {
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
)
+ # workaround for bug 413429
+ tc-export CC CXX
+
cmake-utils_src_configure
}