# ChangeLog for sci-libs/vtk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.119 2014/11/03 13:58:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.120 2014/12/26 12:19:44 jlec Exp $
+
+*vtk-6.1.0 (26 Dec 2014)
+
+ 26 Dec 2014; Justin Lecher <jlec@gentoo.org> -vtk-5.10.0.ebuild,
+ -vtk-5.10.1.ebuild, vtk-6.0.0.ebuild, +vtk-6.1.0.ebuild,
+ +files/vtk-6.1.0-freetype.patch, +files/vtk-6.1.0-glext.patch,
+ +files/vtk-6.1.0-install.patch, +files/vtk-6.1.0-netcdf.patch,
+ +files/vtk-6.1.0-system.patch, +files/vtk-6.1.0-web.patch, metadata.xml:
+ Version BUmp, #500814; fixes GLintptr declaration problems, #523786; Add slot
+ operators to dependencies, #531040; drop old which obsoletes, #477638,
+ #497224, #520310
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> vtk-5.10.0.ebuild,
vtk-5.10.1.ebuild, vtk-6.0.0.ebuild:
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669
AUX vtk-5.10.1-libav-9.patch 3474 SHA256 688b58df16c0fada2ef5ccca8c53a8029bd6b3a6eaaddec3a210ac880cba2120 SHA512 f22d8c215aa23b9e719598b034657a61092d326dd7e2ef0e7e68a1ff0d33e1a6523e0ae85fbc2a1e72c869a295b257563daef0842f67b27716ab2652d03bb447 WHIRLPOOL 2a0cf463926b4e06df02942a0f63aeb0a659da6f1ba85a456485691199de48d418ce2c222f39a3b69876961491bf3bcacb8b1272793e3f7785771cd474e8cb75
AUX vtk-5.10.1-tcl8.6.patch 2339 SHA256 b4f3800267e77589267b6121820f0df4764b970dee75f256cdfb13a721ee1163 SHA512 0f7c53bbc2012ab2d2ad296adc305dcd3fcdb1cc47e8015c656b8b2cc626dcc0e61149bdaeb66945c19c6533a610a41cfc03d3b117d6959c2b7e32ae3da77564 WHIRLPOOL 6a8c3548cee051e97a975efe62f40c24aaa26e3d1a7afa2cde50ff19913ba6cb8eaf5fe9f0ce8febb7a1f0482b48917b5d26505bc2f40d3d560cada7865d25a2
AUX vtk-6.0.0-netcdf.patch 3121 SHA256 76de7de43f6bf30b7c049ef4365f9dcef89ff02ab0537fee2e6c356184c51d28 SHA512 cb4f99dc794f2b1bc2a29b24030e55373e5e6f552a057c3484268cb013affe742e411a1ee30f31c53ab74e4436d61e235f1ffcfae8c8e2ae0f66ec7358709870 WHIRLPOOL 579979a187eefe6841b3019a7e70bb7799bb3236651cc13e708234fff24bce6166ca646c4121665c148e39f019c4b2aaeaa7f3803048993b9d4fd9b165890b78
AUX vtk-6.0.0-system.patch 1405 SHA256 f6576f02922e6672805db7a32881779c69bbe04df472baf1fda4aec2266e9484 SHA512 97c4fbe10cd26e5d51745236acdd88a5a3371dac1abf7aa8bd5fd62742646634c8bf71d77393f9015662994215f11ebaf6ee0c0128e48940a53d0128c3e59bea WHIRLPOOL f4449b22d8b0a193bebedde16b1deddbc82cdcbd8a3e947b039f0c51d742e495bc8f729930f11ab8b84672a9d0b505ef421dae9f1d173f7879ffe3a20dd59fb9
AUX vtk-6.0.0-vtkpython.patch 583 SHA256 93280898c89da7f99962fe5536006ae52bf488162021c42b8f0b98220a8c35e1 SHA512 49b4749aa16bdf61c83f5de0f40a3da7b1212793855e537d1cb97ab489260862c87b936292add17a318d4940e634fa2b043c5d7d8a73effcedbb85e5ab00533a WHIRLPOOL 43b8d3701b274a76b070e639733dc1e4bfde4f96ccf1e41ebecbbee8872555c6452ed300e47e3b56778dcd9c930e4a5836038938f82951758fe2f3d158597fe1
-DIST vtk-5.10.0.tar.gz 24803686 SHA256 9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392 SHA512 8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554 WHIRLPOOL b7265e7e2430ad1de90987f8c54c130734d603f27e806a7666a292334e6feb43b4883e68b77004b9c1eb9bfe488db59ccf89052745e1f68153d7bd3bfabdb43f
-DIST vtk-5.10.1.tar.gz 24804193 SHA256 f1a240c1f5f0d84e27b57e962f8e4a78b166b25bf4003ae16def9874947ebdbb SHA512 2e4ab39293620b553c91e2275a813ce88eaa39c7f4c3ec6041d88a71fa736ee38aad31ec66897440d4025d5c0933d16c1d421ac5b91cd8a362f6f2e6569bde22 WHIRLPOOL 4b7aef091b2a1d9c14b0f2ba9495b1809771c92c6c2c242ce3a723b43878f9c79d21214f6db8b16c726542f6375d8932c7ed50ceadc3a07724f6ecdb46492e0e
+AUX vtk-6.1.0-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4aa47f6daad4defdb5be842719102036c452 SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 WHIRLPOOL 95b7d29a790aa095b2ded9becb8cb02f9ca837ab4c18cae62a5f7f8191fd94af6c5e4df5359b4ea1268d01e72fe6f8eff56ec7cef8b2ef823021f8e5395fc911
+AUX vtk-6.1.0-glext.patch 609 SHA256 17370b853306658f8421a5c7d6a5435c35a90c2c3bf60e9bf39981b774b92b9d SHA512 a2cfb0801742fded8984dfe849d3c2da9796c6c87a2bbe2eac622f4b91abe1c142fd97d94bbe248ff222fae85a80db8d6ee100de1022049ef6c9a82aaebbb9d5 WHIRLPOOL 08048efbbf745672ae22e20b1ad696f48092ab124b9837acc259ceb53a47b8f45891680affa00d0a99b5175918d1a06874bbbd03d113b663e235d75a513b2405
+AUX vtk-6.1.0-install.patch 968 SHA256 8cf7f1e8bf1c6e93da44a0a1ff4ba49405ef5e166e65eece329eab412a9e01db SHA512 e6f7e5436c6efca920bd7f9b724c219b7a34a357f01fb813bf168aefc1727b9c2d4af6cb380b4b6b70e4b091557f866761499a53e7e1c07a665d06aacd2acdb6 WHIRLPOOL 2ec857828e055eb4ff1228ce56b5c080a104f7d18e30b3aa37447af5a027c82c52a0f3a4d45c479ea2b01c4e5b11ce49820c7a53d3198db3025f171d8b945a4e
+AUX vtk-6.1.0-netcdf.patch 994 SHA256 88b432be80b24ea223d4b5eae262dd4f9522f5db7a675ccbaa6c918595e1b738 SHA512 0f0b3493270efbf33a13abb7f38637473d48d15efe793f7148c13f5aeb77ac5534340d42f87451cd81ed2d7cce4ca6da9a71e065a7780e84f30a710d7368b488 WHIRLPOOL 2b56f6444c14326b330e90daa9e788f959d3f937e8055b09136bbd1ca7d17403073c159c018f3b76122b1cd96b671460f449bc4edfb55c588386398e3a3e5140
+AUX vtk-6.1.0-system.patch 1307 SHA256 ae8db7e796054546d9169cb9b5fc91b84cc3f13bee6e9e3cb79796165dbc9579 SHA512 1fae8aecaf2344b5517e9b29ea2cb8b834af8a22be88535ec8bf9ec624625ea3f2ca820945a3d3f7c896ca080a7ded59ca7a601c50f970e59c3a8db691f060b3 WHIRLPOOL 4b3c28c15e6cd998092078d6f36a39e32b9177f6072482c07b99c3d6c9fd6ca1f767a13f59c5a93d05cef73f5f4159eb068edbb0e9b20ff43e83970a9bc67506
+AUX vtk-6.1.0-web.patch 776 SHA256 e69d4d2d90d556279d241fd9b5c04d6f35e4b40de8e83ce7fb65e4ddb8276886 SHA512 5489096a0a4e5854cd426a75a0713f53a5c0daab7a9069c249b65d4a34cc8ff18737267f16ee8fbb2a07b7e987525b93e1eec5a23f78ac1b3f893c5847761bc5 WHIRLPOOL 9873b27097b812e932cde1633d2618ccfdf25171db983f7cb40e62376aa71bd2f1b2a84da58331f3662da88c2c738fb76759662d81cffc6b00d08a4a62f32622
+DIST VTK-6.1.0.tar.gz 27608882 SHA256 bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc WHIRLPOOL e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c
+DIST VTKData-6.1.0.tar.gz 94452190 SHA256 aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 WHIRLPOOL 1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28
+DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f WHIRLPOOL db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1
DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8 WHIRLPOOL b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9
-DIST vtkDocHtml-5.10.0.tar.gz 176529461 SHA256 28d7e1bfc9f9a4d225d15b9f46cec18f89df106a161d0cee29fcc6f071d3b01a SHA512 f713238e51e3c82c78ed8ac757b99c4847a7f0876de5051f8a251802029781d4d4778843616d008dbb1a133818e30b5e11ae527fe9a549deadc373c22bf874e9 WHIRLPOOL 1055870b5395e70bfc1614cec5587970a0d4a892769c81c67eb767cbb763e05415e94d600fc930b9051a0077ecef35fd15d82d429eef922dad87392a0e4be3bf
-DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a6eaec03c132d13345d225ee6f309944 SHA512 c1c8bf1b3c94ab79b1661b3197788ded31c3aef5114d830866ed0a6dd90d3a6c50ed27cd7840a512065ad2b15fd8bcbc61787fbbd00216a1becb2419eb172735 WHIRLPOOL b3ba92938fb4894522c5b930767b4e4c11756e1aae1c100a42ab4a592f7d4a848ea1996b3956c26cb17cce4cb0fd43d8c92efec42a802e318439a653bcc398e9
DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f
-DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c SHA512 2b0bbd00ad57e27a085f24340900a1b9791936bb91267cdf38b35c01723910714c07679af03d1e4ac68f557c3abcb1e3a18af10526763a91a69e238fb2b40443 WHIRLPOOL 8596cf852c2914fca0754fffe8e1c72caa248df4c12107033427870d970bad7e903430610305685ab1cd491716e902d6a694d9395f44baf32f53909aac253609
-DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
-EBUILD vtk-5.10.0.ebuild 7492 SHA256 ae1af731f3ff20cee4aaf5e8067fcbd3fd760dcdfb048db176cc95e5a4484a0f SHA512 53b41d9fc3ed92420dd0c86fd828ec7352e4b4e83be9dae5d4c6300dd1f632afd195290ea93d61b0b76f512464044bceb1a4413dbc33bfe2c9ded6d0c2950201 WHIRLPOOL aa3f120ea8a6d51aae6864409a35328c6e825c82ba02c9fddb46639bec4d29a0ebcd86218f8dacdad6a6078cbbe1905d231066a77bd9fb58671b669dde94fade
-EBUILD vtk-5.10.1.ebuild 7605 SHA256 261d0210f68eba545a09467e12a04f5ef70131b18463ad79ca3b6762c5bcb908 SHA512 e14543216c966e9e5c848b6b67bcc28da5a4a27f49d63de4e1cb801b779f9f82c419b91ba238ecdbd187b11f89d0496ed3b39d64eecbdc045f8da7fbd2aa3af2 WHIRLPOOL 117647c5b6f2c9fab03a4f6ea37e26e0fc836af2c2ca5824bc2fb4d320557fb9cd56813bda26d31c6b2ae1918894d2caecbcf704b0f0c1bb7e5bcdcf1ef5172e
-EBUILD vtk-6.0.0.ebuild 8959 SHA256 c75222c3bec00b494fa52a84b6fb1193193bfa12597aa7d5a98d2b500c513e38 SHA512 94d73afc25d824d81b8ae623b8f303fe4e45b1964955c9df09eb1d68ccbf632b43a976568dde821f287c6cac3e73894869f7248ab770011465860c9c74cff57b WHIRLPOOL a53f8e6ce6c9134d4529cc54679144029aada289ef8df1c5d6c8de461e87abda73c137fab18b195a0726295a1fe5927ed683b13d1125a7277039413b6aabc1c4
-MISC ChangeLog 19088 SHA256 891739628f8c502f0be864d83d2760163eb089e232e7f44d0964d4d9d7c5ea17 SHA512 ca10e546eb8b987fa29eda131758a0461affc0387e8d9e32787a3dc1910f429b3a21e1c22c1355b1ba681088b7db0c6307b7c3f62664f2e8b9eb01223a11c7d4 WHIRLPOOL ef43bcc1f58aa44a7d3f7c50e52e4302796f5570b793118c3e945cac4a9641e8d8747a075d3eef53e3aaf0c163f37752fd7cf66a08d951e1acf6a8113cefba1f
-MISC metadata.xml 802 SHA256 1231c68c26cabb428cdbcceef9d861221da64ad74e27e2fb90fd4a33de8b77f5 SHA512 c9363d3988a51151aafc0b5d2ed7ffc7c76578c8e075a723ed29fac8b3aeb6991915508d111847b28fb7368d43b8307cbd97b726d5d8f87d71ae593938d7291d WHIRLPOOL 76fd0a5cc8aa66331d62cae3cc5fd542480a709608fd155602c87b6234d68b06659d67849446b190d27bcd844acddd6ab63939a9399f4bb64ed6d87f375eeb2a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlRXigIACgkQVxOqA9G7/aBi5QEAgDQSrDy1r2Oj1WUmUOMwU7MC
-tRY1jJC5LLcQYI6MZZAA/imhzXK2/neeakkEws5ZSdEt4WRUK2emH+BeVA1poPrf
-=8sUZ
------END PGP SIGNATURE-----
+DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 WHIRLPOOL bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d
+EBUILD vtk-6.0.0.ebuild 8955 SHA256 3239e4a33b4b76e6fb768ca45e44be9dfc94020d68cef2d5b2b3180e0b3f0f43 SHA512 e2bb3b2b23c897f3763c2048f5023f757086040bf16e59e2a14e67315b7f3b0513d0608c5b1bf4b1908b6af50e30aef3a9a287ea55f3fa58a60ff601549e1aaf WHIRLPOOL d973a364e1573d527da4e9d1595e137a621096a900b64bb0ca8d1939a2d26e6e26ddbc04a2783437b3a4e24fe901e3cdb60128868b68a24bf5d32212292b9cb0
+EBUILD vtk-6.1.0.ebuild 9986 SHA256 4ed96e1bf915fd48f2ff83ed5e36835775d2e9de8fbd8a499db14897225e21d0 SHA512 4c6d9e64a36c5291ed621c6f491a6815131a970dbdd7f66110bed77174d7f462a7370157f848ab801ab4562c122acb42691021d4dc8202f7d0330d2ffc348285 WHIRLPOOL 8f559e3d06ca635c8d6388d461caed834b48fc23b5ba725f0af3620858bc5e88f99e212a551fa38864f0853700ca2039de21b9982b4d033c9e247ae7901bdefe
+MISC ChangeLog 19612 SHA256 35fd7be045e359b1fefca0fe8dd40732d8be8d1e4b940056c840daa442084b88 SHA512 98b278ea4962d3bc0d5061fdccacc25c447217d110ffead167f6056d0a16b6070fcdc39a84b42c009e1cfdc5642d91d52e426a3c985fb93c0e6749660a433776 WHIRLPOOL c86b379cd408ec51d8a6391d4d71a04a81951f3a3457f0c424fb8fe5cdc2059229539ddc06b9d5c970c209ebed516643d6b67e8ad11ddcc975b6afd86f431c45
+MISC metadata.xml 1019 SHA256 6e123587285b568e31b9f66a1d79bb8c341a9e2e2046ce191539b9968328d5d0 SHA512 9f9f1dcdce0d322fd0eab91ea26f7cd042484e9d9631515964c63f707d9a4144197bb40000c9ff86f3c0500c38aade303875193794233f4aa8475ec4f2736c10 WHIRLPOOL bf720dd4b4ad35767a30859327c13faeb8ce7ac2cede94d80ac5c9699ab7e86cdc3cd412f0dfe033d5fd9dd9e995eab102c927eccd0920cd7fb2d2fbd5bf4976
--- /dev/null
+--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100
++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100
+@@ -1185,7 +1185,7 @@
+ if (bitmap)
+ {
+ metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
+- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
++ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
+ metaData.descent);
+ }
+ ++heightString;
+@@ -1952,8 +1952,8 @@
+ if (bitmap)
+ {
+ bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
+- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
+- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
+ bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
+ }
+ else
--- /dev/null
+diff -up VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h
+--- VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext 2014-01-22 08:55:41.000000000 -0700
++++ VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h 2014-11-19 10:27:12.349345199 -0700
+@@ -19,7 +19,8 @@
+ #include "vtkConfigure.h"
+
+ // To prevent gl.h to include glext.h provided by the system
+-#define GL_GLEXT_LEGACY
++// https://bugzilla.redhat.com/show_bug.cgi?id=1138466
++// #define GL_GLEXT_LEGACY
+ #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
+ # include <OpenGL/gl.h> // Include OpenGL API.
+ #else
--- /dev/null
+diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install VTK-6.1.0/CMake/vtkModuleTop.cmake
+--- VTK-6.1.0/CMake/vtkModuleTop.cmake.install 2014-01-23 19:12:04.922871103 -0700
++++ VTK-6.1.0/CMake/vtkModuleTop.cmake 2014-01-23 19:14:33.002645155 -0700
+@@ -330,11 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
+ CMake/pythonmodules.h.in
+ CMake/UseVTK.cmake
+ CMake/FindTCL.cmake
++ CMake/TopologicalSort.cmake
+ CMake/vtkTclTkMacros.cmake
+ CMake/vtk-forward.c.in
++ CMake/vtkGroups.cmake
+ CMake/vtkForwardingExecutable.cmake
+ CMake/vtkJavaWrapping.cmake
+ CMake/vtkMakeInstantiator.cmake
++ CMake/vtkMakeInstantiator.cxx.in
++ CMake/vtkMakeInstantiator.h.in
+ CMake/vtkModuleAPI.cmake
+ CMake/vtkModuleHeaders.cmake.in
+ CMake/vtkModuleInfo.cmake.in
--- /dev/null
+diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
+--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700
++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700
+@@ -1,10 +1,18 @@
+-vtk_module_third_party(NetCDF
+- LIBRARIES vtkNetCDF vtkNetCDF_cxx
+- INCLUDE_DIRS
+- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include
+- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf
+- COMPONENTS C CXX
+- )
++if(NOT VTK_USE_SYSTEM_NETCDF)
++ vtk_module_third_party(NetCDF
++ LIBRARIES vtkNetCDF vtkNetCDF_cxx
++ INCLUDE_DIRS
++ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include
++ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf
++ COMPONENTS C CXX
++ )
++else(NOT VTK_USE_SYSTEM_NETCDF)
++ vtk_module_third_party(NetCDF
++ LIBRARIES vtkNetCDF netcdf
++ COMPONENTS C CXX
++ )
++endif()
++
+
+ #Configure the top cpp header to switch between system and internal
+ #netcdf just like vtk_module_third_party does for the c header.
--- /dev/null
+diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake
+--- VTK/CMake/vtkModuleMacros.cmake.system 2013-12-24 19:17:43.000000000 -0700
++++ VTK/CMake/vtkModuleMacros.cmake 2013-12-27 20:28:22.375573277 -0700
+@@ -682,7 +682,7 @@ macro(vtk_module_third_party _pkg)
+ message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
+ endif()
+
+- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
+ mark_as_advanced(VTK_USE_SYSTEM_${_upper})
+
+ if(VTK_USE_SYSTEM_${_upper})
+diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
+--- VTK/CMakeLists.txt.system 2013-12-27 20:28:22.374573241 -0700
++++ VTK/CMakeLists.txt 2013-12-27 20:28:48.118669708 -0700
+@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE
+ endif()
+
+ #-----------------------------------------------------------------------------
++# Do we try to use system libraries by default?
++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
++
++#-----------------------------------------------------------------------------
+ # The third party macros are still used in one or two third party builds.
+ include(vtkThirdParty)
+
--- /dev/null
+From 58373b120db6d51c6d5eace38447cdb45ff858d1 Mon Sep 17 00:00:00 2001
+From: Patric Schmitz <patric.schmitz@rwth-aachen.de>
+Date: Tue, 28 Oct 2014 16:24:22 +0100
+Subject: [PATCH] Include vtkPythonPackages in Web/JavaScript/CMakeLists.txt
+
+Change-Id: Ie7bffa19bdaa78c5b090c886e50c1af76e2aadee
+---
+ Web/Applications/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Web/Applications/CMakeLists.txt b/Web/Applications/CMakeLists.txt
+index c9e7ad3..b4c9a60 100644
+--- a/Web/Applications/CMakeLists.txt
++++ b/Web/Applications/CMakeLists.txt
+@@ -12,6 +12,7 @@ set(WEB_APPLICATIONS
+
+ set(WEB_APPS_DEPENDS)
+
++include(vtkPythonPackages) # for copy_files_recursive
+ foreach(_app ${WEB_APPLICATIONS})
+ file(MAKE_DIRECTORY "${VTK_WWW_DIR}/apps/${_app}")
+
+--
+2.2.1
+
</maintainer>
<use>
<flag name="boost">Add support for boost</flag>
- <flag name="chemistry">Add chemistry support</flag>
<flag name="cg">Use nvidia's cg shaders</flag>
- <flag name="patented">Build patented classes</flag>
+ <flag name="gdal">Support for gdal formated data</flag>
<flag name="imaging">Building Imaging modules</flag>
+ <flag name="json">Support for json formated data</flag>
+ <flag name="kaapi">Use <pkg>sci-libs/kaapi</pkg> to handle smp support</flag>
<flag name="offscreen">Offscreen rendering through OSMesa</flag>
<flag name="rendering">Building Redering modules</flag>
+ <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
<flag name="views">Building Views modules</flag>
+ <flag name="web">Install web component</flag>
<flag name="R">Enable support for dev-lang/R</flag>
</use>
</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.0.ebuild,v 1.6 2014/11/03 13:58:24 titanofold Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-WANT_CMAKE="always"
-
-inherit eutils flag-o-matic java-pkg-opt-2 python qt4-r2 versionator toolchain-funcs cmake-utils
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org/"
-SRC_URI="
- http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
- examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R theora threads tk video_cards_nvidia X"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/libxml2:2
- media-libs/freetype
- media-libs/libpng
- media-libs/mesa
- media-libs/tiff
- sci-libs/hdf5
- sys-libs/zlib
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- cg? ( media-gfx/nvidia-cg-toolkit )
- examples? (
- dev-qt/qtcore:4[qt3support]
- dev-qt/qtgui:4[qt3support] )
- ffmpeg? ( virtual/ffmpeg )
- java? ( >=virtual/jre-1.5 )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- postgres? ( virtual/postgresql )
- python? ( dev-python/sip )
- qt4? (
- dev-qt/qtcore:4
- || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- python? ( dev-python/PyQt4 )
- )
- tk? ( dev-lang/tk )
- theora? ( media-libs/libtheora )
- tk? ( dev-lang/tk )
- video_cards_nvidia? ( media-video/nvidia-settings )
- R? ( dev-lang/R )"
-DEPEND="${RDEPEND}
- java? ( >=virtual/jdk-1.5 )
- boost? ( >=dev-libs/boost-1.40.0[mpi?] )
- dev-util/cmake"
-
-S="${WORKDIR}"/VTK
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.6.0-cg-path.patch
- "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
- "${FILESDIR}"/${PN}-5.8.0-R.patch
- "${FILESDIR}"/${PN}-5.6.0-odbc.patch
- "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
- "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
- )
-
-pkg_setup() {
- echo
- einfo "Please note that the VTK build occasionally fails when"
- einfo "using parallel make. Hence, if you experience a build"
- einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
- echo
-
- java-pkg-opt-2_pkg_setup
-
- use python && python_set_active_version 2
- append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
- -DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
- -DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIB_DIR=/$(get_libdir)/
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include"
- -DBUILD_TESTING=OFF
- -DBUILD_EXAMPLES=OFF
- -DVTK_USE_HYBRID=ON
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_RENDERING=ON)
-
- # use flag triggered options
- mycmakeargs+=(
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use java VTK_USE_JAVA)
- $(cmake-utils_use mpi VTK_USE_MPI)
- $(cmake-utils_use mysql VTK_USE_MYSQL)
- $(cmake-utils_use patented VTK_USE_PATENTED)
- $(cmake-utils_use postgres VTK_USE_POSTGRES)
- $(cmake-utils_use odbc VTK_USE_ODBC)
- $(cmake-utils_use qt4 VTK_USE_QT)
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
- $(cmake-utils_use tk VTK_USE_TK)
- $(cmake-utils_use threads VTK_USE_PARALLEL)
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
- $(cmake-utils_use X VTK_USE_X)
- $(cmake-utils_use X VTK_USE_GUISUPPORT)
- $(cmake-utils_use R VTK_USE_GNU_R)
- $(cmake-utils_use chemistry VTK_USE_CHEMISTRY)
- )
-
- use tk &&
- mycmakeargs+=(
- -DVTK_WRAP_TCL=ON
- -DVTK_WRAP_TK=ON
- -DVTK_TCL_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TCL_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DVTK_TK_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- )
-
- use theora &&
- mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
-
- # mpi needs the parallel framework
- if use mpi && use !threads; then
- mycmakeargs+=(-DVTK_USE_PARALLEL=ON)
- fi
-
- if use java; then
- mycmakeargs+=(
- -DVTK_WRAP_JAVA=ON
- -DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux
- )
-
- if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
- else
- mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
- fi
- fi
-
- if use python; then
- mycmakeargs+=(
- -DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
- -DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_WRAP_PYTHON=ON
- -DVTK_WRAP_PYTHON_SIP=ON
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
- -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DPYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
- fi
-
- if use qt4 ; then
- mycmakeargs+=(
- -DVTK_USE_GUISUPPORT=ON
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_OPENGL=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
- -DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake")
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # install docs
- dohtml "${S}"/README.html || die "Failed to install docs"
-
- # install Tcl docs
- docinto vtk_tcl
- dodoc "${S}"/Wrapping/Tcl/README || \
- die "Failed to install Tcl docs"
-
- # install examples
- if use examples; then
- insinto /usr/share/${PN}
- mv -v Examples examples
- doins -r examples || die
- mv -v "${WORKDIR}"/{VTKData,data} || die
- doins -r "${WORKDIR}"/data || die
- fi
-
- #install big docs
- if use doc; then
- cd "${WORKDIR}"/html
- rm -f *.md5 || die "Failed to remove superfluous hashes"
- einfo "Installing API docs. This may take some time."
- insinto "/usr/share/doc/${PF}/api-docs"
- doins -r ./* || die "Failed to install docs"
- fi
-
- # environment
- cat >> "${T}"/40${PN} <<- EOF
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
- VTKHOME=${EPREFIX}/usr
- EOF
- doenvd "${T}"/40${PN}
-}
-
-pkg_postinst() {
- if use patented; then
- ewarn "Using patented code in VTK may require a license."
- ewarn "For more information, please read:"
- ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp"
- fi
-
- if use python; then
- python_mod_optimize vtk
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup vtk
- fi
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.10 2014/11/03 13:58:24 titanofold Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-WANT_CMAKE="always"
-
-inherit eutils flag-o-matic java-pkg-opt-2 python qt4-r2 versionator toolchain-funcs cmake-utils
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org/"
-SRC_URI="
- http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
- examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R theora threads tk video_cards_nvidia X"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/libxml2:2
- media-libs/freetype
- media-libs/libpng
- media-libs/mesa
- media-libs/tiff
- sci-libs/hdf5
- sys-libs/zlib
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- cg? ( media-gfx/nvidia-cg-toolkit )
- examples? (
- dev-qt/qtcore:4[qt3support]
- dev-qt/qtgui:4[qt3support] )
- ffmpeg? ( virtual/ffmpeg )
- java? ( >=virtual/jre-1.5 )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- postgres? ( virtual/postgresql )
- python? ( dev-python/sip )
- qt4? (
- dev-qt/qtcore:4
- || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- dev-qt/qtwebkit:4
- python? ( dev-python/PyQt4 )
- )
- tk? ( dev-lang/tk )
- theora? ( media-libs/libtheora )
- tk? ( dev-lang/tk )
- video_cards_nvidia? ( media-video/nvidia-settings )
- R? ( dev-lang/R )"
-DEPEND="${RDEPEND}
- java? ( >=virtual/jdk-1.5 )
- boost? ( >=dev-libs/boost-1.40.0[mpi?] )
- dev-util/cmake"
-
-S="${WORKDIR}"/VTK${PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.6.0-cg-path.patch
- "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
- "${FILESDIR}"/${PN}-5.8.0-R.patch
- "${FILESDIR}"/${PN}-5.6.0-odbc.patch
- "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
- "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
- "${FILESDIR}"/${P}-tcl8.6.patch
- "${FILESDIR}"/${P}-ffmpeg-1.patch
- "${FILESDIR}"/${P}-libav-9.patch
- )
-
-pkg_setup() {
- echo
- einfo "Please note that the VTK build occasionally fails when"
- einfo "using parallel make. Hence, if you experience a build"
- einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
- echo
-
- java-pkg-opt-2_pkg_setup
-
- use python && python_set_active_version 2
- append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
- -DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
- -DCMAKE_SKIP_RPATH=YES
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIB_DIR=/$(get_libdir)/
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include"
- -DBUILD_TESTING=OFF
- -DBUILD_EXAMPLES=OFF
- -DVTK_USE_HYBRID=ON
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_RENDERING=ON)
-
- # use flag triggered options
- mycmakeargs+=(
- $(cmake-utils_use boost VTK_USE_BOOST)
- $(cmake-utils_use cg VTK_USE_CG_SHADERS)
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use java VTK_USE_JAVA)
- $(cmake-utils_use mpi VTK_USE_MPI)
- $(cmake-utils_use mysql VTK_USE_MYSQL)
- $(cmake-utils_use patented VTK_USE_PATENTED)
- $(cmake-utils_use postgres VTK_USE_POSTGRES)
- $(cmake-utils_use odbc VTK_USE_ODBC)
- $(cmake-utils_use qt4 VTK_USE_QT)
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
- $(cmake-utils_use tk VTK_USE_TK)
- $(cmake-utils_use threads VTK_USE_PARALLEL)
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
- $(cmake-utils_use X VTK_USE_X)
- $(cmake-utils_use X VTK_USE_GUISUPPORT)
- $(cmake-utils_use R VTK_USE_GNU_R)
- $(cmake-utils_use chemistry VTK_USE_CHEMISTRY)
- )
-
- use tk &&
- mycmakeargs+=(
- -DVTK_WRAP_TCL=ON
- -DVTK_WRAP_TK=ON
- -DVTK_TCL_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TCL_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- -DVTK_TK_INCLUDE_DIR="${EPREFIX}/usr/include"
- -DVTK_TK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
- )
-
- use theora &&
- mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
-
- # mpi needs the parallel framework
- if use mpi && use !threads; then
- mycmakeargs+=(-DVTK_USE_PARALLEL=ON)
- fi
-
- if use java; then
- mycmakeargs+=(
- -DVTK_WRAP_JAVA=ON
- -DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include
- -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux
- )
-
- if [ "${ARCH}" == "amd64" ]; then
- mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
- else
- mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
- fi
- fi
-
- if use python; then
- mycmakeargs+=(
- -DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
- -DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_WRAP_PYTHON=ON
- -DVTK_WRAP_PYTHON_SIP=ON
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
- -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DPYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
- fi
-
- if use qt4 ; then
- mycmakeargs+=(
- -DVTK_USE_GUISUPPORT=ON
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_OPENGL=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
- -DDESIRED_QT_VERSION=4
- -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
- -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake")
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # install docs
- dohtml "${S}"/README.html || die "Failed to install docs"
-
- # install Tcl docs
- docinto vtk_tcl
- dodoc "${S}"/Wrapping/Tcl/README || \
- die "Failed to install Tcl docs"
-
- # install examples
- if use examples; then
- insinto /usr/share/${PN}
- mv -v Examples examples
- doins -r examples || die
- mv -v "${WORKDIR}"/{VTKData${PV},data} || die
- doins -r "${WORKDIR}"/data || die
- fi
-
- #install big docs
- if use doc; then
- cd "${WORKDIR}"/html
- rm -f *.md5 || die "Failed to remove superfluous hashes"
- einfo "Installing API docs. This may take some time."
- insinto "/usr/share/doc/${PF}/api-docs"
- doins -r ./* || die "Failed to install docs"
- fi
-
- # environment
- cat >> "${T}"/40${PN} <<- EOF
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
- VTKHOME=${EPREFIX}/usr
- EOF
- doenvd "${T}"/40${PN}
-}
-
-pkg_postinst() {
- if use patented; then
- ewarn "Using patented code in VTK may require a license."
- ewarn "For more information, please read:"
- ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp"
- fi
-
- if use python; then
- python_mod_optimize vtk
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup vtk
- fi
-}
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.8 2014/11/03 13:58:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.9 2014/12/26 12:19:44 jlec Exp $
EAPI=5
media-libs/libtheora
media-libs/tiff
sci-libs/exodusii
- sci-libs/hdf5
+ sci-libs/hdf5:=
sci-libs/netcdf-cxx:3
sys-libs/zlib
virtual/jpeg
--- /dev/null
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.1 2014/12/26 12:19:44 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+CMAKE_MAKEFILE_GENERATOR=ninja
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="http://www.vtk.org/"
+SRC_URI="
+ http://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz
+ doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
+ test? (
+ http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+ http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+ )
+ "
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+ aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql
+ odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl
+ video_cards_nvidia views web R +X"
+
+REQUIRED_USE="
+ java? ( qt4 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tcl? ( rendering )
+ smp? ( ^^ ( kaapi tbb ) )
+ test? ( python )
+ tk? ( tcl )
+ web? ( python )
+ ^^ ( X aqua offscreen )
+ "
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/libxml2:2
+ >=media-libs/freetype-2.5.4
+ media-libs/libpng
+ media-libs/mesa
+ media-libs/libtheora
+ media-libs/tiff
+ sci-libs/exodusii
+ sci-libs/hdf5:=
+ sci-libs/netcdf-cxx:3
+ sys-libs/zlib
+ virtual/jpeg
+ virtual/opengl
+ >=x11-libs/gl2ps-1.3.8
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ boost? ( >=dev-libs/boost-1.40.0[mpi?] )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ examples? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ sci-libs/vtkdata
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ java? ( >=virtual/jre-1.5 )
+ kaapi? ( <sci-libs/xkaapi-3 )
+ mpi? ( virtual/mpi[cxx,romio] )
+ mysql? ( virtual/mysql )
+ odbc? ( dev-db/unixODBC )
+ offscreen? ( media-libs/mesa[osmesa] )
+ postgres? ( virtual/postgresql )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/sip[${PYTHON_USEDEP}]
+ )
+ qt4? (
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ python? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+ )
+ tbb? ( dev-cpp/tbb )
+ tcl? ( dev-lang/tcl )
+ tk? ( dev-lang/tk )
+ video_cards_nvidia? ( media-video/nvidia-settings )
+ web? (
+ ${WEBAPP_DEPEND}
+ python? (
+ dev-python/autobahn[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ )
+ )
+ R? ( dev-lang/R )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.5 )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-freetype.patch
+ "${FILESDIR}"/${P}-install.patch
+ "${FILESDIR}"/${P}-system.patch
+ "${FILESDIR}"/${P}-netcdf.patch
+ "${FILESDIR}"/${P}-web.patch
+ "${FILESDIR}"/${P}-glext.patch
+ )
+
+RESTRICT=test
+
+pkg_setup() {
+ use java && java-pkg-opt-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+ use web && webapp_pkg_setup
+
+ append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+}
+
+src_prepare() {
+ sed \
+ -e 's:libproj4:libproj:g' \
+ -e 's:lib_proj.h:lib_abi.h:g' \
+ -i CMake/FindLIBPROJ4.cmake || die
+
+ local x
+ # missing: alglib exodusII freerange ftgl jsoncpp libproj4 mrmpi verdict xdmf2
+ for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do
+ rm -r ThirdParty/${x}/vtk${x} || die
+ done
+ rm -r \
+ ThirdParty/AutobahnPython/autobahn \
+ ThirdParty/Twisted/twisted \
+ ThirdParty/ZopeInterface/zope \
+ || die
+
+ use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+ if use mpi; then
+ export CC=mpicc
+ export CXX=mpicxx
+ export FC=mpif90
+ export F90=mpif90
+ export F77=mpif77
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ # general configuration
+ local mycmakeargs=(
+ -Wno-dev
+# -DCMAKE_SKIP_RPATH=YES
+ -DVTK_DIR="${S}"
+ -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+ -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DVTK_CUSTOM_LIBRARY_SUFFIX=""
+ -DBUILD_SHARED_LIBS=ON
+ -DVTK_USE_SYSTEM_AUTOBAHN=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_FreeType=ON
+ -DVTK_USE_SYSTEM_GL2PS=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_LIBPROJ4=OFF
+# -DLIBPROJ4_DIR="${EPREFIX}/usr"
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_LibXml2=ON
+ -DVTK_USE_SYSTEM_NETCDF=ON
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_TWISTED=ON
+# -DVTK_USE_SYSTEM_XDMF2=ON
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DVTK_USE_SYSTEM_ZOPE=ON
+ -DVTK_USE_SYSTEM_LIBRARIES=ON
+ -DVTK_USE_GL2PS=ON
+ -DVTK_USE_LARGE_DATA=ON
+ -DVTK_USE_PARALLEL=ON
+ -DVTK_INSTALL_NO_DEVELOPMENT=ON
+ )
+
+ mycmakeargs+=(
+ -DVTK_EXTRA_COMPILER_WARNINGS=ON
+ -DVTK_Group_StandAlone=ON
+ )
+
+ mycmakeargs+=(
+ $(cmake-utils_use_build doc DOCUMENTATION)
+ $(cmake-utils_use_build examples EXAMPLES)
+ $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
+ $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
+ $(cmake-utils_use imaging VTK_Group_Imaging)
+ $(cmake-utils_use mpi VTK_Group_MPI)
+ $(cmake-utils_use qt4 VTK_Group_Qt)
+ $(cmake-utils_use rendering VTK_Group_Rendering)
+ $(cmake-utils_use tk VTK_Group_Tk)
+ $(cmake-utils_use views VTK_Group_Views)
+ $(cmake-utils_use web VTK_Group_Web)
+ $(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}")
+ $(cmake-utils_use java VTK_WRAP_JAVA)
+ $(cmake-utils_use python VTK_WRAP_PYTHON)
+ $(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
+ $(cmake-utils_use tcl VTK_WRAP_TCL)
+# -DVTK_BUILD_ALL_MODULES=ON
+ )
+
+ mycmakeargs+=(
+ $(cmake-utils_use boost VTK_USE_BOOST)
+ $(cmake-utils_use cg VTK_USE_CG_SHADERS)
+ $(cmake-utils_use odbc VTK_USE_ODBC)
+ $(cmake-utils_use offscreen VTK_USE_OFFSCREEN)
+ $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
+ $(cmake-utils_use smp vtkFiltersSMP)
+ $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
+ $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
+ $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR)
+ $(cmake-utils_use X VTK_USE_X)
+ )
+
+ # IO
+ mycmakeargs+=(
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+ $(cmake-utils_use gdal vtkIOGDAL)
+ $(cmake-utils_use json vtkIOGeoJSON)
+ )
+ # Apple stuff, does it really work?
+ mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )
+
+ if use examples || use test; then
+ mycmakeargs+=( -DBUILD_TESTING=ON )
+ fi
+
+ if use kaapi; then
+ mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
+ elif use tbb; then
+ mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
+ else
+ mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
+ fi
+
+ if use java; then
+# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm
+#
+# mycmakeargs+=(
+# -DJAVAC=${EPREFIX}/usr/bin/javac
+# -DJAVAC=$(java-config -c)
+# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
+# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include
+# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux
+# )
+#
+ if [ "${ARCH}" == "amd64" ]; then
+ mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" )
+ else
+ mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" )
+ fi
+ fi
+ if use python; then
+ mycmakeargs+=(
+ -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+ -DSIP_INCLUDE_DIR="$(python_get_includedir)"
+ -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+ -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}"
+ )
+ fi
+
+ if use qt4; then
+ mycmakeargs+=(
+ -DVTK_USE_QVTK=ON
+ -DVTK_USE_QVTK_OPENGL=ON
+ -DVTK_USE_QVTK_QTOPENGL=ON
+ -DQT_WRAP_CPP=ON
+ -DQT_WRAP_UI=ON
+ -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer
+ -DDESIRED_QT_VERSION=4
+ -DVTK_QT_VERSION=4
+ -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
+ -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+ -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
+ -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
+ )
+ fi
+
+ if use R; then
+ mycmakeargs+=(
+# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
+# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
+ -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
+ -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ local tcllib
+ ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die
+ for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
+ ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die
+ done
+ export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
+ local VIRTUALX_COMMAND="cmake-utils_src_test"
+# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java"
+# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365"
+ virtualmake
+}
+
+src_install() {
+ use web && webapp_src_preinst
+ # install docs
+ HTML_DOCS=( "${S}"/README.html )
+
+ cmake-utils_src_install
+
+ use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+ if use tcl; then
+ # install Tcl docs
+ docinto vtk_tcl
+ dodoc "${S}"/Wrapping/Tcl/README
+ fi
+
+ # install examples
+ if use examples; then
+ insinto /usr/share/${PN}
+ mv -v Examples examples || die
+ doins -r examples
+ fi
+
+ #install big docs
+ if use doc; then
+ cd "${WORKDIR}"/html || die
+ rm -f *.md5 || die "Failed to remove superfluous hashes"
+ einfo "Installing API docs. This may take some time."
+ docinto html
+ dodoc -r ./*
+ fi
+
+ # environment
+ cat >> "${T}"/40${PN} <<- EOF
+ VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+ VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+ VTKHOME=${EPREFIX}/usr
+ EOF
+ doenvd "${T}"/40${PN}
+
+ use web && webapp_src_install
+}
projects / gentoo.git / commitdiff