From 588df263710cc092af423c1691f83cd89283124a Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Thu, 5 Mar 2015 12:12:21 +0000 Subject: [PATCH] Patch for cuda-pkg-config added #531198. Thanks Quentin Minster for patch. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x34E69781 --- media-libs/opencv/ChangeLog | 6 ++++- media-libs/opencv/Manifest | 27 +++++++------------ .../files/opencv-2.4.9-cuda-pkg-config.patch | 12 +++++++++ media-libs/opencv/opencv-2.4.9.ebuild | 3 ++- 4 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 6a8731990fda..49aa6e60a67b 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.118 2015/02/27 22:24:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.119 2015/03/05 12:11:57 amynka Exp $ + + 05 Mar 2015; +files/opencv-2.4.9-cuda-pkg-config.patch, + opencv-2.4.9.ebuild: + Patch for cuda-pkg-config added #531198. Thanks Quentin Minster for patch. 27 Feb 2015; Michał Górny opencv-2.4.9.ebuild: Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 18066eeda02a..797efba8ae6e 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -5,28 +5,21 @@ AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4ee4159f6592af0e76e86b7b00 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220 WHIRLPOOL 52aa228d8ebf2ba51eb67cc31ba4eee27f43d5fc86d3b5028e32e2a8caf1350ebda70bab2a060f9a387312795788b575253d446380645e52e7cf10f57cad9a88 AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e675e13a11ebd6593815625c3328bfec SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64 WHIRLPOOL 405901f0de77d1f16dc9d28deec6a56062bbfd514994ec094f468ea2298a15111067031cef33ce92b4c237539ed2ee294ec54e2ea6b5c739466e879c291af964 +AUX opencv-2.4.9-cuda-pkg-config.patch 373 SHA256 18ef4f87f3effcc1306c81ff8134a5863a694988efddc16ac36b15892d403b76 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937 WHIRLPOOL c19c4b3acc6944a3218cba55b38875f417a8755e9616dc26a1541a189452bf7f01fcbbde3436290752d8fa75caebd39b3335eb8beca697e06a4a86cd8dfa0e27 AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f31075c268e80ad30aab33cc2 SHA512 b8d7a18e00359a985f389eecf779b2d648ea88f2508c31f1895eb0d9ef9ce2924866054a2df0bb452ba161c3ba254e4cb9717c1275392a2e8691b9b34c245e9b WHIRLPOOL 6bc5b4afb724a6450228eae6e6920ee57d36f2d1bb50c09a6bd7230f870224d75367d3a9dbd0f02d1bacb1fa48d6e2d331d363716cc547fb85b67b48985dc5fb AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e -EBUILD opencv-2.4.9.ebuild 6089 SHA256 e253bc9ce6663253135dd2deed47c7c8bb8d54a493341f0d406fcf06986524f8 SHA512 074c8a5b80f96bc0c5ce91b077c31935588b9e8da470ef0fec283a38bd4dc35f28783163c357b4c7d426296e8ba0b29e7756bbcd3e2247c2617c099771484338 WHIRLPOOL 33b3dafe6d2263c23f703f1e0bb4d5d1cd6568a03fc33fe6228b82526f7dcf17140d9e1fec9007901d54521cf206ee9ed935b227ddf48df5733edbfce012f468 -MISC ChangeLog 19693 SHA256 27c1031a62ceeda5b0e65b78fd19365f56a4e76c91db71682d86e6fb10d063e1 SHA512 75d4cd3f2bc5496749e01c7abd55cd568da19575f2e63ee8041514066aa979a89c4e598e005d51a5ceb858c4db26fa4490d4b7a50f2a3c806184b9e3ed6bc067 WHIRLPOOL b8f0ad7f941ca2346d937ca3b4f98d892b73fdc72f3d84df2c9d3b70c1db3ed8b394b4e2cf0b803bda6cf9f9b570496dd172e70d14e6b1236ae2d39f308bb4ef +EBUILD opencv-2.4.9.ebuild 6139 SHA256 b61913f91082c577cc82da137849c768d91f7145a8f2bd70e5b9234642b4f758 SHA512 7b1faddb592782abcbcb669d79d0290ada209e62def98f880d3a096ce5f77a42e22cb1e518872b34858d6241e437b3a8cdf3d0fcdf46bff4a6508427719f081d WHIRLPOOL 06d4e964480221bac61b7f239813ea2c84d80114aa28b6715fa0a6b98bfb2ca459d01a5784b5bd4bc1a90b2046110271e5c2ffe2b031b4ecc287243d10a70a99 +MISC ChangeLog 19870 SHA256 be4eb0d441c1f206b71b461d5a193f769bd07edc8f91ecb6b7d3b6e75660a25f SHA512 29a1421c5d3f4c3d99f15b1e141253419d0722ce52da3327fe48beab7040e99db9f3266358accef62da30ab98c45085b164b613d1bd428afe353341171a2d072 WHIRLPOOL 527de37d2b70f83ca2572c68c13f7c73b192ef95213963940dddba63cbdb3c969eacf6aa7e7e650b847f85216524efb0ebf6858259701de8e040c87db3e7dea8 MISC metadata.xml 1230 SHA256 8ac77d1094c6a1d2f83c13693a34e3c7745e4b55d99d44d7471ed0d847bae369 SHA512 4a3191076a5e9c211ffbff7ea6870214c1533193d7a26d0937f78b00d80f4874561dbe76d05c63dbde820db2e49603d048fcb6a34cb704bb0f5e7cb33f645be0 WHIRLPOOL 87825beff89509383be4fc077471c3c91e0b3956ea19b2f7373310404f0e27c1d394309d996ce3763f63f611a61b9d8e7e6c3b82c50a0cf4c56b399accc396a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJU8O6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOz7kP/0B19TTji0JyjQ5NzNIne839 -c9ojjcsbvtXgyZRG1SJDqbQ9CKuj9zd1OVLcUkS/k+RswjHtk6CjAsQ/hHw3uy0S -SgGMufPkvli3w3mLH3W/QWoGTTIKGjyhaWelDds7Y3AK2jw6vzggH9LhtOGmTCga -ky/8cZvMt5doHp9+GigMhg6+Iq0j6CQBNVzbHrtSOeCncXEGT31EEcDtjrE3qZfG -LeiS0MtbhPUMft6qi97SdXcgQVl4EFldRbI2zuvbYG7H2ScvMVmYbmSrGF7hCum7 -s2axDnyOi142cZo4TfsqizS7vLgJxRN5FL5imQOFczNGN8UZCnC20eFxSnFEWwwo -HyUL0aHRTOIEkYlx/hh3VoGT97Ziim722HBkNmeCmNxy9+6ElMZLZSaRi/oEm36u -5AdjfLyAfu4t8y9xUo62DeWKeAz4IjId5SMTE3KcBgMgNtqtLQ9CMl33379KSdnZ -lTKpNBlfaq1rS4iNkG1L+HufM8NvyzDgQukvgOTR68agswauB+bVYa/0j7FUNvAp -qOeQFPG9ueP0LK1oCpj2ZcfyWFsQWF2625aeqqVju3WVYfY2ZqRNe1qr3ScwJAVL -wAIyi0F4HH4zLyBmBSa0nwfEdbCk3oLkIcKcPoG8HHiaXRIkJhT9xPUeQ2una5Ti -2choBzB14obzZGaB7hEM -=/dOF +iQEcBAEBCAAGBQJU+EgiAAoJEDuJ1FA05peB4MQIAIms2lCrcgMGjW7CVtfJliu9 +Wb1rvqV84XNHZfnmSHL/jZVEAoLp48pwimxmpuNy2JWLlX9Gf59ULcp7v0kdjNd4 +Ufp1qL4RLUYoGnIOabmX9ERJgSBVugl01dvqCOthsl89aT2KngaXB1uNEX76UTai +gOacSwLGobhTmLUyKENKaaW51yJ8zRfF2fqvHjVqAi7HF1fGb6XL8DLxRkoE1vWo +AYj7CuhCqfBCGYh6MJv2bgx7o8ZzklsksYWSTwf+pI31Sze+6u9GYucU7gFaf8cC +xLqoR4Vf3v6me2U/SKECgFYQs2FazG4L+P1JO3M5YeommHFzJyWQFqqDSBEhxco= +=Hvvy -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch b/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch new file mode 100644 index 000000000000..d7ff3c7eaf67 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -528,6 +528,9 @@ + if(HAVE_CUFFT) + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_cufft_LIBRARY}) + endif() ++ foreach(p ${CUDA_LIBS_PATH}) ++ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} -L${p}) ++ endforeach() + endif() + + # ---------------------------------------------------------------------------- diff --git a/media-libs/opencv/opencv-2.4.9.ebuild b/media-libs/opencv/opencv-2.4.9.ebuild index 7e7b14d9c7a1..1c217915998d 100644 --- a/media-libs/opencv/opencv-2.4.9.ebuild +++ b/media-libs/opencv/opencv-2.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.9 2015/02/27 22:24:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.10 2015/03/05 12:11:57 amynka Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -80,6 +80,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.4.8-javamagic.patch" "${FILESDIR}/${PN}-2.4.9-cuda.patch" "${FILESDIR}/${PN}-2.4.9-libav10.patch" + "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" ) pkg_setup() { -- 2.26.2