From 89c6c06b8c42107dd231687a1012354e7d3039fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Nov 2017 11:42:28 +0000 Subject: gentoo resync : 26.11.2017 --- media-gfx/meshlab/Manifest | 58 +++----- .../meshlab/files/1.3.2/01_crash-on-save.patch | 29 ---- media-gfx/meshlab/files/1.3.2/02_cstddef.patch | 46 ------ .../meshlab/files/1.3.2/03_disable-updates.patch | 21 --- media-gfx/meshlab/files/1.3.2/05_externals.patch | 25 ---- .../meshlab/files/1.3.2/06_format-security.patch | 44 ------ media-gfx/meshlab/files/1.3.2/07_gcc47.patch | 105 ------------- media-gfx/meshlab/files/1.3.2/08_lib3ds.patch | 32 ---- media-gfx/meshlab/files/1.3.2/09_libbz2.patch | 31 ---- media-gfx/meshlab/files/1.3.2/10_muparser.patch | 30 ---- media-gfx/meshlab/files/1.3.2/11_openctm.patch | 31 ---- media-gfx/meshlab/files/1.3.2/12_overflow.patch | 23 --- media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch | 21 --- media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch | 32 ---- media-gfx/meshlab/files/1.3.2/15_qhull.patch | 67 --------- media-gfx/meshlab/files/1.3.2/16_shadersdir.patch | 49 ------ .../meshlab/files/1.3.2/17_structuresynth.patch | 48 ------ media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch | 146 ------------------ .../files/1.3.2/19_CONFLICTS_IN_rpath.patch | 32 ---- media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch | 43 ------ media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch | 29 ---- media-gfx/meshlab/files/1.3.2/22_aliasing.patch | 43 ------ media-gfx/meshlab/files/1.3.3/gcc-4.7.patch | 12 -- media-gfx/meshlab/files/1.3.3/lapack.patch | 11 -- media-gfx/meshlab/files/1.3.3/meshrender.patch | 15 -- media-gfx/meshlab/files/1.3.3/mpir.patch | 10 -- media-gfx/meshlab/files/1.3.3/pluginmanager.patch | 14 -- media-gfx/meshlab/files/1.3.3/qt-4.8.patch | 11 -- media-gfx/meshlab/files/1.3.3/rfx.patch | 14 -- media-gfx/meshlab/files/1.3.3/rmmeshrender.patch | 15 -- media-gfx/meshlab/files/1.3.3/rpath.patch | 39 ----- media-gfx/meshlab/files/1.3.3/structuresynth.patch | 11 -- .../files/2016.12/0001-compile-server.patch | 22 +++ .../files/2016.12/0001-depend-on-system-glew.patch | 72 +++++++++ .../files/2016.12/0001-disable-edit-quality.patch | 25 ++++ .../files/2016.12/0001-disable-filter-layer.patch | 25 ++++ .../files/2016.12/0001-disable-filter-ssynth.patch | 25 ++++ .../2016.12/0001-remove-not-sane-plugins.patch | 25 ++++ .../0001-set-shader-and-texture-paths.patch | 164 +++++++++++++++++++++ .../0001-update-1.3.3-pluginmanager.patch.patch | 29 ++++ .../files/2016.12/0001-use-external-bzip.patch | 51 +++++++ .../files/2016.12/0001-use-external-glew.patch | 95 ++++++++++++ .../files/2016.12/0001-use-external-jhead.patch | 56 +++++++ .../files/2016.12/0001-use-external-lib3ds.patch | 48 ++++++ .../files/2016.12/0001-use-external-muParser.patch | 37 +++++ .../files/2016.12/0001-use-external-openctm.patch | 43 ++++++ .../files/2016.12/remove-edit_mutualcorrs.patch | 10 ++ .../meshlab/files/2016.12/remove-io_TXT.patch | 10 ++ media-gfx/meshlab/meshlab-1.3.2.ebuild | 83 ----------- media-gfx/meshlab/meshlab-1.3.3-r1.ebuild | 72 --------- media-gfx/meshlab/meshlab-2016.12.ebuild | 101 +++++++++++++ media-gfx/meshlab/metadata.xml | 10 +- 52 files changed, 863 insertions(+), 1277 deletions(-) delete mode 100644 media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/02_cstddef.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/03_disable-updates.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/05_externals.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/06_format-security.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/07_gcc47.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/08_lib3ds.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/09_libbz2.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/10_muparser.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/11_openctm.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/12_overflow.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/15_qhull.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/16_shadersdir.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/17_structuresynth.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch delete mode 100644 media-gfx/meshlab/files/1.3.2/22_aliasing.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/gcc-4.7.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/lapack.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/meshrender.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/mpir.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/pluginmanager.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/qt-4.8.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/rfx.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/rmmeshrender.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/rpath.patch delete mode 100644 media-gfx/meshlab/files/1.3.3/structuresynth.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-compile-server.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch create mode 100644 media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch create mode 100644 media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch create mode 100644 media-gfx/meshlab/files/2016.12/remove-io_TXT.patch delete mode 100644 media-gfx/meshlab/meshlab-1.3.2.ebuild delete mode 100644 media-gfx/meshlab/meshlab-1.3.3-r1.ebuild create mode 100644 media-gfx/meshlab/meshlab-2016.12.ebuild (limited to 'media-gfx/meshlab') diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index ebe78c9c3b3f..5f7c56b158bf 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -1,38 +1,20 @@ -AUX 1.3.2/01_crash-on-save.patch 1150 SHA256 c7ed4f43b01ee8d6bdfb46760f776de112fc61e19e51c1057f771fd3dfb1717d SHA512 b6c6f06584ab5c43bcfef3b697fc1b3dcc6ee6e2ac7f15cdd3ac1a71af356e56299a78353f6a1c6bc8e19cde60b78a82980ae25abd87eb0a467a3fe4f1d769e6 WHIRLPOOL 89e0c7aa254a23074318210e9b08a53ddc8df6f28565d82dc1522e839b4065be7c5319e118f128a9be14c4945f40711216a72839d5165d75c39e8a304b8c63f1 -AUX 1.3.2/02_cstddef.patch 1549 SHA256 067ec2879cc5dc2ffb0870e3bc91ad285851ce370a586a1767b6665b086e40dd SHA512 4b4eb9ddb444f6c69a8dd817a2312329d9ee5d5b272ea8e7f310fd7c1f7e8cc22978e632016a27784c3456c3fe4a7ad753784c04b9c0e6f544eddc26e497da85 WHIRLPOOL 15225c6f3b33b9543493de32bfdef77baf503755eedcf21074885345d70c04fcacee548cde9a5a77658ccaa6d086f12250214ca3023474f0c5c8c7020b607a33 -AUX 1.3.2/03_disable-updates.patch 876 SHA256 cf6cc9bc8af61c160eca07a413292447e87877d3428f11e95f0739fbaf79fdfa SHA512 cb198c08ccfc1602f3922131fad385b7b6568733885e2df64cf404aa199d12b9a3a75f21d7e8972a330eb0ed8697a5bdb6af1aa78311563e8afe23f53bb223b2 WHIRLPOOL 7bc10dd2cff94d201652afbad341c6cf792c3919b584d264359f1ee8af4bbaa22ff34287ee45e28d5baa05fb28e26619a7c74bd1d71db1ccd91007cfbc634e7c -AUX 1.3.2/05_externals.patch 966 SHA256 9d96b76a93bb94caf57292fbbccdf7c67fc0ae2542bf47e7c4aca59ea615414f SHA512 9053bc7b7c37fd826ee00e4b3f6f49c429e2afd2e4017a56aa361845463033acdfacdea5a4510f48353390d44bab6eb49cc23214cf5c3323458c01772b3e1817 WHIRLPOOL d42fee28cde1894798523b32e16f67ccfcc50f58fec8dff9182b04b501b8039d69506188cf433c98550a6fd8a4cca72b852911ed4c77628f728e2b1c69b24b0b -AUX 1.3.2/06_format-security.patch 2399 SHA256 4567170ca15eef7b0ebf3660bb13757315e8d47b18c035a732dd61813beb7268 SHA512 637027b9f0080c0ea5c290816bc9b81cb07f12f8f052863ce6bd599ef8422f5403dd33086439cdddf3ae265f15fcdae1b7e7e157074f9396f369b019f69fe4d7 WHIRLPOOL 70e74dbb85864786a09eba994d06e37602aed8f8bf8396f63732c38a72f55573ed357f4ddb98abd5016845c85265c92780795fcfe0c88accf06b9fba99dd0277 -AUX 1.3.2/07_gcc47.patch 3697 SHA256 4cfd458ded80322acdbf5e763234700eec70a0e43a4e025568d64fcb7cd0dad3 SHA512 1dd5fbaf612ecbd01414ce1ca9ae52a6138a9a2f4ba8ec9a1f91e7613bb621628976931e0911467c9f06bb419cc780dec319f5cde7ce6a3945769985fba2a37a WHIRLPOOL 692967f20c666732192e0ec00c98092642b267733dd494524b5d85b19d012e92a0a3792e665d11a6f1e554b4d73393a6f9aa9477b21c9393c9e58efbd9db20dc -AUX 1.3.2/08_lib3ds.patch 1350 SHA256 ad8c118ae0da7cea33c75e9ac0b4406e19d6789532b085ea32b2deeea0344758 SHA512 0c1f87e5ba9c5ad5861c4a1b9fbd9d662c306f1704a56f277e37f0ca1322a5faa8e7c36a4f91860ffaf3e0fce8526c06ffcb6adbd17aed264ca673fb642faa5e WHIRLPOOL eb41816d0a77b5060d35916113182e9937403a36ec08b240bfcff028859bd02386eea1c6bd5d663d40af30813976cb20401846c81b1efd50bbbf586e91c556cd -AUX 1.3.2/09_libbz2.patch 1425 SHA256 e206583d558bc064e8632c58f757f08911d04692af1bf1e8135316476aabbafa SHA512 75d23a84619e52c527629855d5a158f7feed7b2fec0b9d2659eb3c8d741a8029502c6a62c9b8b7f4903fbb77c6270261d63100251be72e0c500b237673f42852 WHIRLPOOL 8a22b24c9b78c2f958224f6e559eec2ddb31768ae5811f330060ca374f42c85d4ac7c89ac5a7b1c42e3998ceb153c5fb72849b92687de0009659700d1d240ff3 -AUX 1.3.2/10_muparser.patch 1432 SHA256 34c6df0cd94ae21eccfe62861703d7b6e3ffc7483aa5b5780253780559d0e9a3 SHA512 5e7a498f4d4dd661084ed06abf11adc32c00c04af1ec21775dbd899888cf647c7875831ca6284580e2bc58586e2e38b8c74befcb982b7e1b64a86661470529ef WHIRLPOOL ca0b21ba8b41de39d0b5f451f4159101617ac9a6f3f8ab4587d357893ca2be6982f353877aa23addd38a2f6f253404bd0f4c4ac24e99b83935931b3aa071919e -AUX 1.3.2/11_openctm.patch 1414 SHA256 ca4a57a6a281c020d3b029edbde88289f7fd17c832f709c10b83e4d9cb7630d1 SHA512 9f2adba65f5308734ee0c510db4aa0dc63c0c6084709d787a8aba6394019de7aa96a3bd102c580e9bd827b6eb60f48f50f573f653521b5ee515e72180509c071 WHIRLPOOL 1b7104ad59d2472c299f59a306cf57699012f5aee7172439df1897e9af839cf3b24e4f2fd6109d138ee537e96ebc6789b818f624cb15de454b6203e30b26cd51 -AUX 1.3.2/12_overflow.patch 860 SHA256 909e015b1b4b56502d23971a68bc828631589eff54c1cc7ca023167aad0894f6 SHA512 841141c015161988df188ca25f99d695fe0c22850cd69dbb4956f4ee9c9950172554addf249f79e111dbee212a7ec09d5d8f7bf68cd9289c6781ddbf7659e4af WHIRLPOOL 1078424dd60794169001ce74e85bc27856b96a987b4b73698e8c0042ee27e4b501d34543ab7d56cc69450bcb3188a7e5b1d6d0f4d0a4a249050717e730230f83 -AUX 1.3.2/13_pluginsdir.patch 927 SHA256 e5667d3f901a7f67e1897c9d8803292c0f1f92563748106e52b1c7e589caa7c9 SHA512 85bbc68b6d95168c0936ddc9bf602b8c3c8a9c7d8f5aaa449cc540c891ab90dc57d5ea3d8e10697242442f6dc587c4d9ad45c5c5e59f07fd800c8f291fde7598 WHIRLPOOL b12f350f1d02f2d3b251e104cf8a0b60f4aad3f8bf3beb40b2980ca32e5e87bd58a1f9bb78c48d74f043728c6852f5eeafa033fa59af265822fb8a1186814675 -AUX 1.3.2/14_ply_numeric.patch 881 SHA256 a1ec3e4cfe7b7a355793ca854da9a123870fa92e8f1b3cc72805dba7ff6f95c7 SHA512 88266fa82a343d70b7469fa4399abd0859c34c43de4d222d01118d9482fca4e5ffdfb2d8b10add238d36a5a3084273515284ab9e8a9bd855c2eadd069a7fbf90 WHIRLPOOL afc4fa1ecfc2c3e7951239f5d1eef54e4d1ca874ae41c0af7f6045f48ef6fc122db45c8bccaaa1e472cdbd09731d1334d44dc7c0b5a4308482dd6a9f9eaa9936 -AUX 1.3.2/15_qhull.patch 2749 SHA256 66302dd3daeae64aaf01035998439fa79f56a09878679100ef208f9e471a64df SHA512 25966ab73a8719e28e201ad998749ca891f4256163aeef0d9d23a9699b4299a757959c00fe5930e8f5bf713713c215c58944af65a9d48a7428d25c480096c3df WHIRLPOOL 91beddb020d6c539eef565589911433c6dba7a20d8339b032fc8d17d4ce6cbeb4d801f3a767ec685f48ffc3a47b7176f4ac7969b98a9dd7db63ac67e98ba018d -AUX 1.3.2/16_shadersdir.patch 2311 SHA256 86bbc4f68de902ebbcbee808228ca9363262fbfbfa2a7dd9dde8015290268f19 SHA512 20c67f2eb4770427e648d7d69ac06cfd90b06eeb050d1fe1fac1068d7a84a0c9f378ffd5ca5d743dfb7385edee67ee5b98f569ea4d8e0109d8054dd36d6283e9 WHIRLPOOL 273ee08e4a5d0a86c2852e5872c0e0443dd857e4a96861444522a04ffe39b18edb197ead699478a303228d1d03f0e43abad1c42e69ca53aa4032d358282b5368 -AUX 1.3.2/17_structuresynth.patch 2229 SHA256 e9e7094c0a2684a7f06a5790f1ea7bfcd8caa95cfff03efa15826d3a55586c5a SHA512 03b2bebf3c70a064f380d3ccabdbd19b2c5a30d08a539d5025894560c1b31849feb295f14b8fb2bf75eb95cc21727eb9375acf96b74e40ea57d692648460dfd1 WHIRLPOOL defc27201696639d1133303c0d4aa83334a9de989e2bf71458f78ba02840aec03facec5866635be84161b22ab6ea3d683d7070e5b87e4539deb2507e8ab54c4e -AUX 1.3.2/18_glew.c18p1.patch 5725 SHA256 5508284f5d30fb6ec9996fb2f4bd86a7839b048c2c3870f9db493afcfb57be9f SHA512 0986165ce47459c324d47a2c9081da9f09e3700bcb1d942fe0e82766fc5da61f716a1553c50d0c1f612417da95c7cc794416d75fb82f077b9cde35aa28344926 WHIRLPOOL 283dcc42401d49b5fa53c2eb0d3ba6707a3acf7319b5774ad35172beb5a70e8f398caf4540d21c6464b377a2f18982a5723f90f12a2b83343e786bc2fce13217 -AUX 1.3.2/19_CONFLICTS_IN_rpath.patch 1375 SHA256 630ddac55bfc24a8814584068e0023d3cf9884f476440eace189927a7e07586c SHA512 d1a33986ecf7d55fe762094dd57dd91bd1515b19964215cf041741269f7fb32fa903fe3b2fff42262fa731a98b5014d73818cb934ff9035f3b09726476dded9c WHIRLPOOL 37ebf686faf7297948bf086c5a13ed52cfa44ddb27e5ded6437da4d60d88e365f7f1ecb12223ec92890720cbb1929bc1f739bc960544e9efc98e1659832e08b5 -AUX 1.3.2/20_rpath.c18p2.patch 2016 SHA256 9aae726a619614a9f8a2e42a8c6c4d8e249e6d4169ca8b588556b3ab122f6d9a SHA512 99059d13898293fe499669e200f594cf824c2eaad728806a12e906cb97079cd8de80c494da1ff5f73aaeb4756366d8b6c0f404f8e98bfee68c012a4a2fccfb4e WHIRLPOOL 19d35f80d228489a79e7839eb8927fea963013449a7ae3722a012661acd1513576559ec342c8636a2fd7de3ac45eb5bdfd55f02559f444cf973f24eaad1769ef -AUX 1.3.2/21_RESOLUTION.patch 1444 SHA256 36820b39371ee6938219f28e3005f5d7d39d0bc6230a01bebacc4e67f15e6efc SHA512 3742e3999e5c3842d831dc4742b40ea4659a0c6b036af81047d52c8234b4854ab147c76b795adde6ec52397d46f22a00017bf85079633aacd14ae1f711f6669f WHIRLPOOL 0820a94a01d0933cddc993c3a8a63bdd5029ae2e670cd69ff7b885f046f47ad386f262f539dde522dac307605572b896504d04e39cfd3f754be0ef84e7681efd -AUX 1.3.2/22_aliasing.patch 1960 SHA256 576544a1c3646cbd9974ee30f71d18ae3775d3b1c5a3725818c000fa40963200 SHA512 5007163025f34e5f399e22843711d730b1e46612d9553e29bea46d575a4bdcb0663e978ebaa936e9213b210e9b99dd8ed30d3b40c212e7505f46da3ed45af8ed WHIRLPOOL df8bdad9c4641180765344862e4a4938f6812b7e788307c1db7e48eba10caa50e5e8b4e9574f686731b47dff5e5d03fabdfd66802d8eec6575118ef630fe309c -AUX 1.3.3/gcc-4.7.patch 362 SHA256 b219f77569dbab29c16f407c4e9d041035bc72caf0b720262564f35901efbb61 SHA512 c88ecf462ca413862803d1b3d825a550965837bccde3b7eea323435e72c6ca1e29a50d49c5de6b0e0e2ba2c0fe38237cad2cf227cbccc905cef3586d337f18c3 WHIRLPOOL 59bfb464fd839480f9e24bf98ebea61609c6f00db558adccd486b25b328bacf6895cd7d03f2343aeb1322552be4c580db6a91235def0ce85255327a9d33e06cb -AUX 1.3.3/lapack.patch 641 SHA256 f1741c2ccd5dc74ae1b5fe9420a4592b9da7cceac5449327931867a809930261 SHA512 bd389631fcd9054b2dfaebdb75226969c76966e437c88a31b81d4cd7471944a82c9a253adfef7b59c10de99c3df272dd66dd0c87537025eaf8e2cd41905110f1 WHIRLPOOL d3d2fddfe124ff664a32bc1c647062276269dae7fac376a47f5f85842424949ca1f07796d068bbefa5b346daa361ecd19074a8b1d74cb81e6a73551d4d2da92c -AUX 1.3.3/meshrender.patch 621 SHA256 f4fd274aa6f697b8ad8a9afcb61093122fc723c38c491de215c226c82f83dd03 SHA512 8ab45a9334d276da350d0fb16457de3bc95da21049632f148f2f6ebf36f17bda52f620fdcf753fb74a4d1a416c8dedaf166bd8418750798305a3dacbb93c2299 WHIRLPOOL ca4e27e95f75836295f7f4a6544107cfaf64c379c06186975bc3eb8c047fe0b6082059f7538ed990da33a2225939db3ace5ba40cb803450794bc2d4be894219d -AUX 1.3.3/mpir.patch 838 SHA256 fccd3ca9e73a5b8d5748181f57defef6ec683a9124889dffec3f21f87578018a SHA512 704bbe4e1799c47f0f7d40f64b5d5f87b58a070f310c8f8fabe223a6dda95aab022807f3bedc21a6ee520a7d67ed8a336b17001575cc3f15bc7fb0d95c12a014 WHIRLPOOL e78e550fef5b90087b1b841c0e247bc8af1cc9f361c8032ab587c4eff82d9f51daa674eae4cc540491bcb51ba45bed62cfc4f3804b13c03c9e0323f74b04997f -AUX 1.3.3/pluginmanager.patch 387 SHA256 edf619197c014b866261acde9d9d9a8832a0f8f8e0d4a34e58c03638232eeb01 SHA512 e3263ef64e51c84609ae2aeb2687b80cc2e8f053fb61e6c0d965c64fa1e6e1425788a114d2c76388339650c82c486388816be5cab76e819c99187ed2737bb9c3 WHIRLPOOL 1c41ae701429c962e99df8d392a4dca9b105eb6894e54798dea0f9c388f267a0e7db2b28cd7e450309448c48f99b0a9b551534c1d2d21244c784641236f9acac -AUX 1.3.3/qt-4.8.patch 375 SHA256 cab2ae812a53aee27a854d1e7b8a157ae4cb85f5421c70f64b6c37e38b577a79 SHA512 4777e972562918957398f7551d652231f44d124029687908fb4a38e48fda71fd006e5755159b11b4dbf75ecad42229f5fdef260a750cd8b05aec6da4582cc2c9 WHIRLPOOL b68b2c2463e51b75028520d6520494c8abe683c2282abac1ae5597faaa913073e1cd452129d092f979f0c084853bcbc9ae8960d8497ffc1ab8ef452bc9256694 -AUX 1.3.3/rfx.patch 450 SHA256 4d2da71d175b15ed15e53d3f5c6af5f83b5bae624acedd32f98a4780d290cf02 SHA512 3af2b5e445148154210fd978b0805dae27fb82ccf5ff110731d74f614cba2a5f0d2b0cd6b9a0bc2d18ab6c29c5b1749891e107afdd86148ffcaaa53aef885a76 WHIRLPOOL e49eb1fce6dae3d01c2f6cb9a206ab3d35c0e67ec1172917d68af390ba20d2c37adc89ea44aa4e553fcafbe2fc850d65bcff2b15028ce11fe0fe8f29a072f9f7 -AUX 1.3.3/rmmeshrender.patch 535 SHA256 9542de2e66abae5b6d8fed93785ee9dbc70165be81f7aaffcf81663181c94406 SHA512 29df3a2df50a07706dc83ac185935bb8cc41f4bc565f2d23f8c97f7d4dc29a6877b3fcf554c57f6441c8babce6e67f815f6928b10f24aacf9ec7472e17fa08ad WHIRLPOOL 5829353482153cd666f376dc4b1cebb07bc327fb6f6acf5e13145ebcbe8604d4711ad1af041c0b1f20e59cc1db2503f4b587c3816f6c72f0722934996e0d19f6 -AUX 1.3.3/rpath.patch 2164 SHA256 dd5450c2b869be82941b1ac86ec271ce94885916ed4f2ec0ef37660c7e407111 SHA512 90d6829ba1ecd38afde7e06d5a4c034823c9dcc0b139764effab7ff834160d7f18f719bb83ea42aa621fc7f6e6987acb2ecbd88568cf598ac6bb0a384bdddade WHIRLPOOL e0a7ae9f2080854600add69b06adb428e5b76ebbc908178f520f19d9575c91d29a09cdc1b63ff50ae1120e8d1eee7fe3a69d17e8e125a4842aed4cb0b2beda77 -AUX 1.3.3/structuresynth.patch 466 SHA256 39c3842212df89b623eeb06bf3dbc75124a25091adbd0e8f2474be350af57e17 SHA512 d1803aa87a7751d307143c4155e4ed06ec6e5896c0d359aa42690bce947c5502e24fcdfde5c479520f5288416d299bf97fe21d28e9721c446dd41bea42f0c76c WHIRLPOOL e0e5d165fdf014cb7f901c8bd170607986a9a2086ac11d82d0d1d2f8863b6ded7a83e62d8d34f5511f9accf63f3589b46764e8920314b6bc0a1a15110ba722ef -DIST MeshLabSrc_AllInc_v132.tgz 12874196 SHA256 d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1 SHA512 40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac WHIRLPOOL aa6da94a8d5b9d28c9b787fe307774b7223e57278ed45c3bf1a823da9f5a9b59fd058a466f3f4dea3c4c57e3934b0aed88b1446f20e746349881c1bc965fec36 -DIST MeshLabSrc_AllInc_v133.tgz 13390531 SHA256 c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f SHA512 ec155292be10ebe17a7d41b26d51cce88e1f00b692b8adb29462a2c3cb15444c6f27067a3396e4427cd694c82424910ba80f32f536b5f5d46d6765b2461cef43 WHIRLPOOL f1f938e7eb8d648f2a8ac4399420d947efe403f19cc163b4a4e28f8cf620ae5aa22d17503e3b5ca7920996e78dfbb41dbd89447d61bd95e4a2f69420f2196d5d -EBUILD meshlab-1.3.2.ebuild 2395 SHA256 de3b2b495c5015eec67e4a6a790041bf90afbe411d75f19f54e857f7cdbba22c SHA512 5cfa4650ddf7cf92386f777cadd7c7882244e1112e8869142e3f2ed6aaee0430041cace5c5bf7c68f1328a2d5f095c9d7b0e1257f14a4b0f4ce25df8c2d215c9 WHIRLPOOL 252d24ef502071428d28b6e5b7a730eda26bd9cc7c896f495af9eb79e12ed9a7d4f4cc2eadc374d7c9d774730318b9022575224c79994382146d586c7a8a91a8 -EBUILD meshlab-1.3.3-r1.ebuild 1745 SHA256 efbeb38acf5b788f5af938d0be530702c4a68c210a1f1bcc70abbcbd3d8d468c SHA512 c78ddfdf5c3e0f241f5f1d320d4cc7e6c37c7bf644785c475e153b8672d76f007ffcabedac0dd72b71e4f50d69789be9a817acd285931cd9880a2971f95d4150 WHIRLPOOL 4ff3ea3ca0a99a0e7545992369e3a5cf4ce1413ad14f3006ed9784ce4320a11671f50eb35fefe67d23604613c047c82dc7a3966fea0f27441afa10e94db8949c -MISC ChangeLog 3783 SHA256 1d36af659939335344dae2e4aeaca4b87d4d5ee7288753857b60f218b0c8adca SHA512 151973fc700b27b93ea3ae10f9824d47da8bd5f6bca4e4dd9aa4c5ff25d2d89a00e9173572ab96a4f7bf4b6d07733b29b65efaebfc62c764e762f1e7d1844ace WHIRLPOOL 842be24ce377e33f67adb88692a732b59f74a5d6d5d738c95e8fde59e56c632499bcb95dcf3dba805eea0a407480df88f392c3174135fc6c522980759c60a018 -MISC ChangeLog-2015 1597 SHA256 7e921c4aa3d6bd7c61dea5800622d224faa1ae67e5b18abac7a1b74009b0f500 SHA512 a19bc943083f7972561dab6a4595d763fa575d682bc6d44fefad9b88c70a7c2a38bd1be1ca2c03d821b8c8868eb651670cb30b6965eaa21d92d2cfcb9f065a02 WHIRLPOOL d14a020f74a2e103b231c95187052e3199f0aa7fef82bc5b7d98fe33c22a807b0362083cc8f87f4d002cd6652ce47683a255d6c3a9571162c0b3ad57efa90cac -MISC metadata.xml 724 SHA256 c66f7fadaaa5e0684af9008b1c528bb8aa33e8c73d494a08308770599f0758f1 SHA512 ed0fed872c4aa476f346f089a3a80640ad78924d9577a4ec7e58e666022bce1c6f4943bc08a4afcb0b46603d0c69d1fd8ae7a8dbbba7b5927aabfd6344c66916 WHIRLPOOL 7b7b70c91856ac7a5e47b91ca376ef751a623ccb6ccc047d151179a3bd93f0fdadf9e9c5aa488633dd8341052bbb27a3b8469c9f001682c40f1fb250869d1f7a +AUX 2016.12/0001-compile-server.patch 658 BLAKE2B 22d470db842e5da0c8419b22f67c5c31ef79613bde7f0cb30958ab96196217120aced6d76bb45a4e59fad89c93ef0fddc322ba7612a27585f659f4c94ad91a1f SHA512 32eba22818686094a070142314e3aa3efabc6615032927d6c4420c6698dd38a783d7be54548ac9f4e0d415f3d07bba0d8fb231284f2e9afca9e644007551782e +AUX 2016.12/0001-depend-on-system-glew.patch 1935 BLAKE2B 3f30cb756749e727c43b049eed4febd4165ebf2be4447252aeb692dcac621996249dfbe83718a92a008defae5258c8606baa1c1146397a823c630ad9ea30699a SHA512 32cd48eb927f8674ab887f2fdf37fee2464e8a9e03a738e7c045bea789c9ae6afcb53f764e621976baf551bac713810110e4e62d4bcb184603000f1cd263b8df +AUX 2016.12/0001-disable-edit-quality.patch 821 BLAKE2B b181a297c37b6de9a7054337b644f36131ccec10edbd00b27e7853b126745e14fb06d2052c2ab01fc0d428e3e77324ce7b4444c6b69343804ea87222a711d19a SHA512 9a2a5976e41823b9ddc8524044ef9d2dfd1779e0a1545513d638c897a4ab396e0ba5a72e9a457ccab6a107f1d77e5fdff768da4e897b6bcc90efc542c007b3d2 +AUX 2016.12/0001-disable-filter-layer.patch 886 BLAKE2B c29b6810474bddadad766170dd93bd633f448a11cc769ef42f0a628d776649f43a7ef74fb52d5ce42ad3030c52fe37892f12e5c0e6c617ab246dc95c447ef1b9 SHA512 74a0d2f0d66100b2db28804ca2bb67a07258b62e72a3d1475a0d4194f04149abe9a059726ea623176d365065e767a60c31b226462ef362993be34c2e9df9da17 +AUX 2016.12/0001-disable-filter-ssynth.patch 869 BLAKE2B 0c432b59f1fcc13f7e916b2177b6cf8ef0748d806b99f26d648ce5125ed39986c88a10490b01ae978ad7f7e12779108ed7df8f391977ca50b6a095c5271d865b SHA512 cd455c67827521b0530219d32aa3b26fa3ff6edc7badd5064d89f2b447ce1ce04e77c50fb3fb7f603566edf167c9adc8e092e21b452629d3636f321ac2727dba +AUX 2016.12/0001-remove-not-sane-plugins.patch 846 BLAKE2B 934aa2fe9cec6104070b809971f658f3576d1382913430d25b89d4c1accc1914c123bd524ea45e7ecc97a0970008c4f2ed286fc8b4a16d1214465cfd81710daf SHA512 3b9363bd24a708370154b493a71953a9190e1f1faf882a2a89b212638acbd638f5b8d50d025a25bbcbfbf3575a0bf8314040788e73f8cd2f953beef6c35d057e +AUX 2016.12/0001-set-shader-and-texture-paths.patch 6868 BLAKE2B 29c777601773ca6d87351b7bd5b35bdf1f96a387578b18302140838b3180e27242b92774e206832a6a79d26ae0f95e07f480d7f530f44ae9725515c6f65130d1 SHA512 17f6fe9148d8494055480cdd8022e2f1a90b770e80ad18ba09c8c7b4abe928be6084d50f1ecfc387fdd2061efd99e386c2730929e226afc901dc811a9424b574 +AUX 2016.12/0001-update-1.3.3-pluginmanager.patch.patch 871 BLAKE2B 1368a754f9901d7cbe772817202b5dd262b9202a73a923b9b1e8c9df7fd7098cf039263207a4bd7e9ae4216b0ec086e58b008aaf7f4d2e10e729da4aebc19432 SHA512 7cc66ba6e399fa9bb0539dc72916abec882266119f41ffa3574b48aaf152bb289efa8cea1d6cd79bc1a194d5b1a72737860f0faf07d0f0a04a4e628c5a370181 +AUX 2016.12/0001-use-external-bzip.patch 2149 BLAKE2B bc0940c07fbb2f9fe05cf6daf0e6471f268241a41d4bc77c172b3cd6a3c1d85426b4d2f47a411d83a578a6717acc69bd3f6a41f4f3bed042fdb498d80642eecc SHA512 194bd427c62b29e9004505a5de79632de9135458295c64088dbdb4608d105a52449560b5d02c975bf2258009bda1422948128370e2fdd0f66dcd009c744e5729 +AUX 2016.12/0001-use-external-glew.patch 3530 BLAKE2B 8b7c4203ddb96150b869393dc60ca7ee59e4fd9b7f717c30bcb0574d230df78d6ea93ebb4bb6e74eedef16911dc1aa670dca2dfd9d3258cda2c7211fe3af4481 SHA512 a2a032d249062b342a3875f90f2e3d55e10f75fe2dd22e7ffdb6785c738c4ed1ebaa42787cdf33f886bd9309e2c25faa77ce2137ff1a40f8519b3a0abaec04f1 +AUX 2016.12/0001-use-external-jhead.patch 1405 BLAKE2B 6e0560dc807065bf635612ce8ba2e502689190127aa1980c494ebc71313887dea5481ffdf57d87792bdba5952e2b7a46c219500c26b8912b3b8d1ead31d1c7d1 SHA512 5b10fb613625ee9c0d63965b20b64841d7626211738b4a4dbdeed00d63dae62ad1c046df934e39fd8800dd0f03a6c85e80f4eedc2bcd843889dc1b4f3ea4834a +AUX 2016.12/0001-use-external-lib3ds.patch 1728 BLAKE2B 143e7b64c6a6d859cebab4c4da348b1eaa655d065d42d50edd7e0830f597cefcff004355f81be6b483ee379af6a7c84c26f6d44149e8cfa2192a602c6fbcd7af SHA512 5c5f7c2153912239faf103dd6b54fe0056a1471c825c19ba3a174f336c0c744fa384ae21615e8e38543ef2a85bbfd8e5f9c0e3d5b8c974086ae6ca745b584d98 +AUX 2016.12/0001-use-external-muParser.patch 1574 BLAKE2B 0114f8b5f45c93117dda73f16c6f81f6ee21e81fcc995504e772f5ccd1d8ef0659f4e6458921d4b3434b6be6f56636c573921dfa47c302e0989ab6f4fb0465ef SHA512 ecf91a15b4ea3f50ddc927cc259ad57a063e7aab0b034d2228decb797117763fc78760a217321e949e0a783caefed99a2a3a8b4e756e42b0d6941fc04395f292 +AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d54386948deb161ee8459750e1fe551e79295c56f93eb7d7e678533e0077a071ea4bc95362dec89d02d20c75b943d188ce457b83ca6e9 SHA512 48532da795602ac867bade00e6a649758f7c6d0c26412c8a4486e23239d3d55220ba22ea5b9ca5e11f97ea224626ebb95bbf89cbb707876575a11be891aabcaa +AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9 +AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a +DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8 +DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 +EBUILD meshlab-2016.12.ebuild 3321 BLAKE2B 1ac52882b29a8d2e911f4d74ea4d2346a2daf9ec8919f3d0b5cda75efa2165e3ddcff73dc44a6cfaaf360e18f2c5096e99cad4606db99a5c84f9de6bfdcca919 SHA512 58e7e67ced488d844fac1823a4ce4dce1cb7025ea3b07c4c02502e501a8aa4fe9dd276ad13c5e4561e89869519aa676b73a665f74aac754fd2d423a2d5026e71 +MISC metadata.xml 725 BLAKE2B fd41657316f1191399d69e33dbb22f7c41db87d470e954c6cf51389073a696b5b3379b4cefdf93ea50191cf41297d6b2747fcdf4193ba947f0f09822458cd0cd SHA512 258ab0d2d585eddccba320f327624e2cb8daaf387512bb221cab8bf535b1e23c35009ab9452111ad1f923d442d876370c5f3e13b40f845df97aa3c00ce11fcce diff --git a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch b/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch deleted file mode 100644 index 84c5ced8dc6a..000000000000 --- a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Teemu Ikonen -Subject: Fix crash on project save (closes: #718583) -Git-Branch: p/crash-on-save -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..cfc9473d1fa0e565d0aad4994fbb31 - -Patch from upstream SVN commit [r6114]. - - meshlab/src/meshlab/mainwindow_RunTime.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/meshlab/src/meshlab/mainwindow_RunTime.cpp b/meshlab/src/meshlab/mainwindow_RunTime.cpp -index 8f5057c..3273cec 100644 ---- a/meshlab/src/meshlab/mainwindow_RunTime.cpp -+++ b/meshlab/src/meshlab/mainwindow_RunTime.cpp -@@ -1575,8 +1575,12 @@ void MainWindow::saveProject() - - /*********WARNING!!!!!! CHANGE IT!!! ALSO IN THE OPENPROJECT FUNCTION********/ - meshDoc()->setDocLabel(fileName); -- mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel()); -- layerDialog->setWindowTitle(meshDoc()->docLabel()); -+ QMdiSubWindow* sub = mdiarea->currentSubWindow(); -+ if (sub != NULL) -+ { -+ sub->setWindowTitle(meshDoc()->docLabel()); -+ layerDialog->setWindowTitle(meshDoc()->docLabel()); -+ } - /****************************************************************************/ - - diff --git a/media-gfx/meshlab/files/1.3.2/02_cstddef.patch b/media-gfx/meshlab/files/1.3.2/02_cstddef.patch deleted file mode 100644 index 903b0c77b547..000000000000 --- a/media-gfx/meshlab/files/1.3.2/02_cstddef.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Teemu Ikonen -Subject: Include on files using offsetoff (closes: #625053) -Git-Branch: p/cstddef -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8fb2fc380c1a53d0e603d1aaeff156 - - vcglib/wrap/io_tetramesh/import_ply.h | 1 + - vcglib/wrap/io_trimesh/import_ply.h | 1 + - vcglib/wrap/ply/plystuff.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/vcglib/wrap/io_tetramesh/import_ply.h b/vcglib/wrap/io_tetramesh/import_ply.h -index 0da4c1f..8370e48 100644 ---- a/vcglib/wrap/io_tetramesh/import_ply.h -+++ b/vcglib/wrap/io_tetramesh/import_ply.h -@@ -36,6 +36,7 @@ created - #include - #include - #include -+#include - - - -diff --git a/vcglib/wrap/io_trimesh/import_ply.h b/vcglib/wrap/io_trimesh/import_ply.h -index 13eaa30..ce2de3a 100644 ---- a/vcglib/wrap/io_trimesh/import_ply.h -+++ b/vcglib/wrap/io_trimesh/import_ply.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - namespace vcg { - namespace tri { -diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h -index 3e41e63..4761e9f 100644 ---- a/vcglib/wrap/ply/plystuff.h -+++ b/vcglib/wrap/ply/plystuff.h -@@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching support for ply files. First working vers - #include - #include - #include -+#include - #ifdef WIN32 - #include - #endif diff --git a/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch b/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch deleted file mode 100644 index 9702758dca85..000000000000 --- a/media-gfx/meshlab/files/1.3.2/03_disable-updates.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Teemu Ikonen -Subject: Disable checking for updates on startup. -Git-Branch: p/disable-updates -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8f6cf9176644dce65ef4518b08526c - - meshlab/src/meshlab/mainwindow_Init.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meshlab/src/meshlab/mainwindow_Init.cpp b/meshlab/src/meshlab/mainwindow_Init.cpp -index de3ff1d..ce7bf81 100644 ---- a/meshlab/src/meshlab/mainwindow_Init.cpp -+++ b/meshlab/src/meshlab/mainwindow_Init.cpp -@@ -926,7 +926,7 @@ void MainWindow::saveRecentFileList(const QString &fileName) - - if(loadedMeshCounter-lastComunicatedValue>connectionInterval && !myLocalBuf.isOpen()) - { --#if not defined(__DISABLE_AUTO_STATS__) -+#if defined(__ENABLE_AUTO_STATS__) - checkForUpdates(false); - #endif - int congratsMeshCounter = settings.value("congratsMeshCounter",50).toInt(); diff --git a/media-gfx/meshlab/files/1.3.2/05_externals.patch b/media-gfx/meshlab/files/1.3.2/05_externals.patch deleted file mode 100644 index 0592b5709646..000000000000 --- a/media-gfx/meshlab/files/1.3.2/05_externals.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Teemu Ikonen -Subject: Only build necessary external sources. -Git-Branch: p/externals -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ca572df8704909a1bbe18b1ce25d76 - - meshlab/src/external/external.pro | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meshlab/src/external/external.pro b/meshlab/src/external/external.pro -index c103d88..324eb91 100644 ---- a/meshlab/src/external/external.pro -+++ b/meshlab/src/external/external.pro -@@ -2,11 +2,6 @@ config += debug_and_release - - TEMPLATE = subdirs - --SUBDIRS = lib3ds-1.3.0/lib3ds \ -- bzip2-1.0.5/bzip2-1.0.5.pro \ -- muparser_v132/src \ -- levmar-2.3/levmar-2.3.pro \ -+SUBDIRS = levmar-2.3/levmar-2.3.pro \ - structuresynth/structuresynth.pro \ -- OpenCTM-1.0.3/openctm.pro \ - jhead-2.95/jhead-2.95.pro --# openkinect/openkinect.pro diff --git a/media-gfx/meshlab/files/1.3.2/06_format-security.patch b/media-gfx/meshlab/files/1.3.2/06_format-security.patch deleted file mode 100644 index 36a767ca07e9..000000000000 --- a/media-gfx/meshlab/files/1.3.2/06_format-security.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Teemu Ikonen -Subject: Fix compilation errors with -Werror=format-security. -Git-Branch: p/format-security -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..be247b855ebb49a4d826d60b7d21a0 - - .../meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp | 4 ++-- - meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp -index 4864214..233b657 100644 ---- a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp -+++ b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp -@@ -526,7 +526,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act, - GLenum err = glewInit(); - if( err != GLEW_OK ) - { -- qWarning( (std::string("Impossible to load GLEW library.")+(char*)glewGetErrorString(err)).c_str() ); -+ qWarning("Impossible to load GLEW library: %s", glewGetErrorString(err)); - return false; - } - Log( "GLEW library correctly initialized." ); -@@ -536,7 +536,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act, - std::string logs; - if( !initShaders(logs) ) - { -- qWarning( ("Error while initializing shaders.\n"+logs).c_str() ); -+ qWarning("Error while initializing shaders.\n%s", logs.c_str()); - return false; - } - Log( "Shaders correctly loaded." ); -diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp -index 88b6f9f..c23987c 100644 ---- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp -+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp -@@ -269,7 +269,7 @@ void EditArc3DPlugin::ExportPly() - QString suffix = "." + qfInfo.completeSuffix(); - QString path = qfInfo.absoluteFilePath().remove(suffix); - path.append("Undist" + suffix); -- qDebug(path.toLatin1()); -+ qDebug("%s", path.toStdString().c_str()); - - QImage undistImg(originalImg.width(),originalImg.height(),originalImg.format()); - undistImg.fill(qRgba(0,0,0,255)); diff --git a/media-gfx/meshlab/files/1.3.2/07_gcc47.patch b/media-gfx/meshlab/files/1.3.2/07_gcc47.patch deleted file mode 100644 index df608d8369ed..000000000000 --- a/media-gfx/meshlab/files/1.3.2/07_gcc47.patch +++ /dev/null @@ -1,105 +0,0 @@ -From: Teemu Ikonen -Subject: Fix FTBFS with GCC-4.7 -Git-Branch: p/gcc47 -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..07a6c6cf991f44779236b31381a7ca - -Closes: #667276 - -Thanks to Matej Vela for the patch. - - meshlab/src/meshlabplugins/decorate_base/colorhistogram.h | 2 +- - .../vcg/complex/algorithms/local_optimization/tri_edge_flip.h | 8 ++++---- - vcglib/vcg/space/index/grid_static_obj.h | 2 +- - vcglib/wrap/gl/trimesh.h | 2 +- - vcglib/wrap/ply/plystuff.h | 1 + - 5 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -index 2351b2a..90c6d76 100644 ---- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -@@ -40,7 +40,7 @@ public: - - //! Reset histogram data. - void Clear() { -- this->::Clear(); -+ Histogram::Clear(); - CV.clear(); - } - /* -diff --git a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h -index 9054166..f40f0dc 100644 ---- a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h -+++ b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h -@@ -558,13 +558,13 @@ public: - // edges of the first face, except the flipped edge - for(int i = 0; i < 3; i++) if(i != flipped) { - PosType newpos(f1, i); -- Insert(heap, newpos, this->GlobalMark()); -+ this->Insert(heap, newpos, this->GlobalMark()); - } - - // edges of the second face, except the flipped edge - for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) { - PosType newpos(f2, i); -- Insert(heap, newpos, this->GlobalMark()); -+ this->Insert(heap, newpos, this->GlobalMark()); - } - - // every edge with v0, v1 v3 of f1 -@@ -583,7 +583,7 @@ public: - do { - VertexPointer v = pos.VFlip(); - if(v != v0 && v != v1 && v != v2 && v != v3) -- Insert(heap, pos, this->GlobalMark()); -+ this->Insert(heap, pos, this->GlobalMark()); - - pos.NextE(); - } while(pos != startpos && !pos.IsBorder()); -@@ -603,7 +603,7 @@ public: - do { - VertexPointer v = pos.VFlip(); - if(v != v0 && v != v1 && v != v2 && v != v3) -- Insert(heap, pos, this->GlobalMark()); -+ this->Insert(heap, pos, this->GlobalMark()); - - pos.NextE(); - } while(pos != startpos && !pos.IsBorder()); -diff --git a/vcglib/vcg/space/index/grid_static_obj.h b/vcglib/vcg/space/index/grid_static_obj.h -index 0554393..26608d5 100644 ---- a/vcglib/vcg/space/index/grid_static_obj.h -+++ b/vcglib/vcg/space/index/grid_static_obj.h -@@ -72,7 +72,7 @@ class GridStaticObj : public BasicGrid - inline ~GridStaticObj() { if(grid) delete[] grid; } - inline void Init(const ObjType &val) - { -- fill(grid,grid+size(),val); -+ std::fill(grid,grid+size(),val); - } - - -diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h -index 5d40404..ba72456 100644 ---- a/vcglib/wrap/gl/trimesh.h -+++ b/vcglib/wrap/gl/trimesh.h -@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) - } - } - -- m.vert.math::Swap(newvert); -+ m.vert.swap(newvert); - m.vn=m.vert.size(); - } - -diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h -index 3e41e63..4af9508 100644 ---- a/vcglib/wrap/ply/plystuff.h -+++ b/vcglib/wrap/ply/plystuff.h -@@ -75,6 +75,7 @@ using namespace vcg; - #define pb_close _close - #define DIR_SEP "\\" - #else -+#include - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat diff --git a/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch b/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch deleted file mode 100644 index 243ed1d9668a..000000000000 --- a/media-gfx/meshlab/files/1.3.2/08_lib3ds.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Teemu Ikonen -Subject: Use Debian lib3ds. -Git-Branch: p/lib3ds -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..944ece3e566dbf4cc885163178d303 - - meshlab/src/meshlabplugins/io_3ds/io_3ds.pro | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro -index cf8052a..fed064d 100644 ---- a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro -+++ b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro -@@ -14,7 +14,7 @@ SOURCES += meshio.cpp \ - - TARGET = io_3ds - --INCLUDEPATH += ../../external/lib3ds-1.3.0/ -+INCLUDEPATH += /usr/include/lib3ds - - # Notes on the paths of lib3ds files. - # Once you have compiled the library put the lib files in a dir named lib/XXX/ -@@ -25,9 +25,7 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/3ds.lib - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a --linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a --linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a -+linux-g++:LIBS += -l3ds - - # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds - diff --git a/media-gfx/meshlab/files/1.3.2/09_libbz2.patch b/media-gfx/meshlab/files/1.3.2/09_libbz2.patch deleted file mode 100644 index 1b064f7f6ae9..000000000000 --- a/media-gfx/meshlab/files/1.3.2/09_libbz2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Teemu Ikonen -Subject: Use Debian libbz2. -Git-Branch: p/libbz2 -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..a6e1a0b242a02075c0d686ec4fa8b8 - - meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro -index e317b99..94dc124 100644 ---- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro -+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro -@@ -32,16 +32,12 @@ RESOURCES = edit_arc3D.qrc - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a --linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a --linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a -+linux-g++:LIBS += -lbz2 - - win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 - win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 - win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 --linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 --linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 --linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 -+linux-g++:INCLUDEPATH += /usr/include - - mac:LIBS += -lbz2 - diff --git a/media-gfx/meshlab/files/1.3.2/10_muparser.patch b/media-gfx/meshlab/files/1.3.2/10_muparser.patch deleted file mode 100644 index f640377c59f4..000000000000 --- a/media-gfx/meshlab/files/1.3.2/10_muparser.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Teemu Ikonen -Subject: Use Debian muparser. -Git-Branch: p/muparser -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..5e9cfcdae805ddac6f550b2a9f7011 - - meshlab/src/meshlabplugins/filter_func/filter_func.pro | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/filter_func/filter_func.pro b/meshlab/src/meshlabplugins/filter_func/filter_func.pro -index 3bcce2a..9a147b2 100644 ---- a/meshlab/src/meshlabplugins/filter_func/filter_func.pro -+++ b/meshlab/src/meshlabplugins/filter_func/filter_func.pro -@@ -6,7 +6,7 @@ SOURCES += filter_func.cpp - - TARGET = filter_func - --INCLUDEPATH += ../../external/muparser_v132/include -+INCLUDEPATH += /usr/include/muParser - - # Note: we need static libs so when building muparser lib use - # ./configure --enable-shared=no -@@ -14,7 +14,5 @@ INCLUDEPATH += ../../external/muparser_v132/include - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib - macx:LIBS += $$MACLIBDIR/libmuparser.a --linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a --linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a -+linux-g++:LIBS += -lmuparser - win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a diff --git a/media-gfx/meshlab/files/1.3.2/11_openctm.patch b/media-gfx/meshlab/files/1.3.2/11_openctm.patch deleted file mode 100644 index 7fcbced741a3..000000000000 --- a/media-gfx/meshlab/files/1.3.2/11_openctm.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Teemu Ikonen -Subject: Use Debian OpenCTM -Git-Branch: p/openctm -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e067d2c66c2408593f62f9c7776eed - - meshlab/src/meshlabplugins/io_ctm/io_ctm.pro | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro -index 1084902..31f0237 100644 ---- a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro -+++ b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro -@@ -3,7 +3,7 @@ HEADERS += io_ctm.h \ - $$VCGDIR/wrap/io_trimesh/import_ctm.h \ - $$VCGDIR/wrap/io_trimesh/export_ctm.h - SOURCES += io_ctm.cpp --INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib -+INCLUDEPATH += /usr/include - TARGET = io_ctm - - win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC -@@ -15,8 +15,6 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/openctm.lib - win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a --linux-g++:LIBS += ../../external/lib/linux-g++/libopenctm.a --linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libopenctm.a --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libopenctm.a -+linux-g++:LIBS += -lopenctm - #macx:LIBS += ../../external/lib/macx/libopenctm.a - macx:LIBS += $$MACLIBDIR/libopenctm.a diff --git a/media-gfx/meshlab/files/1.3.2/12_overflow.patch b/media-gfx/meshlab/files/1.3.2/12_overflow.patch deleted file mode 100644 index 7bf594302c82..000000000000 --- a/media-gfx/meshlab/files/1.3.2/12_overflow.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Teemu Ikonen -Subject: Fix overflowing array index in VCGlib -Git-Branch: p/overflow -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ec0961589f0d134ab51265b8431c5f - -Fixes also E-array-bounds error in Debian build log scanner. - - vcglib/wrap/gl/addons.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vcglib/wrap/gl/addons.h b/vcglib/wrap/gl/addons.h -index 002ff1b..bc863bf 100644 ---- a/vcglib/wrap/gl/addons.h -+++ b/vcglib/wrap/gl/addons.h -@@ -292,7 +292,7 @@ public: - P[1] = Point3f( 0, sinf(angle), cosf(angle)); - assert(!glGetError()); - glBegin(GL_TRIANGLES); -- Point3f n = ( (P[0]-p0) ^ (P[2]-p0) ).Normalize(); -+ Point3f n = ( (P[0]-p0) ^ (P[1]-p0) ).Normalize(); - glNormal3f(n[0],n[1],n[2]); - glVertex3f(p0[0],p0[1],p0[2]); - glNormal3f(N[0][0],N[0][1],N[0][2]); diff --git a/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch b/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch deleted file mode 100644 index f92ad6376ff1..000000000000 --- a/media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Teemu Ikonen -Subject: Hardcode pluginsDir to the correct path in Debian -Git-Branch: p/pluginsdir -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e1db74a038fd5fc27cc5e9f0bee8d3 - - meshlab/src/common/pluginmanager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meshlab/src/common/pluginmanager.cpp b/meshlab/src/common/pluginmanager.cpp -index d84c8fa..a039736 100644 ---- a/meshlab/src/common/pluginmanager.cpp -+++ b/meshlab/src/common/pluginmanager.cpp -@@ -230,7 +230,7 @@ QString PluginManager::getBaseDirPath() - - QString PluginManager::getPluginDirPath() - { -- QDir pluginsDir(getBaseDirPath()); -+ QDir pluginsDir("/usr/lib/meshlab"); - if(!pluginsDir.exists("plugins")) - //QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory."); - qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory."); diff --git a/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch b/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch deleted file mode 100644 index 2f7c6e0a72d2..000000000000 --- a/media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Teemu Ikonen -Subject: Set LC_NUMERIC to "C" -Git-Branch: p/ply_numeric -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..2aeac7daa4785a9cf0b2480f663780 - -Fixes reading of ascii float values in locales which use the comma as a -float separator. - - meshlab/src/meshlab/main.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/meshlab/src/meshlab/main.cpp b/meshlab/src/meshlab/main.cpp -index 7058e31..e452e87 100644 ---- a/meshlab/src/meshlab/main.cpp -+++ b/meshlab/src/meshlab/main.cpp -@@ -25,12 +25,16 @@ - #include - #include "mainwindow.h" - -+using namespace std; -+ - int main(int argc, char *argv[]) - { - MeshLabApplication app(argc, argv); - QLocale::setDefault(QLocale::C); - QCoreApplication::setOrganizationName("VCG"); - QCoreApplication::setApplicationName("MeshLab"); -+ -+ std::setlocale(LC_NUMERIC, "C"); - - if(argc>1) - { diff --git a/media-gfx/meshlab/files/1.3.2/15_qhull.patch b/media-gfx/meshlab/files/1.3.2/15_qhull.patch deleted file mode 100644 index 6c1f70a3f0bc..000000000000 --- a/media-gfx/meshlab/files/1.3.2/15_qhull.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro ---- a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2013-10-30 21:12:42.000000000 +0000 -+++ b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2013-10-30 21:31:35.692580129 +0000 -@@ -8,28 +8,6 @@ - SOURCES += filter_qhull.cpp \ - qhull_tools.cpp - --HEADERS += ../../external/qhull-2003.1/src/geom.h \ -- ../../external/qhull-2003.1/src/io.h \ -- ../../external/qhull-2003.1/src/mem.h \ -- ../../external/qhull-2003.1/src/merge.h \ -- ../../external/qhull-2003.1/src/poly.h \ -- ../../external/qhull-2003.1/src/qhull.h \ -- ../../external/qhull-2003.1/src/qset.h \ -- ../../external/qhull-2003.1/src/stat.h \ -- ../../external/qhull-2003.1/src/user.h -- --SOURCES += ../../external/qhull-2003.1/src/geom.c \ -- ../../external/qhull-2003.1/src/geom2.c \ -- ../../external/qhull-2003.1/src/global.c \ -- ../../external/qhull-2003.1/src/io.c \ -- ../../external/qhull-2003.1/src/mem.c \ -- ../../external/qhull-2003.1/src/merge.c \ -- ../../external/qhull-2003.1/src/poly.c \ -- ../../external/qhull-2003.1/src/poly2.c \ -- ../../external/qhull-2003.1/src/qconvex.c \ -- ../../external/qhull-2003.1/src/qhull.c \ -- ../../external/qhull-2003.1/src/qset.c \ -- ../../external/qhull-2003.1/src/stat.c \ -- ../../external/qhull-2003.1/src/user.c -+LIBS += -lqhull - - TARGET = filter_qhull -\ В конце файла нет новой строки -diff -Naur a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h ---- a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2013-10-30 21:32:57.242574626 +0000 -@@ -0,0 +1,29 @@ -+ -+#include -+#include -+ -+ -+#if defined(__cplusplus) -+extern "C" -+{ -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#if defined(__cplusplus) -+} -+#endif -+ -+facetT *compute_convex_hull(int dim, int numpoints, MeshModel &m); -+facetT *compute_delaunay(int dim, int numpoints, MeshModel &m); -+bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold); -+bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape); -+int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); -+ diff --git a/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch b/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch deleted file mode 100644 index d8ebc206f045..000000000000 --- a/media-gfx/meshlab/files/1.3.2/16_shadersdir.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Teemu Ikonen -Subject: Hardcode shadersDir to the correct path in Debian in various plugins -Git-Branch: p/shadersdir -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..06b8aa9ce525fc0c5c221f5d675c29 - - meshlab/src/meshlabplugins/render_gdp/meshrender.cpp | 2 +- - meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp | 2 +- - meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp -index 64dbcc3..c07998c 100644 ---- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp -+++ b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp -@@ -39,7 +39,7 @@ void MeshShaderRenderPlugin::initActionList() { - qaNone->setCheckable(false); - actionList << qaNone;*/ - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = QDir("/usr/share/meshlab"); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) - shadersDir.cdUp(); -diff --git a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp -index 9c45981..0256805 100644 ---- a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp -+++ b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp -@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int i) { - void ShaderDialog::browseTexturePath(int i) { - QFileDialog fd(0,"Choose new texture"); - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = QDir("/usr/share/meshlab"); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") - shadersDir.cdUp(); -diff --git a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp -index e327cea..eb67fd2 100755 ---- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp -+++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp -@@ -55,7 +55,7 @@ QList RenderRFX::actions() - - void RenderRFX::initActionList() - { -- QDir shadersDir = PluginManager::getBaseDirPath(); -+ QDir shadersDir = QDir("/usr/share/meshlab"); - - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || diff --git a/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch b/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch deleted file mode 100644 index 6a6b84c8d682..000000000000 --- a/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Teemu Ikonen -Subject: Include glu.h where needed in included structure-synth code. -Git-Branch: p/structuresynth -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..45495fd45078a06d7c5f7405ba636c - -Also link structuresynth code with libGLU. - -This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same -issue in the real structure-synth Debian package. - - .../structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h | 1 + - .../src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h | 1 + - meshlab/src/external/structuresynth/structuresynth.pro | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h -index 8905cbe..e13b011 100644 ---- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h -+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - #include "SyntopiaCore/Math/Vector3.h" - #include "SyntopiaCore/Math/Matrix4.h" -diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h -index 0b0dc40..ed95346 100644 ---- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h -+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h -@@ -2,6 +2,7 @@ - - #include "SyntopiaCore/Math/Vector3.h" - #include "Object3D.h" -+#include - - namespace SyntopiaCore { - namespace GLEngine { -diff --git a/meshlab/src/external/structuresynth/structuresynth.pro b/meshlab/src/external/structuresynth/structuresynth.pro -index 8579b03..362ce5d 100644 ---- a/meshlab/src/external/structuresynth/structuresynth.pro -+++ b/meshlab/src/external/structuresynth/structuresynth.pro -@@ -120,3 +120,4 @@ win32-msvc2008:DESTDIR = ../lib/win32-msvc2008 - linux-g++-32:DESTDIR = ../lib/linux-g++-32 - linux-g++-64:DESTDIR = ../lib/linux-g++-64 - linux-g++:DESTDIR = ../lib/linux-g++ -+unix:LIBS+=-lGLU diff --git a/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch b/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch deleted file mode 100644 index 894f05cf2423..000000000000 --- a/media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch +++ /dev/null @@ -1,146 +0,0 @@ -From: Teemu Ikonen -Subject: Use Debian GLEW. -Git-Branch: p/glew -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..7023f74389baab6b9032c08ae2e2b2 - - meshlab/src/common/common.pro | 5 ++--- - meshlab/src/meshlab/meshlab.pro | 4 +--- - meshlab/src/meshlabplugins/filter_plymc/plymc.pro | 2 +- - meshlab/src/meshlabserver/meshlabserver.pro | 6 ++---- - meshlab/src/shared.pri | 7 ++++--- - vcglib/apps/sample/trimesh_QT/trimesh_qt.pro | 5 +++-- - vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro | 4 ++-- - 7 files changed, 15 insertions(+), 18 deletions(-) - -diff --git a/meshlab/src/common/common.pro b/meshlab/src/common/common.pro -index eec1863..58bda06 100644 ---- a/meshlab/src/common/common.pro -+++ b/meshlab/src/common/common.pro -@@ -1,9 +1,9 @@ - include (../general.pri) - EXIF_DIR = ../external/jhead-2.95 -+GLEWDIR = /usr -+LIBS += -lGLEW - - --GLEWCODE = $$GLEWDIR/src/glew.c -- - win32-msvc2005:DESTDIR = ../distrib - win32-msvc2008:DESTDIR = ../distrib - win32-msvc2010:DESTDIR = ../distrib -@@ -106,7 +106,6 @@ SOURCES += filterparameter.cpp \ - mlapplication.cpp \ - scriptsyntax.cpp \ - searcher.cpp \ -- $$GLEWCODE \ - meshlabdocumentxml.cpp \ - meshlabdocumentbundler.cpp - -diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro -index 4a7d0fd..ecd9ed6 100644 ---- a/meshlab/src/meshlab/meshlab.pro -+++ b/meshlab/src/meshlab/meshlab.pro -@@ -129,11 +129,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon - # win32-g++:release:LIBS += -L../common/release -lcommon - #} - --linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU - linux-g++:QMAKE_RPATHDIR += ../distrib --linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU - linux-g++-32:QMAKE_RPATHDIR += ../distrib --linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU - linux-g++-64:QMAKE_RPATHDIR += ../distrib - - # uncomment in your local copy only in emergency cases. -diff --git a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro -index b609419..a89e8c6 100755 ---- a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro -+++ b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro -@@ -1,7 +1,7 @@ - TARGET = plymc - DEPENDPATH += . - INCLUDEPATH += ../../../../vcglib \ -- ../../code/lib/glew/include -+ /usr/include - CONFIG += console \ - stl \ - debug_and_release -diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro -index cca5560..9b070c7 100644 ---- a/meshlab/src/meshlabserver/meshlabserver.pro -+++ b/meshlab/src/meshlabserver/meshlabserver.pro -@@ -1,4 +1,4 @@ --GLEWDIR = ../external/glew-1.5.1 -+GLEWDIR = /usr - - HEADERS = - -@@ -25,11 +25,9 @@ win32-msvc2005: LIBS += -L../distrib -lcommon - win32-msvc2008: LIBS += -L../distrib -lcommon - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon --linux-g++: LIBS += -L../distrib -lcommon -+linux-g++: LIBS += -L../distrib -lcommon -lGLEW - linux-g++:QMAKE_RPATHDIR += ../distrib --linux-g++-32: LIBS += -L../distrib -lcommon - linux-g++-32:QMAKE_RPATHDIR += ../distrib --linux-g++-64: LIBS += -L../distrib -lcommon - linux-g++-64:QMAKE_RPATHDIR += ../distrib - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon -diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri -index 93ed32f..0ba3e67 100644 ---- a/meshlab/src/shared.pri -+++ b/meshlab/src/shared.pri -@@ -17,9 +17,10 @@ win32-msvc2005: LIBS += ../../distrib/common.lib - win32-msvc2008: LIBS += ../../distrib/common.lib - win32-msvc2010: LIBS += ../../distrib/common.lib - win32-g++:LIBS += -L../../distrib -lcommon --linux-g++:LIBS += -L../../distrib -lcommon --linux-g++-32:LIBS += -L../../distrib -lcommon --linux-g++-64:LIBS += -L../../distrib -lcommon -+linux-g++:LIBS += -L../../distrib -lcommon -lGLEW -+#linux-g++-32:LIBS += -L../../distrib -lcommon -+#linux-g++-64:LIBS += -L../../distrib -lcommon -+ - - #CONFIG(debug, debug|release) { - # win32-msvc2005: LIBS += ../../common/debug/common.lib -diff --git a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro -index 8a3c7fc..986116e 100644 ---- a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro -+++ b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro -@@ -26,8 +26,9 @@ SOURCES += ../../../wrap/gui/trackmode.cpp - - # Compile glew - DEFINES += GLEW_STATIC --INCLUDEPATH += ../../../../code/lib/glew/include --SOURCES += ../../../../code/lib/glew/src/glew.c -+INCLUDEPATH += /usr/include -+#SOURCES += ../../../../code/lib/glew/src/glew.c -+LIBS += -lGLEW - - # Awful problem with windows.. - win32{ -diff --git a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro -index e8ae178..4a69fef 100644 ---- a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro -+++ b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro -@@ -1,14 +1,14 @@ --INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include -+INCLUDEPATH += . ../../.. ../../../../code/lib /usr/include - HEADERS = glwidget.h \ - window.h \ - mesh_type.h - SOURCES = glwidget.cpp \ - main.cpp \ - window.cpp\ -- ../../../../code/lib/glew/src/glew.c \ - ../../../wrap/ply/plylib.cpp\ - ../../../wrap/gui/trackmode.cpp\ - ../../../wrap/gui/trackball.cpp -+LIBS += -lGLEW - QT += opengl - - # install diff --git a/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch b/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch deleted file mode 100644 index c3dfc4de35be..000000000000 --- a/media-gfx/meshlab/files/1.3.2/19_CONFLICTS_IN_rpath.patch +++ /dev/null @@ -1,32 +0,0 @@ -reverted: ---- b/meshlab/src/meshlab/meshlab.pro -+++ a/meshlab/src/meshlab/meshlab.pro -@@ -129,9 +129,11 @@ - # win32-g++:release:LIBS += -L../common/release -lcommon - #} - -+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU - linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU - linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU - linux-g++-64:QMAKE_RPATHDIR += ../distrib - - # uncomment in your local copy only in emergency cases. -reverted: ---- b/meshlab/src/meshlabserver/meshlabserver.pro -+++ a/meshlab/src/meshlabserver/meshlabserver.pro -@@ -25,9 +25,11 @@ - win32-msvc2008: LIBS += -L../distrib -lcommon - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon -+linux-g++: LIBS += -L../distrib -lcommon --linux-g++: LIBS += -L../distrib -lcommon -lGLEW - linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++-32: LIBS += -L../distrib -lcommon - linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-64: LIBS += -L../distrib -lcommon - linux-g++-64:QMAKE_RPATHDIR += ../distrib - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon diff --git a/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch b/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch deleted file mode 100644 index e53d8bf1e798..000000000000 --- a/media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Teemu Ikonen -Subject: Use /usr/lib/meshlab as RPATH in binaries. -Git-Branch: p/rpath -Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..0ecffa4d55bfff6f3b98a478d0cd82 - - meshlab/src/meshlab/meshlab.pro | 4 +--- - meshlab/src/meshlabserver/meshlabserver.pro | 4 +--- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro -index 4a7d0fd..f67ba07 100644 ---- a/meshlab/src/meshlab/meshlab.pro -+++ b/meshlab/src/meshlab/meshlab.pro -@@ -130,11 +130,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon - #} - - linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab - linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU --linux-g++-32:QMAKE_RPATHDIR += ../distrib - linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU --linux-g++-64:QMAKE_RPATHDIR += ../distrib - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro -index cca5560..6a19b81 100644 ---- a/meshlab/src/meshlabserver/meshlabserver.pro -+++ b/meshlab/src/meshlabserver/meshlabserver.pro -@@ -26,11 +26,9 @@ win32-msvc2008: LIBS += -L../distrib -lcommon - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon - linux-g++: LIBS += -L../distrib -lcommon --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab - linux-g++-32: LIBS += -L../distrib -lcommon --linux-g++-32:QMAKE_RPATHDIR += ../distrib - linux-g++-64: LIBS += -L../distrib -lcommon --linux-g++-64:QMAKE_RPATHDIR += ../distrib - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch b/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch deleted file mode 100644 index 35c1cac41412..000000000000 --- a/media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch +++ /dev/null @@ -1,29 +0,0 @@ -Resolve patch overlaps. ---- a/meshlab/src/meshlab/meshlab.pro -+++ b/meshlab/src/meshlab/meshlab.pro -@@ -129,10 +129,8 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon - # win32-g++:release:LIBS += -L../common/release -lcommon - #} - --linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU - linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab --linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU --linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive ---- a/meshlab/src/meshlabserver/meshlabserver.pro -+++ b/meshlab/src/meshlabserver/meshlabserver.pro -@@ -25,10 +25,8 @@ win32-msvc2005: LIBS += -L../distrib -lcommon - win32-msvc2008: LIBS += -L../distrib -lcommon - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon --linux-g++: LIBS += -L../distrib -lcommon -+linux-g++: LIBS += -L../distrib -lcommon -lGLEW - linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab --linux-g++-32: LIBS += -L../distrib -lcommon --linux-g++-64: LIBS += -L../distrib -lcommon - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/media-gfx/meshlab/files/1.3.2/22_aliasing.patch b/media-gfx/meshlab/files/1.3.2/22_aliasing.patch deleted file mode 100644 index 7f3b8447c2d0..000000000000 --- a/media-gfx/meshlab/files/1.3.2/22_aliasing.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -urN meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp ---- meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp 2014-08-11 18:01:55.329182160 +0200 -+++ meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp 2014-08-11 15:11:20.000000000 +0200 -@@ -149,9 +149,11 @@ - fread(&numFaces,sizeof(int),1,fp); - } - // advance pointer ?? -- char s[4]; -+ -+ char s[5]; - fread(s,sizeof(char),4,fp); -- printf("extara is %s (%d)\n", s, *(int*)(&s[0])); -+ s[4]=0; -+ printf("extara is %s (%d)\n", s, ((unsigned)s[0])|(((unsigned)s[1])<<8)|(((unsigned)s[2])<<16)|(((unsigned)s[3])<<24)); - return 0; - } - -@@ -284,7 +286,7 @@ - bool floatFlag=false; - - int ret=fread(texCode,sizeof(char),4,fp); -- qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)(&texCode[0]), *(float*)(&texCode[0])); -+ //qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)((void*)(&texCode[0])), *(float*)((void*)(&texCode[0]))); - - if(feof(fp)){ - qDebug("Premature end of file"); -diff -urN meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h ---- meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h 2014-08-11 18:01:55.366182161 +0200 -+++ meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h 2014-08-11 14:36:38.000000000 +0200 -@@ -233,12 +233,12 @@ - // DuplicateFace=false a model with looks ok if you enable doublesided lighting and disable backfaceculling - - bool DuplicateFaceParam; -- - // This class keeps the references to the three cells where a face has its vertexes. - class SimpleTri - { - public: - CellType *v[3]; -+#pragma GCC diagnostic ignored "-Wstrict-aliasing" - int ii(int i) const {return *((int *)(&(v[i])));} - bool operator < ( const SimpleTri &p) const { - return (v[2]!=p.v[2])?(v[2] - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat diff --git a/media-gfx/meshlab/files/1.3.3/lapack.patch b/media-gfx/meshlab/files/1.3.3/lapack.patch deleted file mode 100644 index e2742eb99991..000000000000 --- a/media-gfx/meshlab/files/1.3.3/lapack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h ---- a/meshlab/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 -+++ b/meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 -@@ -27,7 +27,6 @@ - - /* specify whether to use LAPACK or not. The first option is strongly recommended */ - #define HAVE_LAPACK /* use LAPACK */ -- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */ - - /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to - * retain working memory between calls. Such a choice, however, renders these routines diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch deleted file mode 100644 index 33eb1cbf7038..000000000000 --- a/media-gfx/meshlab/files/1.3.3/meshrender.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2014-02-07 10:38:28.000000000 +0100 -+++ b/meshlab/src/meshlabplugins/render_gdb/meshrender.cpp 2015-11-15 22:17:39.848179962 +0100 -@@ -36,8 +36,11 @@ - /*QAction * qaNone = new QAction("None", this); - qaNone->setCheckable(false); - actionList << qaNone;*/ -- -+#if defined(Q_OS_LINUX) -+ QDir shadersDir = QDir("/usr/share/meshlab"); -+#else - QDir shadersDir = QDir(qApp->applicationDirPath()); -+#endif - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) - shadersDir.cdUp(); diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch b/media-gfx/meshlab/files/1.3.3/mpir.patch deleted file mode 100644 index fae203e18a18..000000000000 --- a/media-gfx/meshlab/files/1.3.3/mpir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro ---- a/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100 -+++ b/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000 -@@ -18,6 +18,4 @@ - win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib --linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 --linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a - diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch deleted file mode 100644 index 853015da4d06..000000000000 --- a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/meshlab/src/common/pluginmanager.cpp 2014-04-01 17:07:40.000000000 +0200 -+++ b/meshlab/src/common/pluginmanager.cpp 2015-11-15 20:58:53.708227793 +0100 -@@ -178,7 +178,11 @@ - - QString PluginManager::getBaseDirPath() - { -+#if defined(Q_OS_LINUX) -+ QDir baseDir("/usr/lib/meshlab"); -+#else - QDir baseDir(qApp->applicationDirPath()); -+#endif - - #if defined(Q_OS_WIN) - // Windows: diff --git a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch deleted file mode 100644 index bb1113a5c617..000000000000 --- a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- a/meshlab/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 -+++ b/meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 -@@ -85,6 +85,7 @@ - QT += xmlpatterns - QT += network - QT += script -+unix:LIBS += -lGLU - - - # the following line is needed to avoid mismatch between diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch deleted file mode 100644 index 0d7d03d3f09e..000000000000 --- a/media-gfx/meshlab/files/1.3.3/rfx.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2014-02-07 10:38:29.000000000 +0100 -+++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp 2015-11-16 00:07:34.868113218 +0100 -@@ -55,7 +55,11 @@ - - void RenderRFX::initActionList() - { -+#if defined(Q_OS_LINUX) -+ QDir shadersDir("/usr/share/meshlab"); -+#else - QDir shadersDir = PluginManager::getBaseDirPath(); -+#endif - - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch deleted file mode 100644 index 1fbf686980be..000000000000 --- a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2013-05-22 17:08:53.000000000 +0200 -+++ b/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2015-11-15 23:18:04.678143277 +0100 -@@ -63,7 +63,12 @@ - - void RmMeshShaderRenderPlugin::initActionList() { - -+#if defined(Q_OS_LINUX) -+ QDir shadersDir = QDir("/usr/share/meshlab/shaders"); -+#else - QDir shadersDir = QDir(qApp->applicationDirPath()); -+#endif -+ - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || - shadersDir.dirName() == "release" || diff --git a/media-gfx/meshlab/files/1.3.3/rpath.patch b/media-gfx/meshlab/files/1.3.3/rpath.patch deleted file mode 100644 index 473d2a8fa480..000000000000 --- a/media-gfx/meshlab/files/1.3.3/rpath.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- a/meshlab/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 -+++ b/meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 -@@ -130,11 +130,11 @@ - #} - --linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' --linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' --linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro ---- a/meshlab/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 -+++ b/meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 -@@ -26,11 +26,11 @@ - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon - linux-g++: LIBS += -L../distrib -lcommon --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' - linux-g++-32: LIBS += -L../distrib -lcommon --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' - linux-g++-64: LIBS += -L../distrib -lcommon --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/media-gfx/meshlab/files/1.3.3/structuresynth.patch b/media-gfx/meshlab/files/1.3.3/structuresynth.patch deleted file mode 100644 index e5d6d2baea9c..000000000000 --- a/media-gfx/meshlab/files/1.3.3/structuresynth.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2014-02-07 12:38:23.000000000 +0300 -+++ b/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-08-10 21:00:02.819783756 +0300 -@@ -122,7 +122,7 @@ - currentT = p; - - // We do not intersect grid. -- if (!found) return false; -+ if (!found) return NULL; - } - - stepX = (dir.x() > 0) ? 1 : -1; diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch new file mode 100644 index 000000000000..6e2e31af9bd2 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch @@ -0,0 +1,22 @@ +From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Mon, 20 Nov 2017 14:40:02 +0330 +Subject: [PATCH] compile server + +--- + meshlab_mini.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meshlab_mini.pro b/meshlab_mini.pro +index abe0259..b18771e 100644 +--- a/meshlab_mini.pro ++++ b/meshlab_mini.pro +@@ -34,4 +34,4 @@ SUBDIRS = common \ + # meshlabplugins/filter_unsharp \ + # meshlabplugins/io_collada \ + # meshlabplugins/io_x3d \ +-# meshlabserver ++ meshlabserver +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch new file mode 100644 index 000000000000..d8c5bb1f5aaa --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch @@ -0,0 +1,72 @@ +From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 00:57:42 +0330 +Subject: [PATCH] depend-on-system-glew + +--- + common/common.pro | 7 +------ + meshlab/meshlab.pro | 2 -- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/common/common.pro b/common/common.pro +index 51cdcb5..85849dc 100644 +--- a/common/common.pro ++++ b/common/common.pro +@@ -1,7 +1,6 @@ + include (../general.pri) + EXIF_DIR = ../external/jhead-2.95 + +-GLEWCODE = $$GLEWDIR/src/glew.c + + win32-msvc2005:DESTDIR = ../distrib + win32-msvc2008:DESTDIR = ../distrib +@@ -53,9 +52,7 @@ ln -s ../../../meshlab/src/distrib/shaders ../distrib/shaders ;\ + echo "linked shader dir"; \ + fi;\ + " +-INCLUDEPATH *= ../.. \ +- $$VCGDIR \ +- $$GLEWDIR/include ++ + TEMPLATE = lib + linux-g++:CONFIG += dll + linux-g++:DESTDIR = ../distrib +@@ -80,7 +77,6 @@ QT += script + TARGET = common + DEPENDPATH += . + INCLUDEPATH += . $$EXIF_DIR +-DEFINES += GLEW_STATIC + win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS +@@ -117,7 +113,6 @@ SOURCES += filterparameter.cpp \ + mlapplication.cpp \ + scriptsyntax.cpp \ + searcher.cpp \ +- $$GLEWCODE \ + meshlabdocumentxml.cpp \ + meshlabdocumentbundler.cpp \ + ml_shared_data_context.cpp +diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro +index 0e50581..37d44ba 100644 +--- a/meshlab/meshlab.pro ++++ b/meshlab/meshlab.pro +@@ -9,7 +9,6 @@ INCLUDEPATH *= . \ + .. \ + ../.. \ + $$VCGDIR \ +- $$GLEWDIR/include \ + $$EXIF_DIR + DEPENDPATH += $$VCGDIR \ + $$VCGDIR/vcg \ +@@ -64,7 +63,6 @@ SOURCES = main.cpp \ + $$VCGDIR/wrap/gui/trackball.cpp \ + $$VCGDIR/wrap/gui/trackmode.cpp \ + $$VCGDIR/wrap/gui/coordinateframe.cpp \ +- #$$GLEWDIR/src/glew.c \ + glarea_setting.cpp \ + filterthread.cpp + +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch new file mode 100644 index 000000000000..ed58bc0cb97e --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch @@ -0,0 +1,25 @@ +From 59588b3198e0ca6cd97265a65ea87b40897d3bd9 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 00:41:15 +0330 +Subject: [PATCH] disable-edit-quality + +--- + meshlab_full.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meshlab_full.pro b/meshlab_full.pro +index 143e226..9939225 100644 +--- a/meshlab_full.pro ++++ b/meshlab_full.pro +@@ -69,7 +69,7 @@ SUBDIRS = common \ + meshlabplugins/edit_pickpoints \ + meshlabplugins/edit_point\ + plugins_experimental/edit_referencing \ +- meshlabplugins/edit_quality \ ++# meshlabplugins/edit_quality \ + meshlabplugins/edit_select \ + # Sample Plugins + sampleplugins/sampleedit \ +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch new file mode 100644 index 000000000000..407d7775f9f1 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch @@ -0,0 +1,25 @@ +From 90862a887b923984e17343447c30251f2d6fc541 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 12:37:14 +0330 +Subject: [PATCH] disable filter layer + +--- + meshlab_full.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meshlab_full.pro b/meshlab_full.pro +index 9939225..1691d31 100644 +--- a/meshlab_full.pro ++++ b/meshlab_full.pro +@@ -34,7 +34,7 @@ SUBDIRS = common \ + sampleplugins/filter_geodesic \ + meshlabplugins/filter_img_patch_param \ + meshlabplugins/filter_isoparametrization \ +- meshlabplugins/filter_layer \ ++# meshlabplugins/filter_layer \ + meshlabplugins/filter_measure \ + meshlabplugins/filter_meshing \ + plugins_experimental/filter_mutualglobal \ +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch new file mode 100644 index 000000000000..c5f84998a627 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch @@ -0,0 +1,25 @@ +From 22f946dece8e56683a197204ac05292045a3dda1 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Wed, 22 Nov 2017 23:20:57 +0330 +Subject: [PATCH] disable-filter-ssynth + +--- + meshlab_full.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meshlab_full.pro b/meshlab_full.pro +index 4a256a1..143e226 100644 +--- a/meshlab_full.pro ++++ b/meshlab_full.pro +@@ -49,7 +49,7 @@ SUBDIRS = common \ + meshlabplugins/filter_sdfgpu \ + meshlabplugins/filter_select \ + plugins_experimental/filter_sketchfab \ +- meshlabplugins/filter_ssynth \ ++# meshlabplugins/filter_ssynth \ + meshlabplugins/filter_texture \ + meshlabplugins/filter_trioptimize \ + meshlabplugins/filter_unsharp \ +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch new file mode 100644 index 000000000000..320912c40ed3 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch @@ -0,0 +1,25 @@ +From 0358aad037efc55701622884bf0ed1249a08387f Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 02:23:03 +0330 +Subject: [PATCH] remove not sane plugins + +--- + meshlab_full.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meshlab_full.pro b/meshlab_full.pro +index 9939225..b8a6bce 100644 +--- a/meshlab_full.pro ++++ b/meshlab_full.pro +@@ -27,7 +27,7 @@ SUBDIRS = common \ + meshlabplugins/filter_color_projection \ + meshlabplugins/filter_create \ + sampleplugins/filter_createiso \ +- meshlabplugins/filter_csg \ ++# meshlabplugins/filter_csg \ + meshlabplugins/filter_dirt \ + meshlabplugins/filter_fractal \ + meshlabplugins/filter_func \ +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch new file mode 100644 index 000000000000..a1a4f3f860ab --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch @@ -0,0 +1,164 @@ +From 4780d519177021364427b44567fd9a67879435aa Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Fri, 24 Nov 2017 18:20:11 +0330 +Subject: [PATCH] set shader and texture paths + +--- + meshlabplugins/render_gdp/meshrender.cpp | 6 +++++- + meshlabplugins/render_gdp/shaderDialog.cpp | 6 +++++- + plugins_experimental/render_splatpyramid/dialog.cpp | 7 +++++-- + plugins_experimental/render_splatpyramid/splat_pyramid.cc | 6 +++++- + plugins_unsupported/render_rm/glstateholder.cpp | 12 ++++++++++-- + plugins_unsupported/render_rm/rmmeshrender.cpp | 6 +++++- + plugins_unsupported/render_rm/rmshaderdialog.cpp | 10 +++++++++- + 7 files changed, 44 insertions(+), 9 deletions(-) + +diff --git a/meshlabplugins/render_gdp/meshrender.cpp b/meshlabplugins/render_gdp/meshrender.cpp +index 5841ce6..28e66b3 100644 +--- a/meshlabplugins/render_gdp/meshrender.cpp ++++ b/meshlabplugins/render_gdp/meshrender.cpp +@@ -38,7 +38,11 @@ void MeshShaderRenderPlugin::initActionList() { + qaNone->setCheckable(false); + actionList << qaNone;*/ + +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir shadersDir("/usr/share/meshlab"); ++#else ++ QDir shadersDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins") + shadersDir.cdUp(); +diff --git a/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlabplugins/render_gdp/shaderDialog.cpp +index 1315757..168c0f8 100644 +--- a/meshlabplugins/render_gdp/shaderDialog.cpp ++++ b/meshlabplugins/render_gdp/shaderDialog.cpp +@@ -317,7 +317,11 @@ void ShaderDialog::changeTexturePath(int i) { + void ShaderDialog::browseTexturePath(int i) { + QFileDialog fd(0,"Choose new texture"); + +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir shadersDir("/usr/share/meshlab"); ++#else ++ QDir shadersDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") + shadersDir.cdUp(); +diff --git a/plugins_experimental/render_splatpyramid/dialog.cpp b/plugins_experimental/render_splatpyramid/dialog.cpp +index 589ba48..11cf3fe 100644 +--- a/plugins_experimental/render_splatpyramid/dialog.cpp ++++ b/plugins_experimental/render_splatpyramid/dialog.cpp +@@ -122,8 +122,11 @@ void Dialog::changeTexturePath(int i) { + + void Dialog::browseTexturePath(int i) { + QFileDialog fd(0,"Choose new texture"); +- +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir shadersDir("/usr/share/meshlab"); ++#else ++ QDir shadersDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") + shadersDir.cdUp(); +diff --git a/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/plugins_experimental/render_splatpyramid/splat_pyramid.cc +index a4915d1..75074a6 100644 +--- a/plugins_experimental/render_splatpyramid/splat_pyramid.cc ++++ b/plugins_experimental/render_splatpyramid/splat_pyramid.cc +@@ -85,7 +85,11 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &, + objects[i].setRendererType( render_mode ); + + /// Sets the path to the meshlab's shaders directory +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir shadersDir("/usr/share/meshlab"); ++#else ++ QDir shadersDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) + shadersDir.cdUp(); +diff --git a/plugins_unsupported/render_rm/glstateholder.cpp b/plugins_unsupported/render_rm/glstateholder.cpp +index fa7cdd9..544c6b3 100644 +--- a/plugins_unsupported/render_rm/glstateholder.cpp ++++ b/plugins_unsupported/render_rm/glstateholder.cpp +@@ -75,8 +75,12 @@ UniformValue::UniformValue(UniformVar &v) + + // if it's a texture, try to load it from the standard path + if (!textureFilename.isEmpty()) { ++#if defined(Q_OS_LINUX) ++ QDir textureDir("/usr/share/meshlab"); ++#else + QDir textureDir = QDir(qApp->applicationDirPath()); +- ++#endif ++ + #if defined(Q_OS_WIN) + if (textureDir.dirName() == "debug" || + textureDir.dirName() == "release" || +@@ -158,7 +162,11 @@ void UniformValue::updateUniformVariableValuesFromDialog(int rowIdx, int colIdx, + // * choose the filename with a dialog (55 by convention) + if (rowIdx == 5 && colIdx == 5) { + QFileDialog fd(0, "Choose new texture"); +- QDir texturesDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir textureDir("/usr/share/meshlab"); ++#else ++ QDir textureDir = QDir(qApp->applicationDirPath()); ++#endif + + #if defined(Q_OS_WIN) + if (texturesDir.dirName() == "debug" || +diff --git a/plugins_unsupported/render_rm/rmmeshrender.cpp b/plugins_unsupported/render_rm/rmmeshrender.cpp +index 9e516d2..f367842 100644 +--- a/plugins_unsupported/render_rm/rmmeshrender.cpp ++++ b/plugins_unsupported/render_rm/rmmeshrender.cpp +@@ -63,7 +63,11 @@ QList RmMeshShaderRenderPlugin::actions() + + void RmMeshShaderRenderPlugin::initActionList() { + +- QDir shadersDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir shadersDir("/usr/share/meshlab/shaders"); ++#else ++ QDir shadersDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (shadersDir.dirName() == "debug" || + shadersDir.dirName() == "release" || +diff --git a/plugins_unsupported/render_rm/rmshaderdialog.cpp b/plugins_unsupported/render_rm/rmshaderdialog.cpp +index 1f6c02b..6c8af80 100644 +--- a/plugins_unsupported/render_rm/rmshaderdialog.cpp ++++ b/plugins_unsupported/render_rm/rmshaderdialog.cpp +@@ -332,7 +332,11 @@ void RmShaderDialog::fillTabsWithPass(int index) + + QFileInfo finfo(v.textureFilename); + ++ #if defined(Q_OS_LINUX) ++ QDir textureDir("/usr/share/meshlab"); ++ #else + QDir textureDir = QDir(qApp->applicationDirPath()); ++ #endif + #if defined(Q_OS_WIN) + if (textureDir.dirName() == "debug" || textureDir.dirName() == "release" || textureDir.dirName() == "plugins" ) textureDir.cdUp(); + #elif defined(Q_OS_MAC) +@@ -444,7 +448,11 @@ void RmShaderDialog::valuesChanged(const QString & varNameAndIndex ) + // choose the filename with a dialog + QFileDialog fd(0,"Choose new texture"); + +- QDir texturesDir = QDir(qApp->applicationDirPath()); ++#if defined(Q_OS_LINUX) ++ QDir textureDir("/usr/share/meshlab"); ++#else ++ QDir textureDir = QDir(qApp->applicationDirPath()); ++#endif + #if defined(Q_OS_WIN) + if (texturesDir.dirName() == "debug" || texturesDir.dirName() == "release") texturesDir.cdUp(); + #elif defined(Q_OS_MAC) +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch new file mode 100644 index 000000000000..9f6d7487817f --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch @@ -0,0 +1,29 @@ +From 6310a419f2a0e0f11f59a60fee850a1b64c2f41e Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Fri, 24 Nov 2017 17:47:43 +0330 +Subject: [PATCH] update 1.3.3/pluginmanager.patch + +--- + common/pluginmanager.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp +index 5354055..551e73f 100644 +--- a/common/pluginmanager.cpp ++++ b/common/pluginmanager.cpp +@@ -189,8 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname) + + QString PluginManager::getBaseDirPath() + { ++ #if defined(Q_OS_LINUX) ++ QDir baseDir("/usr/lib/meshlab"); ++ #else + QDir baseDir(qApp->applicationDirPath()); +- ++ #endif + #if defined(Q_OS_WIN) + // Windows: + // during development with visual studio binary could be in the debug/release subdir. +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch new file mode 100644 index 000000000000..e01d5ebae851 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch @@ -0,0 +1,51 @@ +From 731519b5573ab503b78f2c892e2d5c4bcabef1ea Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Wed, 22 Nov 2017 23:33:11 +0330 +Subject: [PATCH] use-external-bzip + +--- + meshlabplugins/edit_arc3D/edit_arc3D.pro | 31 ------------------------------- + 1 file changed, 31 deletions(-) + +diff --git a/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlabplugins/edit_arc3D/edit_arc3D.pro +index 08b5860..75db42c 100644 +--- a/meshlabplugins/edit_arc3D/edit_arc3D.pro ++++ b/meshlabplugins/edit_arc3D/edit_arc3D.pro +@@ -28,34 +28,3 @@ SOURCES += edit_arc3D.cpp \ + TARGET = edit_arc3D + RESOURCES = edit_arc3D.qrc + +-win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib +-win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib +-win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/bz2.lib +-win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/bz2.lib +-win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/bz2.lib +-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/bz2.lib +-win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a +-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a +-mac:LIBS += -lbz2 +- +-win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 +-win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 +-win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5 +-win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5 +-win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5 +-win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5 +- +-win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 +- +- +-CONFIG(release, debug|release) { +- win32-g++:release:QMAKE_CXXFLAGS -= -O2 +- win32-g++:release:QMAKE_CFLAGS -= -O2 +- win32-g++:release:QMAKE_CXXFLAGS += -O3 -mtune=pentium3 -ffast-math +-} +- +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch new file mode 100644 index 000000000000..58d760499920 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch @@ -0,0 +1,95 @@ +From 3b698bccccaeeee03c4bf454971b9c4bc00f2450 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 01:22:19 +0330 +Subject: [PATCH] use-external-glew + +--- + common/common.pro | 7 ++++--- + meshlab/meshlab.pro | 8 ++++---- + meshlabserver/meshlabserver.pro | 8 ++++---- + 3 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/common/common.pro b/common/common.pro +index 8bdf6a5..0edc245 100644 +--- a/common/common.pro ++++ b/common/common.pro +@@ -1,7 +1,7 @@ + include (../general.pri) + #EXIF_DIR = ../external/jhead-2.95 + +-GLEWCODE = $$GLEWDIR/src/glew.c ++#GLEWCODE = $$GLEWDIR/src/glew.c + + win32-msvc2005:DESTDIR = ../distrib + win32-msvc2008:DESTDIR = ../distrib +@@ -55,7 +55,8 @@ fi;\ + " + INCLUDEPATH *= ../.. \ + $$VCGDIR \ +- $$GLEWDIR/include ++# $$GLEWDIR/include ++ + TEMPLATE = lib + linux-g++:CONFIG += dll + linux-g++:DESTDIR = ../distrib +@@ -80,7 +81,7 @@ QT += script + TARGET = common + DEPENDPATH += . + #INCLUDEPATH += . $$EXIF_DIR +-DEFINES += GLEW_STATIC ++#DEFINES += GLEW_STATIC + win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS +diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro +index 5456342..9d45834 100644 +--- a/meshlab/meshlab.pro ++++ b/meshlab/meshlab.pro +@@ -9,7 +9,7 @@ INCLUDEPATH *= . \ + .. \ + ../.. \ + $$VCGDIR \ +- $$GLEWDIR/include \ ++# $$GLEWDIR/include \ + # $$EXIF_DIR + + DEPENDPATH += $$VCGDIR \ +@@ -151,11 +151,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom + # win32-g++:release:LIBS += -L../common/release -lcommon + #} + +-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU ++linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW + linux-g++:QMAKE_RPATHDIR += ../distrib +-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU ++linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW + linux-g++-32:QMAKE_RPATHDIR += ../distrib +-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU ++linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW + linux-g++-64:QMAKE_RPATHDIR += ../distrib + + # uncomment in your local copy only in emergency cases. +diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro +index c9f5d0e..2b96033 100644 +--- a/meshlabserver/meshlabserver.pro ++++ b/meshlabserver/meshlabserver.pro +@@ -28,12 +28,12 @@ win32-msvc2008: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 + win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 + win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 + win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 +-win32-g++: LIBS += -L../distrib -lcommon +-linux-g++: LIBS += -L../distrib -lcommon ++win32-g++: LIBS += -L../distrib -lcommon ++linux-g++: LIBS += -L../distrib -lcommon -lGLEW + linux-g++:QMAKE_RPATHDIR += ../distrib +-linux-g++-32: LIBS += -L../distrib -lcommon ++linux-g++-32: LIBS += -L../distrib -lcommon -lGLEW + linux-g++-32:QMAKE_RPATHDIR += ../distrib +-linux-g++-64: LIBS += -L../distrib -lcommon ++linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW + linux-g++-64:QMAKE_RPATHDIR += ../distrib + #CONFIG (release,debug | release) { + # win32-msvc2005:release: LIBS += -L../common/release -lcommon +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch new file mode 100644 index 000000000000..002c2dc3bdf9 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch @@ -0,0 +1,56 @@ +From 68d92b2de5d598d4d85e2cdbddec5219ba317796 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Thu, 23 Nov 2017 01:21:10 +0330 +Subject: [PATCH] use-external-jhead + +--- + common/common.pro | 4 ++-- + meshlab/meshlab.pro | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/common/common.pro b/common/common.pro +index 51cdcb5..8bdf6a5 100644 +--- a/common/common.pro ++++ b/common/common.pro +@@ -1,5 +1,5 @@ + include (../general.pri) +-EXIF_DIR = ../external/jhead-2.95 ++#EXIF_DIR = ../external/jhead-2.95 + + GLEWCODE = $$GLEWDIR/src/glew.c + +@@ -79,7 +79,7 @@ QT += script + + TARGET = common + DEPENDPATH += . +-INCLUDEPATH += . $$EXIF_DIR ++#INCLUDEPATH += . $$EXIF_DIR + DEFINES += GLEW_STATIC + win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS + win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS +diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro +index 0e50581..5456342 100644 +--- a/meshlab/meshlab.pro ++++ b/meshlab/meshlab.pro +@@ -1,7 +1,7 @@ + include (../general.pri) + #CONFIG += debug_and_release + DESTDIR = ../distrib +-EXIF_DIR = ../external/jhead-2.95 ++#EXIF_DIR = ../external/jhead-2.95 + + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000 + +@@ -10,7 +10,8 @@ INCLUDEPATH *= . \ + ../.. \ + $$VCGDIR \ + $$GLEWDIR/include \ +- $$EXIF_DIR ++# $$EXIF_DIR ++ + DEPENDPATH += $$VCGDIR \ + $$VCGDIR/vcg \ + $$VCGDIR/wrap +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch new file mode 100644 index 000000000000..acbd8f4b5fed --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch @@ -0,0 +1,48 @@ +From 911bc805f89c464540fdce4c16e15f64476cf161 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Wed, 22 Nov 2017 19:25:35 +0330 +Subject: [PATCH] use-external-lib3ds + +--- + meshlabplugins/io_3ds/io_3ds.pro | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro +index 601f5da..5a19589 100644 +--- a/meshlabplugins/io_3ds/io_3ds.pro ++++ b/meshlabplugins/io_3ds/io_3ds.pro +@@ -9,31 +9,7 @@ HEADERS = meshio.h \ + io_3ds.h + + SOURCES += meshio.cpp \ +- +-DEFINES += LIB3DS_STATIC + + TARGET = io_3ds + +-INCLUDEPATH += ../../external/lib3ds-1.3.0/ +- +-# Notes on the paths of lib3ds files. +-# Once you have compiled the library put the lib files in a dir named lib/XXX/ +-# where XXX is the name of your system according to the QT naming style. +-# Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds +- +-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib +-win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/3ds.lib +-win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib +-win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib +-win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a +-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a +- +-# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds +- +-# mac:LIBS -= -l3ds +-# mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a +- +-macx:LIBS += $$MACLIBDIR/lib3ds.a + +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch new file mode 100644 index 000000000000..f107d5bc69e0 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch @@ -0,0 +1,37 @@ +From 0928f85bc8fb8215a98c5a115d85269f51f65b5e Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Wed, 22 Nov 2017 22:49:16 +0330 +Subject: [PATCH] use-external-muParser + +--- + meshlabplugins/filter_func/filter_func.pro | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro +index a7cc17a..23d5578 100644 +--- a/meshlabplugins/filter_func/filter_func.pro ++++ b/meshlabplugins/filter_func/filter_func.pro +@@ -6,20 +6,3 @@ SOURCES += filter_func.cpp + + TARGET = filter_func + +-INCLUDEPATH += ../../external/muparser_v225/include +- +-# Note: we need static libs so when building muparser lib use +-# ./configure --enable-shared=no +- +-win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib +-win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib +-win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/muparser.lib +-win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/muparser.lib +-win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib +-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib +- +-macx:LIBS += $$MACLIBDIR/libmuparser.a +-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a +-win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch new file mode 100644 index 000000000000..7c48aa14a747 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch @@ -0,0 +1,43 @@ +From 7af5fa63c7577d4da060a2a8442b2f453023be86 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Wed, 22 Nov 2017 22:41:39 +0330 +Subject: [PATCH] use-external-openctm + +--- + meshlabplugins/io_ctm/io_ctm.pro | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro +index 479b64e..434e6ad 100644 +--- a/meshlabplugins/io_ctm/io_ctm.pro ++++ b/meshlabplugins/io_ctm/io_ctm.pro +@@ -3,26 +3,6 @@ HEADERS += io_ctm.h \ + $$VCGDIR/wrap/io_trimesh/import_ctm.h \ + $$VCGDIR/wrap/io_trimesh/export_ctm.h + SOURCES += io_ctm.cpp +-INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib + TARGET = io_ctm + +-win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-msvc2010:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-msvc2012:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-msvc2015:QMAKE_CXXFLAGS += /DOPENCTM_STATIC +-win32-g++:DEFINES += OPENCTM_STATIC + +-win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/openctm.lib +-win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib +-win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib +-win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/openctm.lib +-win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/openctm.lib +-win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/openctm.lib +-win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a +-linux-g++:LIBS += ../../external/lib/linux-g++/libopenctm.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libopenctm.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libopenctm.a +-#macx:LIBS += ../../external/lib/macx/libopenctm.a +-macx:LIBS += $$MACLIBDIR/libopenctm.a +-- +2.15.0 + diff --git a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch new file mode 100644 index 000000000000..b372c7baf5e5 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch @@ -0,0 +1,10 @@ +--- a/meshlab_full.pro 2017-10-25 21:39:01.438252054 +0200 ++++ b/meshlab_full.pro 2017-10-25 21:39:25.417251424 +0200 +@@ -66,7 +66,6 @@ + meshlabplugins/edit_arc3D \ + meshlabplugins/edit_manipulators \ + meshlabplugins/edit_measure \ +- plugins_experimental/edit_mutualcorrs \ + meshlabplugins/edit_paint\ + meshlabplugins/edit_pickpoints \ + meshlabplugins/edit_point\ diff --git a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch new file mode 100644 index 000000000000..3d0eb74429b6 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch @@ -0,0 +1,10 @@ +--- a/meshlab_full.pro 2017-10-25 21:41:57.178247439 +0200 ++++ b/meshlab_full.pro 2017-10-25 21:42:11.629247060 +0200 +@@ -16,7 +16,6 @@ + meshlabplugins/io_x3d \ + meshlabplugins/io_expe \ + meshlabplugins/io_pdb \ +- plugins_experimental/io_TXT \ + # Filter plugins + meshlabplugins/filter_aging \ + meshlabplugins/filter_ao \ diff --git a/media-gfx/meshlab/meshlab-1.3.2.ebuild b/media-gfx/meshlab/meshlab-1.3.2.ebuild deleted file mode 100644 index 8e91280e50f7..000000000000 --- a/media-gfx/meshlab/meshlab-1.3.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator multilib qt4-r2 - -DESCRIPTION="A mesh processing system" -HOMEPAGE="https://meshlab.sourceforge.net/" -MY_PV="$(delete_all_version_separators ${PV})" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="dev-cpp/eigen:3 - dev-cpp/muParser - dev-qt/qtcore:4 - dev-qt/qtopengl:4 - media-libs/glew:0= - media-libs/qhull - =media-libs/lib3ds-1* - media-libs/openctm - sci-libs/levmar - sys-libs/libunwind" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/meshlab/src" - -src_prepare() { - rm "${WORKDIR}"/meshlab/src/distrib/plugins/*.xml - rm "${WORKDIR}"/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h - cd ${PORTAGE_BUILDDIR} - #patches from debian repo - cd "${WORKDIR}" - epatch "${FILESDIR}/${PV}"/01_crash-on-save.patch \ - "${FILESDIR}/${PV}"/02_cstddef.patch \ - "${FILESDIR}/${PV}"/03_disable-updates.patch \ - "${FILESDIR}/${PV}"/05_externals.patch \ - "${FILESDIR}/${PV}"/06_format-security.patch \ - "${FILESDIR}/${PV}"/07_gcc47.patch \ - "${FILESDIR}/${PV}"/08_lib3ds.patch \ - "${FILESDIR}/${PV}"/09_libbz2.patch \ - "${FILESDIR}/${PV}"/10_muparser.patch \ - "${FILESDIR}/${PV}"/11_openctm.patch \ - "${FILESDIR}/${PV}"/12_overflow.patch \ - "${FILESDIR}/${PV}"/13_pluginsdir.patch \ - "${FILESDIR}/${PV}"/14_ply_numeric.patch \ - "${FILESDIR}/${PV}"/15_qhull.patch \ - "${FILESDIR}/${PV}"/16_shadersdir.patch \ - "${FILESDIR}/${PV}"/17_structuresynth.patch \ - "${FILESDIR}/${PV}"/18_glew.c18p1.patch \ - "${FILESDIR}/${PV}"/19_CONFLICTS_IN_rpath.patch \ - "${FILESDIR}/${PV}"/20_rpath.c18p2.patch \ - "${FILESDIR}/${PV}"/21_RESOLUTION.patch \ - "${FILESDIR}/${PV}"/22_aliasing.patch -} - -src_configure() { - eqmake4 external/external.pro - eqmake4 meshlab_full.pro -} - -src_compile() { - cd external && emake - cd .. && emake -} - -src_install() { - dobin distrib/{meshlab,meshlabserver} - dolib distrib/libcommon.so.1.0.0 - dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 - dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so - - exeinto /usr/$(get_libdir)/meshlab/plugins - doexe distrib/plugins/*.so - - insinto /usr/share/meshlab/shaders - doins -r distrib/shaders/* - newicon "${S}"/meshlab/images/eye64.png "${PN}".png - make_desktop_entry meshlab "Meshlab" -} diff --git a/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild deleted file mode 100644 index badcfa5d477f..000000000000 --- a/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils versionator - -DESCRIPTION="A mesh processing system" -HOMEPAGE="https://meshlab.sourceforge.net/" -MY_PV="$(delete_all_version_separators ${PV})" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="dev-cpp/eigen:3 - dev-cpp/muParser - dev-qt/qtcore:4 - dev-qt/qtopengl:4 - dev-qt/qtxmlpatterns:4 - media-libs/glew:0= - media-libs/qhull - =media-libs/lib3ds-1* - media-libs/openctm - sci-libs/levmar - sys-libs/libunwind - sci-libs/mpir" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/meshlab/src" - -PATCHES=( "${FILESDIR}/${PV}/gcc-4.7.patch" - "${FILESDIR}/${PV}/lapack.patch" - "${FILESDIR}/${PV}/mpir.patch" - "${FILESDIR}/${PV}/qt-4.8.patch" - "${FILESDIR}/${PV}/rpath.patch" - "${FILESDIR}/${PV}/pluginmanager.patch" - "${FILESDIR}/${PV}/meshrender.patch" - "${FILESDIR}/${PV}/rmmeshrender.patch" - "${FILESDIR}/${PV}/rfx.patch" - "${FILESDIR}/${PV}/structuresynth.patch" ) - -src_prepare() { - cd "${WORKDIR}" || die - default -} - -src_configure() { - qmake -recursive external/external.pro - qmake -recursive meshlab_full.pro -} - -src_compile() { - cd external && emake - cd .. && emake -} - -src_install() { - dobin distrib/{meshlab,meshlabserver} - dolib distrib/libcommon.so.1.0.0 - dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 - dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so - - exeinto /usr/$(get_libdir)/meshlab/plugins - doexe distrib/plugins/*.so - - insinto /usr/share/meshlab/shaders - doins -r distrib/shaders/* - newicon "${S}"/meshlab/images/eye64.png "${PN}".png - make_desktop_entry meshlab "Meshlab" -} diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild b/media-gfx/meshlab/meshlab-2016.12.ebuild new file mode 100644 index 000000000000..dcef47388f37 --- /dev/null +++ b/media-gfx/meshlab/meshlab-2016.12.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="the open source system for processing and editing 3D triangular meshes" +HOMEPAGE="http://www.meshlab.net" +VCG_VERSION="1.0.1" +SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="-minimal" +DEPEND="dev-cpp/eigen:3 + dev-cpp/muParser + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtxmlpatterns:5 + >=media-gfx/jhead-3.00-r2 + media-libs/glew:0 + media-libs/qhull + =media-libs/lib3ds-1* + media-libs/openctm + sci-libs/levmar + sci-libs/mpir" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}/meshlab-${PV}/src" + +PATCHES=( + "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch" + "${FILESDIR}/${PV}/0001-update-1.3.3-pluginmanager.patch.patch" + #remove ot working plugins + "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch" + "${FILESDIR}/${PV}/remove-io_TXT.patch" + #since structure synth doesn't seem to be compiling + "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch" + #this has been fixed in the tree + "${FILESDIR}/${PV}/0001-disable-edit-quality.patch" + #this causes segfaults + "${FILESDIR}/${PV}/0001-disable-filter-layer.patch" + #for when we use minimal + "${FILESDIR}/${PV}/0001-compile-server.patch" + "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch" + "${FILESDIR}/${PV}/0001-use-external-openctm.patch" + "${FILESDIR}/${PV}/0001-use-external-muParser.patch" + "${FILESDIR}/${PV}/0001-use-external-bzip.patch" + "${FILESDIR}/${PV}/0001-use-external-jhead.patch" + "${FILESDIR}/${PV}/0001-use-external-glew.patch" + #cause gnu stack quickstart related qa + "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch" + ) + +src_prepare(){ + mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed" + default + #proof of patchset + #remove libs that are being used from the system + rm -r "external/lib3ds-1.3.0" || die "rm failed" + rm -r "external/OpenCTM-1.0.3" || die "rm failed" + rm -r "external/muparser_v132" || die "rm failed" + rm -r "external/muparser_v225" || die "rm failed" + rm -r "external/bzip2-1.0.5" || die "rm failed" + rm -r "external/jhead-2.95" || die "rm failed" + rm -r "external/glew-1.5.1" || die "rm failed" + rm -r "external/glew-1.7.0" || die "rm failed" + #we still depend on lm.h + #rm -r "external" + rm -r "distrib/plugins/U3D_W32" || die + rm -r "distrib/plugins/U3D_OSX" || die +} + +src_configure() { + use minimal || eqmake5 -r meshlab_full.pro + use minimal && eqmake5 -r meshlab_mini.pro +} + +src_install() { + dobin distrib/{meshlab,meshlabserver} + dolib distrib/libcommon.so.1.0.0 + dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 + dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so + exeinto /usr/$(get_libdir)/meshlab/plugins + doexe distrib/plugins/*.so + insinto /usr/share/meshlab/shaders + doins -r distrib/shaders/* + insinto /usr/share/meshlab/plugins + doins -r distrib/plugins/* + insinto /usr/share/meshlab/textures + doins -r distrib/textures/* + insinto /usr/share/meshlab/sample + doins -r distrib/sample/* + newicon "${S}"/meshlab/images/eye512.png "${PN}".png + make_desktop_entry meshlab "Meshlab" "${PN}" Graphics +} diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml index 2c2e1a6a68f3..0b461a28eacc 100644 --- a/media-gfx/meshlab/metadata.xml +++ b/media-gfx/meshlab/metadata.xml @@ -9,11 +9,11 @@ Gentoo 3D print - Printrun is a set of G-code sending applications for RepRap. - It consists of printcore (dumb G-code sender), pronsole (featured command line - G-code sender), pronterface (featured G-code sender with graphical user - interface), and a small collection of helpful scripts. - + Printrun is a set of G-code sending applications for RepRap. + It consists of printcore (dumb G-code sender), pronsole (featured command line + G-code sender), pronterface (featured G-code sender with graphical user + interface), and a small collection of helpful scripts. + meshlab -- cgit v1.2.3