diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2014-01-24 23:57:37 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2014-01-24 23:57:37 +0000 |
| commit | f81a74439c1d79f923a2b9bb68dbd842df5dd2f7 (patch) | |
| tree | 144c16dadd3fece5d655a18e3f5d936f2f7a8451 | |
| parent | Version bump. (diff) | |
| download | historical-f81a74439c1d79f923a2b9bb68dbd842df5dd2f7.tar.gz historical-f81a74439c1d79f923a2b9bb68dbd842df5dd2f7.tar.bz2 historical-f81a74439c1d79f923a2b9bb68dbd842df5dd2f7.zip | |
Only enable Qt4 so far, bug 483648
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!
| -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.8.ebuild | 9 |
3 files changed, 27 insertions, 19 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 8f33b5923c96..79360b9c028d 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.105 2014/01/24 21:16:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.106 2014/01/24 23:57:27 dilfridge Exp $ + + 24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.8.ebuild: + Only enable Qt4 so far, bug 483648 *opencv-2.4.8 (24 Jan 2014) diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 2d20abe4f123..991ced11e827 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -11,25 +11,25 @@ DIST opencv-2.4.7.tar.gz 85587316 SHA256 c48d6c735bfa40c76cadcc0106051e095d8b492 DIST opencv-2.4.8.zip 91302285 SHA256 f1ea29de0707939f6e09ae7a78dd271c032cac69a9ba6c6f7eb29fd4f83b9a68 SHA512 a451f4cc2fc7f31a5dba2997c57f3964d8239949dedb62e83b3fb2c68c2533786750906823137fa126a20d28d841aafc3a49b82c6358a6e6bc7d223e66598237 WHIRLPOOL 5881682746b30601421874bf6acb13bd0354b607f2e4da8abaa6077a59c8015c60bfbe888da077eaa7413c5fd8816b50616cee2eeb7dfcd884afff4df8c22561 EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e EBUILD opencv-2.4.7.ebuild 5339 SHA256 c35ac60d24b7f77692f3a0e3ca264a8bc17b188d4813ffc61807a450650b5866 SHA512 d73cd41bc1e96ba3581a9016f6f4b40451704b03cb04e88028f8f01083cfc71e60dee41c3130273bb27084fc5a6a5a9616403405ad0336fa10a0dbea8d0fca73 WHIRLPOOL fd85656fe42e0a130a8cfb3b2cc61afacb5989b12dcba33ed957af5791c77f427e443af0bdc353bdd5abc3c2098eb6b4775906cc9f2075364c8fde16608250ba -EBUILD opencv-2.4.8.ebuild 5753 SHA256 5aca5917d3ae86003f4d01aa2a43191f9a0a492ebbebd7ba34bebfda8e5f3ed5 SHA512 800a43b7f06abc4057d2bc3addb10647b2c47c6555223cfb3d5ed3dec473a6cef3ae5d445eb3a2408be5c451dc23039d9624cf14380beef5642952e79f8b27a1 WHIRLPOOL 55d8296324f970ecb32e93a39a5193737a35e8c68bfe173efb0ac458c1e0a92639e4bc3e05489722c2b7b1c0f89a596cdec8e8166fffbbd61ba5e17543d1cc4a -MISC ChangeLog 18027 SHA256 562ece973973235cc19d6d288fdeace40126cdf144bd326be3338e22d84ed2c8 SHA512 c109e1d5a30a5f2ba0074b1f955b981ada29495d56df3864746518d3c667c3c3a902738bf09e4cdf17be34b95af80634f89ab78fa9e9b3b47a159054aa0bf0d7 WHIRLPOOL 8aee377a90468a8efb178e6e48703f9691a8eb94d20f7e9958f463d344739c10d18faf3129ee1f44a7e1d98f81332decee5d3cc4f75375f79377f3410ab3a1fe +EBUILD opencv-2.4.8.ebuild 5817 SHA256 badd52e7de29704caa7b37e50a83aa9e356b5119d03420c775fb53daa47752ae SHA512 f09a3efb5df942f657471e95e91a526805dd3acb03d84eae6ef4b6d0212eef0cab2b287ac6c0a2020afad3a314461f46fc1e274f35bf721ea2d94d2c3b49ba87 WHIRLPOOL d9ac1d683cd2f47c0bda59f544adb88cd4141d26b83846651e04285ffb777dce49ea116f2ac7624f048f2725d3467dbe4a11a73481321b15eefe1ea6c6aa3b62 +MISC ChangeLog 18143 SHA256 05708a9a8efd5c46f3df46e4b5f2dddc38a4e6948585ffca55793bb02db4277d SHA512 d8a4deeb50f394112aa7e8597d784af71ec3228b8187194a6fb68048e834e1559bac57b425cd321e089ed918ce4791924dd18c48d93b04be6b5bf249bbdfc1e2 WHIRLPOOL 9dba76590ff62ec820b7e11543f1612b62950f1438d4269e28484187a60e3b0e71004ee334389e530d44d9aee4959e81486ffde0b9a2981b10a606c300961ef4 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJS4tiVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJS4v5FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF -QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZLIQALcqYBWv+bBdhB7gJLHsSFpk -LpCtQudSLfLTORCfHSUM6J5phr/qvHe6euWI8wz6Nwa661+3uJS+Q9q6HdiRFm4n -wqiTST7ZRexUVxTiH+7JlPEqTmAgHUxA2cRz3Xpko4LmsGiPp0n5SMs/eag9N1T7 -VQK2BM2kYiVv2AxjpJKf5pnr0/kEfhy8LRpkSGY/AwCVXKLyptRTuehgsyXE7ZWO -DvLmGe/19rbCpSGa3tz8udBAPK6BngHAThuq+X1mAQ35T7ICqy8ic+qGMkYvenzx -/CRyYZB4u+cZW6pfwCI4BtUpcu5YwJZcEgBUzf9llJA5wdFum2Sdg1TAaVMKD6yJ -J/d4vXaeFXpS0goVHco2Q0tWseJoQlpd59rbBhcG3KUVCTyy5GZ2DmrVpX6kJyC+ -3OiIEd/c8la6HDTQtveoxJT05YYKQibJBlot3vGpQOPUZaJ9Q5w3rmNhOQesUQwU -6SNwu/5Q/2FFhSUudtDoPCSgzj0eeKdeGvwWwWLNrgX5e92hTcFJjgVlcY5yGXoL -bbxOyHWrmKRCNeYPOaeTLsXbaVaWCgdn7TrHXOheN+LOEtxcwF28FNsfjPRMluQM -ADn5qsD3uY55na/OcnClz8isANQowib3evwdgOTB1iDr9InOf/r3e4gnjZhOBemC -9tW4oqoDK3ko3+BXpgNT -=cJW2 +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcWm8P/RDFQbzQFzVpr3JBEsrs2xeY +momQyGMRkK2y9FLjgHoLbpoxysFgiNlXG5UY3gxDCFVO1cd6Ryn2dQYa1/o0GjRo +s2n7NZMhKQHW2RYrr85gCZO+YJrXP4w7PAb8/vMPASwDnOfxkhEDEZIIdn5x4/30 +wucvhtMlO7v+TdIs/xXqdlwbbRDbI8nkCnn7LD7pGXTz53zk3mNjneF0RKueA3aI +BJAQmvvL0xYBqJGNl6n8JV5/H5Pm8O1YOtg1hOsSsa8dHMyD/92JQ567jzGKI/Qo +pZMzlWSRn2K+PPjDYtX8LIXElwvB5smg4JxErTba+1KGp7nWPpNg3Z2xT8YMcz8B +Cu4qZAORw+96faTu0Bc3rgIn0HY3U6x3vEnP8CFFR0aNgohyQaaiWPOgCkNFSacD +WQFkY2KR6oI1PyWaO+gufn9v404zKds0dTDIk+FseFuTQqTdNjc1Nm9buwzShACD +LFA3uEGGSywr6ZEbNqJypwx+M7xSdpMjd72uQClYXBGgJsuKlupgTtx3NpErnP+s +nULmqU84XH3Z05U2iS6tCweoj66IzY3hXlaHnRPY6MZ1qIMT8IN2CnMkZwA2Djyq +xr1IAUTdjv6La6ZN/ZvhOyYEmXg5rViRP042lWZ2F8TplNkEt/70gr8JEQ2Dnk7n +5tBlyclGKvQdWgKaAFKM +=zv1u -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/opencv-2.4.8.ebuild b/media-libs/opencv/opencv-2.4.8.ebuild index b9bf88bd965b..49fad38473f4 100644 --- a/media-libs/opencv/opencv-2.4.8.ebuild +++ b/media-libs/opencv/opencv-2.4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.1 2014/01/24 21:16:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.2 2014/01/24 23:57:27 dilfridge Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -127,7 +127,6 @@ src_configure() { $(cmake-utils_use_with png) $(cmake-utils_use_build python opencv_python) -DWITH_PVAPI=OFF # not packaged - $(cmake-utils_use_with qt4 QT) -DWITH_QUICKTIME=OFF $(cmake-utils_use_with threads TBB) $(cmake-utils_use_with tiff) @@ -159,6 +158,12 @@ src_configure() { -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic ) + if use qt4; then + mycmakeargs+=( "-DWITH_QT=4" ) + else + mycmakeargs+=( "-DWITH_QT=OFF" ) + fi + if use cuda; then if [[ "$(gcc-version)" > "4.7" ]]; then ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support." |