diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2013-12-07 14:31:12 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2013-12-07 14:31:12 +0000 |
| commit | 2b4e7b23e9c9b73ce3b2017139843e4070502aad (patch) | |
| tree | 9df9cb0db78ec29c6bb74d89643f75c0d63c01bc /media-libs/opencv | |
| parent | x86 stable, bug #480044 (diff) | |
| download | historical-2b4e7b23e9c9b73ce3b2017139843e4070502aad.tar.gz historical-2b4e7b23e9c9b73ce3b2017139843e4070502aad.tar.bz2 historical-2b4e7b23e9c9b73ce3b2017139843e4070502aad.zip | |
Fix build without openmp, bug 493530
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/Manifest | 32 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.4.7.ebuild | 6 |
3 files changed, 24 insertions, 19 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index f869f994144e..101399e20cb7 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.103 2013/12/07 00:20:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.104 2013/12/07 14:31:01 dilfridge Exp $ + + 07 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.7.ebuild: + Fix build without openmp, bug 493530 *opencv-2.4.7 (07 Dec 2013) diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 17377a142afd..8747fda948d2 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -10,25 +10,25 @@ DIST opencv-2.4.6.1.tar.gz 80762052 SHA256 ae7cfd859476b6cc05246949ddcb165fb284e DIST opencv-2.4.7.tar.gz 85587316 SHA256 c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43 SHA512 8979971f805b72e3384038acb6d555035a7f921f6b37a901c1f6b7020d076bdbcbb5385d616bb8afb5c03d447cdddbb0ad4b13e84a5fabf5c0a61cae54f49f44 WHIRLPOOL 975df7cb8e2ce2b07a8cc1b46e43dcbe53959c4264371710cb46985db19665f857f3d071cbefadd60785bffc289cf1118102a9ce55ce231014e92cdd1cb93ab5 EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e EBUILD opencv-2.4.6.1.ebuild 5180 SHA256 8dd5be4bb1110ca3053d1884385dbe1f5fd85b5a578ba03ae9c0c6049b2f8ccc SHA512 2d1dca4daa44f94c80b5f9fcc29c5fe6faf8dd980cddd8e37ed5419391710143376235f3e56b52397cc1d0cfa85d5525952c1bfb0764057cb7f634da96557989 WHIRLPOOL 785fb7dd867c10bff29f8e46979db474e10f0e30f106d8b5bd5dbe614a45a6468ef3ef5299fc9ca0d6a9c0fe17c353c9ba3f322d85b712a001ac3888ee6af9ab -EBUILD opencv-2.4.7.ebuild 5327 SHA256 bb60806338d3b615757bbe6ba56d63f8ec3885bf37d0e15265763479bb48f207 SHA512 6779933f75a0293f5435d3794ab0b7630835d6755162f542db26e3c67569d4ea49b4cff79411192f42a42274d547d7372b73700b5723e5e51f59ed21a615aa8c WHIRLPOOL 918882b418ff0fc54bb236f78d46e106ef93bd6db74b83e3fc15964a72f3baa4f382cdb59c0666576f403038414f8e741160658ac106060a388fffbdf50eb0a5 -MISC ChangeLog 17708 SHA256 96b368addd956b10932e0d780bb01182b709c6fe5475a6192fd92e3236a0d081 SHA512 a9331a16b5f3def059063776715733952335dee2e5e2703e7838503385efa205de082dce455582323f28d0402ad99fd9c6f1f8844f5087eb4b65d0385aca1f1c WHIRLPOOL 323a99eb8aaa587f5d1cbdb160d807994c55e65343416ba791a53879cc14ef2d54a47019200297ea7795adedeae45078185919132384c0aad987a68b0ca9dbdb +EBUILD opencv-2.4.7.ebuild 5339 SHA256 c35ac60d24b7f77692f3a0e3ca264a8bc17b188d4813ffc61807a450650b5866 SHA512 d73cd41bc1e96ba3581a9016f6f4b40451704b03cb04e88028f8f01083cfc71e60dee41c3130273bb27084fc5a6a5a9616403405ad0336fa10a0dbea8d0fca73 WHIRLPOOL fd85656fe42e0a130a8cfb3b2cc61afacb5989b12dcba33ed957af5791c77f427e443af0bdc353bdd5abc3c2098eb6b4775906cc9f2075364c8fde16608250ba +MISC ChangeLog 17826 SHA256 ae88a6d16b511779792a6a58e4c3e6dd749b59e4cccbc7eb31a22f3cfefa150c SHA512 686f14859486c3afb60f829ca0ce1574f534a59d78f111066edce0f2756e2dc2f824c2eee9a7fcbbda2540e20a6227d0984264460f456d25eb90ab1f829ad595 WHIRLPOOL 165a58f62a3fea1f96ec1e8eebffe783535442176be945e186beb96149ec8a229e96047cfeafb059017c3f13b9d11743c433f010402ee68ffc4315ef2baccb0c MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJSomn4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJSozFdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF -QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcsiYP/19qBdqReeEuRj8K9c4VnMOz -dKoQ8FC2krQJHh+C3/IPrJrDgwQVE2NSEKt2ANlKCXogxumGpGcj8OPnLLHSdyFa -mYaVaCVsABL8LIeUrzaBmPYsAUxb+ebbyTPxpH0Bh6IZKti3dgEQOEk45+AER/f6 -T9poBb152g6gwWr1+F+z0PJluiW0NWGsZL2WQ3XkK+WS1jJEWd7muadQ6CZ+EFoU -kQwAXcIk/PW6Gy5QhxXGddLFvE7vj0feC8VSRF4cM0ldFAKBq/9Bx1+iwpXj2Y5C -erOA9fxk44wDkPlLCBUKHeKkSHBBIYzBo0csClP1q32JmpjnwddgzGXc2I8jwMrD -mQsL9wfo32hQcd8GM8Dc1uld3fnntomWY8hc+OJTIyps+z5qQpXRPZm8cAk+7HAI -idZVzt98VHjMzX8qxBtV7R5DIOgj3lJjdEe76+gtaN+DYC4xOdtsT9vxzTDQgjJC -8rst8RYcMybib7Q4fNZ1y7tTb6PhcS3sCv1h3NupMYG2j+N4QjrZPh+D6CWK7tev -jKPu0MjPRV7nXptRGHBcKC9FfTpVaPMGIIlSbFAoi1VKQ2nnR08/2BzdSOZHVfb4 -pYhLhWbgwcdht2qHZvVIG82marPAsLVPXPjY0VfxMC+KMCEcXfoVt9r7OO4Q5S3E -JayMQJ6EbF3aWAuRrAm3 -=5Zi4 +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEx8P/2RAxKV6Y24kh3n9k8cQTVj8 +m/ao2CNFvz5TGH1Agklvx7fj/BSp4hbCROVtSnWEkgUnYR+T9NWSBY1DknrFRSCu +dXINT/GkamGNttc5OpcaKz49UngYVcAg5IHZJhnH0D+X1LekfOEsr+4wbx8PQEYu +DCiApLIScqhFg5Sr8N3Hl2GACzTgM7iVdl3zfZJnflGP90sjm6jByCHrSv6Cu/mf +Q//rBzJ0Zuzg+nK1Qppi693TvY8ELTq8be3fM4PAHgpxhgCc5BpKg7S0SNLDLISy +7lULSnjL7IVV/U8sq4XdaWst0MPZH0ococcRrzQo5a3SljWglQeRc0Z+fBkw12SE +LWyaltegJymBLOi07A+z4+zsy/Cg/T/eMmfQNo2vAAL3twZx7ekXX3il2jBuHj3c +bVK+yizzcNQpmtgrzN7+Z2aMAB0FakS/r3VcLaKMJE8s215clPZt4rBqO+vhN/aE +La4ys3GeHgDLyBKKzDj2kSt7XQCbYtrd8bBaTfcRcw0DvQLDcUEx5Gq5hHKUxwNx +lur5KitH31aWEwJgG2qolgta1YsDrEDAsUG4nVx3ZWXlQc4sl4NKgpmlUN5yx2qq +D64FFWJak38euhZVKIDJ/wctEcLjlXAEWqlPtwWieVUhP13hCsXDEknZ+45ha+LN +KtiPNYjWfzodZ3Lk/WbO +=brqV -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/opencv-2.4.7.ebuild b/media-libs/opencv/opencv-2.4.7.ebuild index 2bd80fdf3852..eb66f82d9657 100644 --- a/media-libs/opencv/opencv-2.4.7.ebuild +++ b/media-libs/opencv/opencv-2.4.7.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.7.ebuild,v 1.1 2013/12/07 00:20:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v 1.2 2013/12/07 14:31:01 dilfridge Exp $ EAPI=5 PYTHON_DEPEND="2:2.6" @@ -86,7 +86,9 @@ src_prepare() { } src_configure() { - use openmp && tc-has-openmp || die "Please switch to an openmp compatible compiler" + if use openmp; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi JAVA_ANT_ENCODING="iso-8859-1" # set encoding so even this cmake build will pick it up. |