| 1 |
commit: f39afaac149207393c8cfb4ffa1b74d2e7681c58 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 01:45:41 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 01:45:41 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=f39afaac |
| 7 |
|
| 8 |
Resync with main tree |
| 9 |
|
| 10 |
(Portage version: 2.1.10.19/git/Linux x86_64, signed Manifest commit with key 7887F787) |
| 11 |
|
| 12 |
--- |
| 13 |
media-libs/opencv/ChangeLog | 5 +++ |
| 14 |
media-libs/opencv/Manifest | 35 ++++++++++--------- |
| 15 |
.../opencv/files/opencv-2.3.0-libpng15.patch | 8 ++++ |
| 16 |
media-libs/opencv/opencv-2.1.0.ebuild | 4 +- |
| 17 |
media-libs/opencv/opencv-2.2.0-r10.ebuild | 7 ++-- |
| 18 |
media-libs/opencv/opencv-2.3.0.ebuild | 30 +++++++++------- |
| 19 |
6 files changed, 54 insertions(+), 35 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog |
| 22 |
index 87fa48d..fd106c9 100644 |
| 23 |
--- a/media-libs/opencv/ChangeLog |
| 24 |
+++ b/media-libs/opencv/ChangeLog |
| 25 |
@@ -2,6 +2,11 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $ |
| 28 |
|
| 29 |
+ 28 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.1.0.ebuild, |
| 30 |
+ opencv-2.2.0-r10.ebuild, opencv-2.3.0.ebuild, |
| 31 |
+ +files/opencv-2.3.0-libpng15.patch: |
| 32 |
+ Resync with main tree |
| 33 |
+ |
| 34 |
18 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.0.ebuild, |
| 35 |
todo.txt: |
| 36 |
Flann is more and more integrated, not worth patching it out imho |
| 37 |
|
| 38 |
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest |
| 39 |
index a1efd9f..5f9cd7c 100644 |
| 40 |
--- a/media-libs/opencv/Manifest |
| 41 |
+++ b/media-libs/opencv/Manifest |
| 42 |
@@ -18,33 +18,34 @@ AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216 |
| 43 |
AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b |
| 44 |
AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac |
| 45 |
AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861 |
| 46 |
+AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c |
| 47 |
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378 |
| 48 |
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448 |
| 49 |
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f |
| 50 |
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e |
| 51 |
DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b |
| 52 |
-EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f |
| 53 |
-EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7 |
| 54 |
+EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5 |
| 55 |
+EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da |
| 56 |
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc |
| 57 |
-EBUILD opencv-2.3.0.ebuild 4097 RMD160 20bbbf8a7d11422ac502ee02cd71982eb154c87c SHA1 a75a8e8971354218e129ede6375f443b8f8c02e6 SHA256 c9574b85c274f51a7eb570f4cd2a75ed8a75318df7c6799d2bdb157ad5f7bd8d |
| 58 |
-MISC ChangeLog 8336 RMD160 3e0340c271a5559950e0a831b7625e5e08080769 SHA1 d85a91d178f6264692eb95322f598f3fba7b2078 SHA256 52cb33b7b453cadee29475964ec25ffc0abf3cee5a804252c1a86edeb7f2612c |
| 59 |
+EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08 |
| 60 |
+MISC ChangeLog 8525 RMD160 2b89e3b492f3dbb79bea81e650526b1b67d1c081 SHA1 31a0be8c34470bf5eca428e726ba10cfc10fb840 SHA256 53d3729f105e5eb086fab237046cfa2769cf4f70dd241b3b783565339455fdff |
| 61 |
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2 |
| 62 |
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 |
| 63 |
MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3fefad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c3476186dd73a3041e39e80a509541a57dc689d26b5a |
| 64 |
-----BEGIN PGP SIGNATURE----- |
| 65 |
Version: GnuPG v2.0.17 (GNU/Linux) |
| 66 |
|
| 67 |
-iQIcBAEBCgAGBQJOdjuYAAoJEEb+UGWnxTyHV7MP/iIpTFOWiE3iSm+tel9ZPuS/ |
| 68 |
-l7SFpYxKTuvLNwetRhZFei/xliNApPcYHUKzndlaZC7ZUEBMrByosfoeZZQnjb5i |
| 69 |
-LZ2EtOEEmVk52+ERX1RZ6Vw1c0r+1KmqZH5Zdxyqf9v4b00q71lOWwNJemd3caEL |
| 70 |
-qaN2QxKcLeZ8yRFR3W3LMwp4306EYQTbJQTLF1MCg/m5IFVhaCzeU9qo5Gs+NTJj |
| 71 |
-9pxDhSluKnW6pqJCTAQABMxfoZY1Fzyk1JLMKaEf8xuAhv8BPxChdSJdg88pRUEM |
| 72 |
-2xAbjU667TfTGsx0RSitbZGS+1AL2RYuqGsf7AUZTTINoC/Z5LLinFI2P/9XtufF |
| 73 |
-GF9eSd+XUNHfGR+qlEqlIaFfyeBjmUYGO48jHuzZDhhAzIgwEgGhjIcovie7Y/3s |
| 74 |
-tTLsjjEZmF6odQHWr+PRcUEoMRmEW9bm0/FScTkqB6hHR0OYRglHdShUlAwaw/WJ |
| 75 |
-PpGv7uqqtYbOL0cRXBEptnvEV7vQo3MuY9OA/qCcUqoMPvrobYD+8Hj8yDCPUuNQ |
| 76 |
-KFyeFhGOm7VhT+JDb129PXUknFip8y9dFmhxoawMefjbKetgV8NPDhnAcTkdiDN/ |
| 77 |
-NRtkSLtYWCbwxM/EIiqJcVIpYqNs6Atjvmo1pQsoHmlSoYvXyerZ2OuaYYDsXTFu |
| 78 |
-or1d/ElzGeXqdV8yEYV6 |
| 79 |
-=gsLg |
| 80 |
+iQIcBAEBCgAGBQJOgnxFAAoJEEb+UGWnxTyHQSMQAKR5oYBLhlsSHPDU8toUV036 |
| 81 |
+p5tDB8ljNLHbxZ6Tf6GB7gNzRww1ZFBBt0kz9tRBN8nz2ioWQLPxz5wOPK/sUsiB |
| 82 |
+BJEvLO4urdDeRmGVCOuYZxRkE5AoQFExY26praTkOeC1n5dpDryky9Po8g3Xpx8U |
| 83 |
+87C6LyBFp5xfYWgaGLIUbyxfg7tj03gAJghfJ2lz4LOcYlcPnIvN4/swLkP3Y+ie |
| 84 |
+OgG5PD/DExqcO1KYIRpn4cMNr6moVNX702GbbHIOwfnK/eeQ5XZgI1VsXFwsszII |
| 85 |
+Yfmte87pcyM3thFRIhXpLQMdXywqryGhkMXELuWidfaQ2VEcfupRKFWNlvlSxsr0 |
| 86 |
+0wG9pfe20U12Ls/pcJ6FjiKlV0qcWhRPVGJKzd1jpWEQ0vwhw+V+aIl29PYWT2XK |
| 87 |
+gYWCdxqd9Ny/kmKXh61z/ae/nt1KirUHAHGtVD8d3dtnYP9GADOXco+c0QBJxtAd |
| 88 |
+sbC0snmFHRZE0JobNOR8a/vbTBUxrilODiesHdrCpDiWfj9PlUhVO5pm0q/XS5la |
| 89 |
+/e8ykuL56GYRr7PSPHOPTjvFDcZ6JzCetj7qc/QFWE61YI67HaYgjVhR6QiKfZhy |
| 90 |
+CiNiVPHJ20CSbIZpax14sRE3F1gP5flAPXK57jfL6PMwjY0uAf6+ThMtGN7+3ni/ |
| 91 |
+WrXjV5Z/xmTMCMKjRj/T |
| 92 |
+=KUyM |
| 93 |
-----END PGP SIGNATURE----- |
| 94 |
|
| 95 |
diff --git a/media-libs/opencv/files/opencv-2.3.0-libpng15.patch b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch |
| 96 |
new file mode 100644 |
| 97 |
index 0000000..c811766 |
| 98 |
--- /dev/null |
| 99 |
+++ b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch |
| 100 |
@@ -0,0 +1,8 @@ |
| 101 |
+--- opencv/modules/highgui/src/grfmt_png.cpp (revision 4945) |
| 102 |
++++ opencv/modules/highgui/src/grfmt_png.cpp (revision 6143) |
| 103 |
+@@ -57,4 +57,5 @@ |
| 104 |
+ #include <png.h> |
| 105 |
+ #endif |
| 106 |
++#include <zlib.h> |
| 107 |
+ #include "grfmt_png.hpp" |
| 108 |
+ |
| 109 |
|
| 110 |
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild |
| 111 |
index bccb369..c8dec83 100644 |
| 112 |
--- a/media-libs/opencv/opencv-2.1.0.ebuild |
| 113 |
+++ b/media-libs/opencv/opencv-2.1.0.ebuild |
| 114 |
@@ -1,6 +1,6 @@ |
| 115 |
# Copyright 1999-2011 Gentoo Foundation |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.11 2011/06/26 14:56:25 ranger Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.12 2011/08/10 16:49:17 xarthisius Exp $ |
| 119 |
|
| 120 |
EAPI=3 |
| 121 |
|
| 122 |
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" |
| 123 |
|
| 124 |
LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD" |
| 125 |
SLOT="0" |
| 126 |
-KEYWORDS="~amd64 ppc ~ppc64 ~x86" |
| 127 |
+KEYWORDS="~amd64 ppc ~x86" |
| 128 |
IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine" |
| 129 |
|
| 130 |
RDEPEND=" |
| 131 |
|
| 132 |
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild |
| 133 |
index 47ee381..e067847 100644 |
| 134 |
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild |
| 135 |
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild |
| 136 |
@@ -1,6 +1,6 @@ |
| 137 |
# Copyright 1999-2011 Gentoo Foundation |
| 138 |
# Distributed under the terms of the GNU General Public License v2 |
| 139 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $ |
| 140 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.9 2011/09/06 20:56:37 dilfridge Exp $ |
| 141 |
|
| 142 |
EAPI=3 |
| 143 |
|
| 144 |
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" |
| 145 |
|
| 146 |
LICENSE="BSD" |
| 147 |
SLOT="0" |
| 148 |
-KEYWORDS="~amd64 ~x86" |
| 149 |
+KEYWORDS="~amd64 ~ppc ~x86" |
| 150 |
IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
| 151 |
|
| 152 |
# all tests fail, needs further investigation, bug 296681 - dilfridge |
| 153 |
@@ -46,7 +46,7 @@ RDEPEND=" |
| 154 |
) |
| 155 |
jpeg? ( virtual/jpeg ) |
| 156 |
jpeg2k? ( media-libs/jasper ) |
| 157 |
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) |
| 158 |
+ ieee1394? ( >=media-libs/libdc1394-2.1.3-r1 sys-libs/libraw1394 ) |
| 159 |
ipp? ( sci-libs/ipp ) |
| 160 |
openexr? ( media-libs/openexr ) |
| 161 |
png? ( media-libs/libpng ) |
| 162 |
@@ -61,6 +61,7 @@ RDEPEND=" |
| 163 |
" |
| 164 |
DEPEND="${RDEPEND} |
| 165 |
doc? ( app-doc/doxygen[-nodot] ) |
| 166 |
+ >=dev-util/cmake-2.8.5-r2 |
| 167 |
dev-util/pkgconfig |
| 168 |
" |
| 169 |
|
| 170 |
|
| 171 |
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild |
| 172 |
index 7fa7b64..0d41961 100644 |
| 173 |
--- a/media-libs/opencv/opencv-2.3.0.ebuild |
| 174 |
+++ b/media-libs/opencv/opencv-2.3.0.ebuild |
| 175 |
@@ -1,6 +1,6 @@ |
| 176 |
# Copyright 1999-2011 Gentoo Foundation |
| 177 |
# Distributed under the terms of the GNU General Public License v2 |
| 178 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $ |
| 179 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $ |
| 180 |
|
| 181 |
EAPI=3 |
| 182 |
|
| 183 |
@@ -16,15 +16,13 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" |
| 184 |
|
| 185 |
LICENSE="BSD" |
| 186 |
SLOT="0" |
| 187 |
-KEYWORDS="" |
| 188 |
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
| 189 |
- |
| 190 |
-# all tests fail, needs further investigation, bug 296681 - dilfridge |
| 191 |
-RESTRICT=test |
| 192 |
+KEYWORDS="~amd64 ~ppc ~x86" |
| 193 |
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine" |
| 194 |
|
| 195 |
RDEPEND=" |
| 196 |
app-arch/bzip2 |
| 197 |
sys-libs/zlib |
| 198 |
+ sci-libs/flann |
| 199 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) |
| 200 |
eigen? ( dev-cpp/eigen:2 ) |
| 201 |
ffmpeg? ( virtual/ffmpeg ) |
| 202 |
@@ -79,6 +77,8 @@ pkg_setup() { |
| 203 |
|
| 204 |
src_prepare() { |
| 205 |
base_src_prepare |
| 206 |
+ # include missing zlib.h for libpng>1.5. Bug #383571 |
| 207 |
+ epatch "${FILESDIR}"/${P}-libpng15.patch |
| 208 |
|
| 209 |
# remove bundled stuff |
| 210 |
rm -rf 3rdparty |
| 211 |
@@ -93,14 +93,12 @@ src_configure() { |
| 212 |
$(cmake-utils_use_build examples) |
| 213 |
$(cmake-utils_use examples INSTALL_C_EXAMPLES) |
| 214 |
$(cmake-utils_use_build python NEW_PYTHON_SUPPORT) |
| 215 |
- $(cmake-utils_use_build test TESTS) |
| 216 |
$(cmake-utils_use_enable sse SSE) |
| 217 |
$(cmake-utils_use_enable sse2 SSE2) |
| 218 |
$(cmake-utils_use_enable sse3 SSE3) |
| 219 |
$(cmake-utils_use_enable ssse3 SSSE3) |
| 220 |
$(cmake-utils_use_with ipp) |
| 221 |
$(cmake-utils_use_with ieee1394 1394) |
| 222 |
- $(cmake-utils_use_with cuda) |
| 223 |
$(cmake-utils_use_with eigen) |
| 224 |
$(cmake-utils_use_with ffmpeg) |
| 225 |
$(cmake-utils_use_with gstreamer) |
| 226 |
@@ -116,6 +114,17 @@ src_configure() { |
| 227 |
$(cmake-utils_use_with xine) |
| 228 |
) |
| 229 |
|
| 230 |
+ if use cuda; then |
| 231 |
+ if [ "$(gcc-version)" > "4.4" ]; then |
| 232 |
+ ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." |
| 233 |
+ mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
| 234 |
+ else |
| 235 |
+ mycmakeargs+=( "-DWITH_CUDA=ON" ) |
| 236 |
+ fi |
| 237 |
+ else |
| 238 |
+ mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
| 239 |
+ fi |
| 240 |
+ |
| 241 |
if use python && use examples; then |
| 242 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) |
| 243 |
else |
| 244 |
@@ -158,8 +167,3 @@ src_configure() { |
| 245 |
|
| 246 |
cmake-utils_src_configure |
| 247 |
} |
| 248 |
- |
| 249 |
-src_test() { |
| 250 |
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib" |
| 251 |
- cmake-utils_src_test |
| 252 |
-} |
Archives