From f4b0200e8372d3057e99dc849654b44dc61984d7 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sun, 7 Dec 2014 06:09:51 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-strategy/megaglest/ChangeLog | 15 +- games-strategy/megaglest/Manifest | 42 +---- .../files/megaglest-3.6.0.3-as-needed.patch | 30 ---- .../files/megaglest-3.6.0.3-build.patch | 25 --- .../files/megaglest-3.6.0.3-gcc-4.7.patch | 34 ---- .../megaglest-3.6.0.3-static-build.patch | 107 ----------- .../files/megaglest-3.7.0-as-needed.patch | 31 ---- .../files/megaglest-3.7.0-cmake.patch | 36 ---- .../files/megaglest-3.7.0-static-build.patch | 116 ------------ .../files/megaglest-3.7.1-as-needed.patch | 30 ---- .../files/megaglest-3.7.1-gcc47.patch | 25 --- .../files/megaglest-3.7.1-miniupnpc-1.8.patch | 158 ----------------- .../files/megaglest-3.7.1-static-build.patch | 116 ------------ .../megaglest-3.9.0.4-static-build.patch | 63 ------- .../megaglest/megaglest-3.6.0.3.ebuild | 166 ----------------- .../megaglest/megaglest-3.7.0.ebuild | 159 ----------------- .../megaglest/megaglest-3.7.1.ebuild | 159 ----------------- .../megaglest/megaglest-3.9.0.4.ebuild | 167 ------------------ 18 files changed, 15 insertions(+), 1464 deletions(-) delete mode 100644 games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.6.0.3-build.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.6.0.3-static-build.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.0-as-needed.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.0-cmake.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.0-static-build.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch delete mode 100644 games-strategy/megaglest/files/megaglest-3.9.0.4-static-build.patch delete mode 100644 games-strategy/megaglest/megaglest-3.6.0.3.ebuild delete mode 100644 games-strategy/megaglest/megaglest-3.7.0.ebuild delete mode 100644 games-strategy/megaglest/megaglest-3.7.1.ebuild delete mode 100644 games-strategy/megaglest/megaglest-3.9.0.4.ebuild diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index cde5e067577a..8b4f1939df6e 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.24 2014/12/05 10:16:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.25 2014/12/07 06:09:45 mr_bones_ Exp $ + + 07 Dec 2014; Michael Sterrett + -files/megaglest-3.6.0.3-as-needed.patch, + -files/megaglest-3.6.0.3-build.patch, -files/megaglest-3.6.0.3-gcc-4.7.patch, + -files/megaglest-3.6.0.3-static-build.patch, + -files/megaglest-3.7.0-as-needed.patch, -files/megaglest-3.7.0-cmake.patch, + -files/megaglest-3.7.0-static-build.patch, + -files/megaglest-3.7.1-as-needed.patch, -files/megaglest-3.7.1-gcc47.patch, + -files/megaglest-3.7.1-miniupnpc-1.8.patch, + -files/megaglest-3.7.1-static-build.patch, + -files/megaglest-3.9.0.4-static-build.patch, -megaglest-3.6.0.3.ebuild, + -megaglest-3.7.0.ebuild, -megaglest-3.7.1.ebuild, -megaglest-3.9.0.4.ebuild: + old 05 Dec 2014; Agostino Sarubbo megaglest-3.9.1-r1.ebuild: Stable for x86, wrt bug #518196 diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 3a6613bedc6a..a321005b7892 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -1,46 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX megaglest-3.6.0.3-as-needed.patch 909 SHA256 e3b2117f9e524e44e815d9fe7d56c7f807d0e6fd78d582f7dfa7ac0bd82d97c7 SHA512 4c2d371ebc132c5c608a2f5110af00001fb8214a0f99bd8bf1b6af61e0e5679df5593011bd2cf63489974b817ac133c157b46acf2398f11c9294e11215aae5e3 WHIRLPOOL c1397df2335f2076cf1bae3e68f02c9b717def51c706b3d7716436ee0df003fb8a5ad9927594612d0800ec13f71bdf4f90369234b70f9e5a37a7a0155f87a5e8 -AUX megaglest-3.6.0.3-build.patch 1050 SHA256 fe00f58335e551b29e23efd66cb6ff16780d81c992522601981bd2a211932bc1 SHA512 f1ab9698f2a91a765a888030bb317d4ae6093f6070d7f068d142993100975be826c6db84278a6bb662b6a2e25df94b5968aa10cf9db08083d76e9c4beb4b2f62 WHIRLPOOL 04d1b7e3cd40a265a6ba181a63b28fbf5edef2b88174afda71fc5940ce2f3a65fbf77db1531c6e368619904bc5ab940279442c4d9a1b301d7f03ee9ac4020cfb -AUX megaglest-3.6.0.3-gcc-4.7.patch 910 SHA256 76527db1795587d64d4d7eb0ec9be540f5abf9619d469095f6c24e9c12d261cc SHA512 d406910fc7ab04c142e565b61b91347b20a842ca10e5575e11e788d6d147f994f5ed441d6f3b8f6155da2bcb4288a81d0387ed1bdb4f21302713b657891916e2 WHIRLPOOL 6f8b31233b607d26e64d78f8255e15d3917b239f4a084ac2e8b6c5587f8c88c40f11519403555319db0a11cddffe73a7ef3b4dfbfc1d8af8d9e54f9025788a67 -AUX megaglest-3.6.0.3-static-build.patch 3821 SHA256 cca9eb7180bd4f47030d96d95ea0ff63b6ba567d1ace43df908bcb847d9b1c26 SHA512 2706643eaa597bc2629179541f180508c4d7f89f205e9a5a072671acaf0bb519ff216a5dc06feb11b74ff5614c9ef8e58f5031f3aaa66c1b27ab2f7b32927d60 WHIRLPOOL 2125cf9ab83e01d5a2987b5bf9f07f0a4e33d742585b0ff58bb6c0ae115cd2055bf4442ab26483bececa9fcba324a872af36d7a8cbb6f920797cfafbf595c28f -AUX megaglest-3.7.0-as-needed.patch 952 SHA256 16c9f661e91c1415934f6e3f52a5a2603273d117518b832a508c6c2dba0581e3 SHA512 290cecd7175b39a61291eb377f2df9411324dd945778d30c630427dbab9fc8eec5ce7a122647ec58a2a87cb2793835d600e66c83c1189a73c214fe08a7892285 WHIRLPOOL 20ae9e20c0aecfdc84034456724ff8fdf2a7a2ce8e96139f29f9077566edd22e1c6c9b722edaf776871e4c041be926063b35dcafdc3a2874b2e7c9ae27f5b4bf -AUX megaglest-3.7.0-cmake.patch 1338 SHA256 745762db3540ce2c376706d2bd40e9cb6654e4360e53ab1509f8a3a7d56d4fe2 SHA512 38e24af6958b374155ba651d80088f3fffedc4099a136e4e7955a48faa6e4a42dbc2942b1eea5bd1768a3cbbaaa6c3f3faed384fec8178f9f79974510f97fba0 WHIRLPOOL f7d9b5f0a0810b946547c8222fbcf824ff7adac8be55bbf931ddaa9e4ea55b88b4e3ba53e6d49f4f18e7e591860be0be5001767187e0818c2d09a8c0b2a4ac1d -AUX megaglest-3.7.0-static-build.patch 4148 SHA256 aad7b46e8825f951f0f07d1d60be3a7b9e4728b870b59c1589f86ef6335347d1 SHA512 7c3beff249c48969280e053dbc7eec8f2a22e817b2d05df18abc9bdfa97ad3a7a3132700077a08efda85d039bb501c62cf3ddb50b408f7e9e83bbb03cd1123fa WHIRLPOOL 4ad78f27ebc4dd6726d26ecb2b30e22af07ba17944bb4907a5156092d7388c510b3dc9ffa244fc2d83d6bf39274b32350038cdd20427d551185b28eaf3bc5e77 -AUX megaglest-3.7.1-as-needed.patch 905 SHA256 2add7ce9a6fb69c16a5da4513c57839a66abfe22995136e2617bf85c3697fa9d SHA512 cec1c5fec30b1cd7378b6cd18e09a513c1bcd64d5149af4c2bb3fbc2ff134914e96e142d78b56f6037a9e3975f3bd689894dcdc66aaae83ee59e1cd57ecb5d2b WHIRLPOOL 8e5a15b8d8798327ed8f444b2a6429327be2bd577bf1c58a8f516cad7b6f7babb57d415e8af2ba78e5b83b6918bc67da10b87f505d02e216ab777f2fc1f30bda -AUX megaglest-3.7.1-gcc47.patch 1033 SHA256 3b68d2cc802ef53a47570faf3d15164efa94e941a40f69b188af56a7d1c09596 SHA512 113671cb7b15c56337b14e561a6a55704c10cfcf8f7897bcf78600e827030bb5108ba8e3d6b39ae5dd21a5a0f156fbdce97c4cb881bdc984e93f0545f7a94370 WHIRLPOOL ce02363705ed2504d6d6e2fd6e9482705f186018e343655dc7505350692d2fd3b69118863b7a656b3e280267102ddaf85284119cdc8c5dbb5d5d60281f921bd8 -AUX megaglest-3.7.1-miniupnpc-1.8.patch 6273 SHA256 d93fcd76a9fdbbb72b6b6c9bc2abde64433727f5833bf9e3adf145091beb05d7 SHA512 54c5c45dfe211ec462ec38c67696bbd40b630ea8976bc06d3bd704773d14aefbab7a2e60ab7e80b092b384da7ce19955cd8d5c6c140f4201ec9adefd6a9f67b3 WHIRLPOOL 9b9841aebb853fec5cf711af79f31fc5413f9626f4998822f76cd23e9624daf44cbd061cf4b467b8a019b75df7966a789cf53771dd8761bb3bdcc6efee4bf454 -AUX megaglest-3.7.1-static-build.patch 4008 SHA256 8067115f3424ce213c87ed476d227aebe5f910de935d65bb96c079b6faf44cff SHA512 0403e04783009c66a0199b2c3c793b74dd11cc89189b29494e56b826297afab8349a4e4ad1c5c5c6dc302e9d1b82b62f010ec379e28d6760c0ee89803ceef571 WHIRLPOOL 0bc7c36b10d9256dd5cc49b2c0fba93f2874b7cbf26aed7dd91f20675dff4d742736866960138d66516c4e27ca63be69f0248f82376e32494967f7125af9d291 -AUX megaglest-3.9.0.4-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c AUX megaglest-3.9.1-cmake.patch 800 SHA256 2d773202f24a25bedf0369a5000de5a5d024cebad21685f62fac532c07b31c98 SHA512 063ff67139ec702c100b93a488daa6cf6b34909860fdbb964c242c7464876947ba45dd9dfee084f8f37dcc2c16dc8bb80842cbf497e36810745df5a29d73d7da WHIRLPOOL fbc198abc48a6d09d1247d8fd7bed084acf9b9d60e74ea3a4e90d19390ed09eeb9820861ec3096dce9943c850216addd195b91bf9231de4419f256fa758124da AUX megaglest-3.9.1-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c -DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f -DIST megaglest-source-3.7.0.tar.xz 1442444 SHA256 5fdf2ed072c8a207a42b280929a7ce097ed6f966b2b85a7f0a89e741ac5cca23 SHA512 113bb59a4f8ec2b0d83b30952f7723c8a9a835b4854a083327c13a87f69c45d66184025bc0dd1af4ebfebeaa6d8ea7f488b859bcb8c04a8ecc5bcad8ac8bb35c WHIRLPOOL 16c5c56c0b8b9374b024178a3d780a21b7594398acb27f4d32ede39567edb6238a1122baaa57272134e62ae2de7c855db8384efd31d6171b7dbc4717249f63a6 -DIST megaglest-source-3.7.1.tar.xz 1439864 SHA256 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26 SHA512 b285421175d7eeb7c52c45c9397d270ed4352ec1c9f547b5a18ec596d676a8fd00b54d7138c9b6ccba07bc8218054587ccb9822c30216a846d4da64c7a2ae600 WHIRLPOOL a8d50d49b9470aaf29121e427ee9137980f0fcbc11f962217581d679d6e7d10c2daa5a68648b45c5384ff1bfed7cfa73fb2600cf872b12f64f59729ca759872f -DIST megaglest-source-3.9.0.4.tar.xz 1596692 SHA256 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3 SHA512 5680461565837aa8eabcfc248cdfe9758bd25aabf2f419d14eea2ca94b3bc975b553e099cf59aeae38509f43798d9ede95ff8f6bed327177186d9e16f1697b69 WHIRLPOOL b2c30ce662ee718513a0d7b38265f1d334ef471df8b98b56213c7ce43b7ecdda2c96b45da411df43414ea41e61e90f41c0fb6dd51ca84c99ac366150192c5678 DIST megaglest-source-3.9.1.tar.xz 2957360 SHA256 e62314b8108ba3c80706aa896f4fed5992a8ea8d82a410e09fbb242c4bf54edc SHA512 2a3d402aa68a1b1ee326bf49b6b6dee5ed561623b541ab47c1545596fa9c77f805245b66bd8457ecd82625a3f1d4868269a4a3888a54245c73d9cb6babbace70 WHIRLPOOL 59ad629c66633b2f320c7c80eef627f4326cbacb0cc48169c33b6783bfc26d1a8baef1773f0d05a1bc589ec5ae6bbedbb1f394c34616b166faa6e7f9630a22e5 -EBUILD megaglest-3.6.0.3.ebuild 4598 SHA256 436c75ce64cb7f9ff6716bb69ec9723638b54d89aac0718e1cad81979f6510ec SHA512 eb934db2627445fcc3cafc78f3dd6fc93c90e6c4df8d4b3636d1de6d6c2c3e38888a9742bb6788d1f3e291a9aa6bdc8a291bd7829e27d3a596619c2668dcc61a WHIRLPOOL 6c1f2b99ca7ee72bf5ac728a65a3ebd922594f133b58d0f208cbc20d95ea8099eeeefc24316c371e71a97b90c77b324cb6af2250f6ce0910afe1c11943264ef1 -EBUILD megaglest-3.7.0.ebuild 4284 SHA256 374202f38f0716988aabef6049ed1f57609412894d8f58d6e7837eda8ec1ee7c SHA512 90d611ab30cbe852a81826e234236de8f0a80f6b05f9a0d3bf2f219256a51e75161102490409ddb944aaa2717b2137c30a219ff21f73498fe8a964dc235812e4 WHIRLPOOL 121b545abc365b447cf14f51bf317bbbe30e17cb946699e93a89e0169ae2c5e98c3cf7377b6bcade27895edbf32194165b8833895b44342783f993f20e8373bc -EBUILD megaglest-3.7.1.ebuild 4295 SHA256 dd26ff54e411c3dbdd1c7141219775f65423f99f32d8056b5336ef1cb627efa8 SHA512 4ab8e1c9f9818625f5dd2c135574ddc2d76eb0ecba62ea564be9cdfef532d72e4239825d4879eb4cf8067d5799d2c422edf5fa31e4ec09af2cdb8f6d282a08ce WHIRLPOOL ce50a93d22ebc24c9b0208135cdcd696e3361ce19e6491d893149fc41b3a921b4ac0b5b6d52b3e759913107f54271eec198472d06d6b31b85466a344a8f3adc4 -EBUILD megaglest-3.9.0.4.ebuild 4470 SHA256 85deb6066e5c8d363936d8b0aeb15900df4b081a0d46d0b99fe2d101f4f71447 SHA512 868dffa17b64f8f2a806f78004f76b1e155a038ae480939111f3b63099d63a4d45438834dfb82ae103f8ccfd9650525e30196add2bb1060483968be770fbb3be WHIRLPOOL 8fb1c249fc8a8edaa46c3c560d3460fe71623a9bdde402aaf2d1195dbdeed1d5526509b7688b9c94d73f25ce531d46752696dde938fa50d10a93c5a6e01a1dad EBUILD megaglest-3.9.1-r1.ebuild 4507 SHA256 9ffa96462ebf1b35543995c42573b6230713b9fd174eaaf3cc7e8edac881cd0c SHA512 1aee553d9b6bfdbf267bb5532bcf3168c64a5f20d54336ba9bb431da424af4f35eb30023acb81126a3fdcf724055d23d82c446812bee62f0c8890af5dcfa9a58 WHIRLPOOL 1350516c2b974151c4cff7045ec9d6d71f22102b30fe316a7b10ce316080d833ad713c82ce1b7caa45a6d51f5789b1e338082a727236518d8cf32decb4ac571d -MISC ChangeLog 4275 SHA256 5d03e2a1a4d8f0a3c0ba08aa5485e402541648537d5af5d5609b2b69cc497532 SHA512 7485c999b9cd87e622c13e4e6778cb2c19095aca08419641aa8b456a2d73ea0715b19eb11d4e4069e3927ab15af8ac42d19a1eb99c4ddf53caf27fc77770be4d WHIRLPOOL 09f51dc7dd7dfa7c00b0fe551be182f713864ae8a6f617e6b71485e98c7a412f55a5a85eaee4d8082741bda63336eca95092a9d71ed6573ef021c0c16dbe3c8d +MISC ChangeLog 4959 SHA256 e52351db45f29e3ae17260bfb9fa1f46aab0cf09272a6d3629d7ecc93693cf48 SHA512 edb0fce9445ab21b2deb203f849ab669a9da1b76e59ae8b8534860b01398ad1a2114888af8d2b562bd9104d2e8107c766f3bab7f26741593c88e7894ffe2415d WHIRLPOOL 28271227387892ef5b31ffadf824cddb9892dfe1ce08d20d2c817b407b77581d70837dccfcd5b44516fbb5e9b513ad6ca80a4e69e11577745dc07644f6f434e6 MISC metadata.xml 1508 SHA256 b48e1ebe66f512e94842536838ff7a5c2de67c47f45bbc86bcd07032e6451e16 SHA512 d76111a570d1681c89f6376915bf0f455f301a7ec9cd7afec4b7308bd9b33fc0d4e44da0c07d7e1a1b237286fd9d36c766fd8083e2aefaf27bf224d1285f846d WHIRLPOOL c3ceac103e3c0e626a25b5ba8dadba1360bd5d05c24af127140d030094d75de250fe9f161556769004326ce76cd98ac4d526cf8c0a21980b2babd69f9065aca9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUgYXjAAoJELp701BxlEWfgywP/2lzkLjCg90QYINuINK54wJ4 -Lky0sHWAsIWznVwv2W9Bf84m/IgPUFhyvcXVnxw7oUre6w2D1vgC/Vl90z2GxgTa -HKiC6zS23SvVZeYnNYEk+27wFyrSf7PNJrV/m0PtV5GJwGtc4MUbuiIwsKkulbqP -tZ+xsLf58UzJkcX85ApQ/DMhXkyzondH4f0tsYU3nrbRtgPi0jmwgZYjPuIgvkF2 -zrfVK9F/ukE72GBw8z6R/asLT05hcpsnga/GeHYnm0+0CRmGE4WGyG7SnDkUK5lJ -c8X2HJgvZ6jJg5/Z1fLmVP+SnNvcOMWcoRXPfc3p41C58lfzBU9pwk3WBb+1mEj6 -g/MlKfrEZP26iXAl+cywaln6N5gotaNLjGIvlwbj6DdUjkgVWmDUOpZqQlI8JVui -Opur1zPQhs+p2LnREMr2Yw5xiWvm5a8IBQQQ+anF0B9c/260Zx9FIsqWESCnfMjN -a7IF5WsZHPIuO39afO0USS5q7Ik7TH/gVfj/Qb66RVQmXMvTKy8n2bAaJLH8c7QM -pknUTZo2LTh3pGZ3VHhBw1fO/DrTvn3aQ2O8CBy2jHPmudIkv1Nck7mA9OyZmoo2 -8mX6/e3t4jt18z1ahxatO6KtUcCdkCjPnCdzUeqmVKgdrra4AAAoI17uQJYFk6Oo -3bZu43UaF4b4PEbAKt99 -=VrAz ------END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch deleted file mode 100644 index 4dc5fd10b3fd..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Julian Ospald -Date: Fri Aug 31 23:45:34 UTC 2012 -Subject: fix as-needed - -reorder linker line (curl after libircclient) - ---- source/shared_lib/CMakeLists.txt -+++ source/shared_lib/CMakeLists.txt -@@ -47,9 +47,6 @@ - - FIND_PACKAGE(CURL REQUIRED) - INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) -- IF(UNIX) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -- ENDIF() - # check libcurl version # - IF(WIN32) - file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS) -@@ -293,6 +290,11 @@ - SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - endif() - -+ # fix linking order, curl after libircclient -+ IF(UNIX) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -+ ENDIF() -+ - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") - check_cxx_source_runs(" diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-build.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-build.patch deleted file mode 100644 index cc6862f26209..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.6.0.3-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Julian Ospald -Date: Sat Aug 18 16:07:26 UTC 2012 -Subject: build system - -fixes compilation when -DBUILD_MEGAGLEST_CONFIGURATOR=OFF is set -and when other targets are disabled - -configurator is deprecated/unstable and will be removed next release - ---- megaglest-3.6.0.3/CMakeLists.txt -+++ megaglest-3.6.0.3/CMakeLists.txt -@@ -243,9 +243,12 @@ - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/shared_lib ) - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_game ) - #if(wxWidgets_FOUND) -+ IF(BUILD_MEGAGLEST_MAP_EDITOR) - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor ) -+ ENDIF(BUILD_MEGAGLEST_MAP_EDITOR) -+ IF(BUILD_MEGAGLEST_MODEL_VIEWER) - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer ) -- ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator ) -+ ENDIF(BUILD_MEGAGLEST_MODEL_VIEWER) - #else() - # MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine") - # MESSAGE(STATUS "map editor, g3d viewer, configurator") diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch deleted file mode 100644 index 53142f32a6d5..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Julian Ospald -Date: Mon Oct 29 19:15:35 UTC 2012 -Subject: fix compilation for gcc-4.7 - - https://bugs.gentoo.org/show_bug.cgi?id=440134 - ---- source/shared_lib/sources/util/util.cpp -+++ source/shared_lib/sources/util/util.cpp -@@ -9,6 +9,8 @@ - // License, or (at your option) any later version - // ============================================================== - -+#include -+ - #include "util.h" - - #include ---- source/shared_lib/include/graphics/math_util.h -+++ source/shared_lib/include/graphics/math_util.h -@@ -184,10 +184,10 @@ - - Rect2 computeBoundingRect() const{ - return Rect2i( -- min(p[0].x, p[1].x), -- min(p[0].y, p[2].y), -- max(p[2].x, p[3].x), -- max(p[1].y, p[3].y)); -+ std::min(p[0].x, p[1].x), -+ std::min(p[0].y, p[2].y), -+ std::max(p[2].x, p[3].x), -+ std::max(p[1].y, p[3].y)); - } - - bool isInside(const Vec2 &pt) const{ diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-static-build.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-static-build.patch deleted file mode 100644 index a561585c90c1..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.6.0.3-static-build.patch +++ /dev/null @@ -1,107 +0,0 @@ -From: Julian Ospald -Date: Sat Aug 18 13:41:33 UTC 2012 -Subject: build system - -fix static build - ---- megaglest-3.6.0.3/source/shared_lib/CMakeLists.txt -+++ megaglest-3.6.0.3/source/shared_lib/CMakeLists.txt -@@ -240,21 +240,9 @@ - streflop/libm_flt32_source) - ENDIF() - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for miniupnpc since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Miniupnpc) -- ENDIF() -- -- if(NOT MINIUPNP_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED miniupnpc since dev system does not have it... MINIUPNP_FOUND [${MINIUPNP_FOUND}]") -- -- SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/miniupnpc) -- else() -- MESSAGE(STATUS "*** Using SHARED miniupnpc found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) -- endif() -+ FIND_PACKAGE(Miniupnpc REQUIRED) -+ INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) - - IF(APPLE) - SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/sdl) -@@ -276,22 +264,9 @@ - SET(MG_SOURCE_FILES "") - INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}platform/sdl ) - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Ircclient) -- ENDIF() -- -- if(NOT IRCCLIENT_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED libircclient since dev system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") -- -- SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) -- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/libircclient/include) -- else() -- MESSAGE(STATUS "*** Using SHARED libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) -- endif() -+ FIND_PACKAGE(Ircclient REQUIRED) -+ INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") -@@ -415,8 +390,11 @@ - IF(WANT_STREFLOP) - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) - ENDIF() -- TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) -- -+ IF(WANT_STATIC_LIBS) -+ TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS} dl) -+ ELSE(WANT_STATIC_LIBS) -+ TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) -+ ENDIF(WANT_STATIC_LIBS) - ENDIF() - - #IF(BUILD_MEGAGLEST_UPNP_DEBUG) ---- megaglest-3.6.0.3/mk/cmake/Modules/FindMiniupnpc.cmake -+++ megaglest-3.6.0.3/mk/cmake/Modules/FindMiniupnpc.cmake -@@ -31,7 +31,11 @@ - - find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h - PATH_SUFFIXES miniupnpc) --find_library(MINIUPNP_LIBRARY miniupnpc) -+IF(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.a) -+ELSE(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.so) -+ENDIF(WANT_STATIC_LIBS) - - if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) - set (MINIUPNP_FOUND TRUE) ---- megaglest-3.6.0.3/mk/cmake/Modules/FindOGG.cmake -+++ megaglest-3.6.0.3/mk/cmake/Modules/FindOGG.cmake -@@ -19,11 +19,11 @@ - - FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) - --#IF (OGG_STATIC AND NOT OGG_LIBRARY) --# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) --#ELSE() -- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) --#ENDIF() -+IF (OGG_STATIC) -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) -+ELSE() -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) -+ENDIF() - - #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) - # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) diff --git a/games-strategy/megaglest/files/megaglest-3.7.0-as-needed.patch b/games-strategy/megaglest/files/megaglest-3.7.0-as-needed.patch deleted file mode 100644 index 005549ade1e7..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.0-as-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Julian Ospald -Date: Fri Aug 31 23:45:34 UTC 2012 -Subject: fix as-needed - -reorder linker line (curl after libircclient) - ---- source/shared_lib/CMakeLists.txt -+++ source/shared_lib/CMakeLists.txt -@@ -47,9 +47,7 @@ - - FIND_PACKAGE(CURL REQUIRED) - INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) -- IF(UNIX) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -- ENDIF() -+ - # check libcurl version # - IF(WIN32) - file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS) -@@ -308,6 +306,11 @@ - INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) - SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - -+ # fix linking order, curl after libircclient -+ IF(UNIX) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -+ ENDIF() -+ - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") - include(CheckCXXSourceRuns) diff --git a/games-strategy/megaglest/files/megaglest-3.7.0-cmake.patch b/games-strategy/megaglest/files/megaglest-3.7.0-cmake.patch deleted file mode 100644 index a3c65ce8cfd5..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.0-cmake.patch +++ /dev/null @@ -1,36 +0,0 @@ - provide an option for libVLC - ---- megaglest-3.7.0/CMakeLists.txt -+++ megaglest-3.7.0/CMakeLists.txt -@@ -44,6 +44,7 @@ - OPTION(BUILD_MEGAGLEST_MODEL_VIEWER "Build model viewer" ON) - OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON) - OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON) -+OPTION(WITH_VLC "Use libVLC to play videos" ON) - - FIND_PROGRAM(HELP2MAN "help2man") - ---- megaglest-3.7.0/source/shared_lib/CMakeLists.txt -+++ megaglest-3.7.0/source/shared_lib/CMakeLists.txt -@@ -221,7 +221,7 @@ - SET(LIBVLC_MIN_VERSION "1.1.0") - FIND_PACKAGE(LIBVLC) - -- IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") -+ IF(LIBVLC_FOUND AND WITH_VLC AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") - MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.") - INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR}) - IF(UNIX) -@@ -236,7 +236,11 @@ - ENDIF() - - ELSE() -- MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.") -+ IF(WITH_VLC) -+ MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.") -+ ELSE() -+ MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.") -+ ENDIF() - ENDIF() - - ######################################################################################### diff --git a/games-strategy/megaglest/files/megaglest-3.7.0-static-build.patch b/games-strategy/megaglest/files/megaglest-3.7.0-static-build.patch deleted file mode 100644 index 03774cebeff5..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.0-static-build.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Julian Ospald -Date: Sat Aug 18 13:41:33 UTC 2012 -Subject: build system - -fix static build - ---- megaglest-3.6.0.3/source/shared_lib/CMakeLists.txt -+++ megaglest-3.6.0.3/source/shared_lib/CMakeLists.txt -@@ -267,21 +267,9 @@ - streflop/softfloat) - ENDIF() - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for miniupnpc since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Miniupnpc) -- ENDIF() -- -- if(NOT MINIUPNP_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED miniupnpc since dev system does not have it... MINIUPNP_FOUND [${MINIUPNP_FOUND}]") -- -- SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/miniupnpc) -- else() -- MESSAGE(STATUS "*** Using SHARED miniupnpc found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) -- endif() -+ FIND_PACKAGE(Miniupnpc REQUIRED) -+ INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) - - IF(MINIUPNPC_VERSION_PRE1_5) - ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_5) -@@ -316,22 +304,9 @@ - INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}platform/sdl ) - INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}xml/rapidxml ) - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Ircclient) -- ENDIF() -- -- if(NOT IRCCLIENT_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") -- -- SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) -- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/libircclient/include) -- else() -- MESSAGE(STATUS "*** Using SHARED libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) -- endif() -+ FIND_PACKAGE(Ircclient REQUIRED) -+ INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") ---- megaglest-3.6.0.3/mk/cmake/Modules/FindMiniupnpc.cmake -+++ megaglest-3.6.0.3/mk/cmake/Modules/FindMiniupnpc.cmake -@@ -35,7 +35,11 @@ - - find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h - PATH_SUFFIXES miniupnpc) --find_library(MINIUPNP_LIBRARY miniupnpc) -+IF(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.a) -+ELSE(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.so) -+ENDIF(WANT_STATIC_LIBS) - - if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) - set (MINIUPNP_FOUND TRUE) ---- megaglest-3.6.0.3/mk/cmake/Modules/FindOGG.cmake -+++ megaglest-3.6.0.3/mk/cmake/Modules/FindOGG.cmake -@@ -19,12 +19,12 @@ - - FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) - --#IF (OGG_STATIC AND NOT OGG_LIBRARY) --# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) --#ELSE() -- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) --#ENDIF() -- -+IF (OGG_STATIC) -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) -+ELSE() -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) -+ENDIF() -+ - #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) - # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) - #ELSE() ---- megaglest-3.7.0/mk/cmake/Modules/FindLUAJIT.cmake -+++ megaglest-3.7.0/mk/cmake/Modules/FindLUAJIT.cmake -@@ -18,13 +18,13 @@ - NAMES luajit.h - PATH_SUFFIXES luajit-2.0) - --if (LUAJIT_FIND_STATIC) -+#if (LUAJIT_FIND_STATIC) - find_library(LUAJIT_LIBRARIES luajit.a - NAMES libluajit-5.1.a) --else (LUATJIT_FIND_STATIC) -- find_library(LUAJIT_LIBRARIES luajit -- NAMES luajit-5.1) --endif (LUAJIT_FIND_STATIC) -+#else (LUATJIT_FIND_STATIC) -+# find_library(LUAJIT_LIBRARIES luajit.so -+# NAMES libluajit-5.1.so) -+#endif (LUAJIT_FIND_STATIC) - - mark_as_advanced(LUAJIT_INCLUDE_DIR) - mark_as_advanced(LUAJIT_LIBRARIES) diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch b/games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch deleted file mode 100644 index ca0a2a717a01..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Julian Ospald -Date: Fri Aug 31 23:45:34 UTC 2012 -Subject: fix as-needed - -reorder linker line (curl after libircclient) - ---- source/shared_lib/CMakeLists.txt -+++ source/shared_lib/CMakeLists.txt -@@ -47,9 +47,7 @@ - - FIND_PACKAGE(CURL REQUIRED) - INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) -- IF(UNIX) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -- ENDIF() -+ - # check libcurl version # - IF(WIN32) - file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS) -@@ -314,6 +312,10 @@ - INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) - SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - -+ IF(UNIX) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) -+ ENDIF() -+ - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") - include(CheckCXXSourceRuns) diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch b/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch deleted file mode 100644 index e8389566b2a6..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build failure against jpeg-9 (gcc-4.8) - -> [ 26%] Building CXX object sources/graphics/JPGReader.cpp.o -> sources/graphics/JPGReader.cpp: In function 'boolean Shared::Graphics::fill_input_buffer(j_decompress_ptr)': -> sources/graphics/JPGReader.cpp:40:9: error: cannot convert 'bool' to 'boolean' in return -> return true; -> ^ -> source/shared_lib/sources/graphics/JPGReader.cpp:41:1: warning: control reaches end of non-void function [-Wreturn-type] -> } -> ^ -> make[2]: *** [sources/graphics/JPGReader.cpp.o] Error 1 - -Upstream-patch: http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/source/shared_lib/sources/graphics/JPGReader.cpp?r1=4082&r2=4095&view=patch - ---- source/shared_lib/sources/graphics/JPGReader.cpp -+++ source/shared_lib/sources/graphics/JPGReader.cpp -@@ -37,7 +37,7 @@ - } - static boolean fill_input_buffer (j_decompress_ptr cinfo) { - //it is already filled -- return true; -+ return boolean(true); - } - static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) { - if (num_bytes > 0) { diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch b/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch deleted file mode 100644 index 61177224a070..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.1-miniupnpc-1.8.patch +++ /dev/null @@ -1,158 +0,0 @@ -http://megaglest.svn.sourceforge.net/viewvc/megaglest?view=revision&revision=3958 -https://bugs.gentoo.org/show_bug.cgi?id=456952 - ---- trunk/source/shared_lib/CMakeLists.txt 2012/12/24 18:05:13 3957 -+++ trunk/source/shared_lib/CMakeLists.txt 2012/12/26 01:11:11 3958 -@@ -297,7 +297,12 @@ - ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_6) - message(STATUS "Adding macro for miniupnpc version: pre v1.6") - ENDIF() -- IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6) -+ IF(MINIUPNPC_VERSION_PRE1_7) -+ ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_7) -+ message(STATUS "Adding macro for miniupnpc version: pre v1.7") -+ ENDIF() -+ -+ IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) - message(STATUS "**No macros required for miniupnpc version") - ENDIF() - ---- trunk/mk/cmake/Modules/FindMiniupnpc.cmake 2012/12/24 18:05:13 3957 -+++ trunk/mk/cmake/Modules/FindMiniupnpc.cmake 2012/12/26 01:11:11 3958 -@@ -58,20 +58,40 @@ - #include - int main() - { -- struct UPNPDev *devlist = NULL; -- int upnp_delay = 5000; -- const char *upnp_multicastif = NULL; -- const char *upnp_minissdpdsock = NULL; -- int upnp_sameport = 0; -- int upnp_ipv6 = 0; -- int upnp_error = 0; -- devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error); -+ static struct UPNPUrls urls; -+ static struct IGDdatas data; -+ -+ GetUPNPUrls (&urls, &data, \"myurl\",0); - - return 0; - }" -- MINIUPNPC_VERSION_1_6_OR_HIGHER) -- -- IF (NOT MINIUPNPC_VERSION_1_6_OR_HIGHER) -+ MINIUPNPC_VERSION_1_7_OR_HIGHER) -+ -+ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) -+ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) -+ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) -+ check_cxx_source_runs(" -+ #include -+ #include -+ #include -+ #include -+ int main() -+ { -+ struct UPNPDev *devlist = NULL; -+ int upnp_delay = 5000; -+ const char *upnp_multicastif = NULL; -+ const char *upnp_minissdpdsock = NULL; -+ int upnp_sameport = 0; -+ int upnp_ipv6 = 0; -+ int upnp_error = 0; -+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error); -+ -+ return 0; -+ }" -+ MINIUPNPC_VERSION_PRE1_7) -+ ENDIF() -+ -+ IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) - set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) - check_cxx_source_runs(" -@@ -96,25 +116,27 @@ - - ENDIF() - -- set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) -- set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) -- check_cxx_source_runs(" -- #include -- #include -- #include -- #include -- static struct UPNPUrls urls; -- static struct IGDdatas data; -- int main() -- { -- char externalIP[16] = ""; -- UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP); -+ IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) -+ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) -+ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) -+ check_cxx_source_runs(" -+ #include -+ #include -+ #include -+ #include -+ static struct UPNPUrls urls; -+ static struct IGDdatas data; -+ int main() -+ { -+ char externalIP[16] = ""; -+ UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP); - -- return 0; -- }" -- MINIUPNPC_VERSION_1_5_OR_HIGHER) -+ return 0; -+ }" -+ MINIUPNPC_VERSION_1_5_OR_HIGHER) -+ ENDIF() - -- IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER) -+ IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) - set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) - check_cxx_source_runs(" -@@ -141,8 +163,12 @@ - IF(MINIUPNPC_VERSION_PRE1_6) - message(STATUS "Found miniupnpc version is pre v1.6") - ENDIF() -- IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6) -- message(STATUS "Found miniupnpc version is v1.6 or higher") -+ IF(MINIUPNPC_VERSION_PRE1_7) -+ message(STATUS "Found miniupnpc version is pre v1.7") -+ ENDIF() -+ -+ IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) -+ message(STATUS "Found miniupnpc version is v1.7 or higher") - ENDIF() - - else () ---- trunk/source/shared_lib/sources/platform/posix/socket.cpp 2012/12/24 18:05:13 3957 -+++ trunk/source/shared_lib/sources/platform/posix/socket.cpp 2012/12/26 01:11:11 3958 -@@ -2478,13 +2478,22 @@ - if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st); - - //printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr); -+#ifndef MINIUPNPC_VERSION_PRE1_7 -+ descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0); -+#else - descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0]))); -+#endif - if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"LAN address: %s\n", lanaddr); - - if (descXML) { - parserootdesc (descXML, descXMLsize, &data); - free (descXML); descXML = 0; -+ -+#ifndef MINIUPNPC_VERSION_PRE1_7 -+ GetUPNPUrls (&urls, &data, dev->descURL,0); -+#else - GetUPNPUrls (&urls, &data, dev->descURL); -+#endif - } - snprintf(buf, 255,"UPnP device found: %s %s LAN address %s", dev->descURL, dev->st, lanaddr); - diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch deleted file mode 100644 index 678327260bbb..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Julian Ospald -Date: Sat Aug 18 13:41:33 UTC 2012 -Subject: build system - -fix static build - ---- source/shared_lib/CMakeLists.txt -+++ source/shared_lib/CMakeLists.txt -@@ -273,21 +273,9 @@ - streflop/softfloat) - ENDIF() - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for miniupnpc since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Miniupnpc) -- ENDIF() -- -- if(NOT MINIUPNP_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED miniupnpc since dev system does not have it... MINIUPNP_FOUND [${MINIUPNP_FOUND}]") -- -- SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/miniupnpc) -- else() -- MESSAGE(STATUS "*** Using SHARED miniupnpc found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) -- endif() -+ FIND_PACKAGE(Miniupnpc REQUIRED) -+ INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) - - IF(MINIUPNPC_VERSION_PRE1_5) - ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_5) -@@ -322,22 +310,9 @@ - INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}platform/sdl ) - INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}xml/rapidxml ) - -- IF(NOT WANT_STATIC_LIBS) -- MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is off ...") -- FIND_PACKAGE(Ircclient) -- ENDIF() -- -- if(NOT IRCCLIENT_FOUND) -- MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") -- -- SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) -- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/libircclient/include) -- else() -- MESSAGE(STATUS "*** Using SHARED libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") -- -- INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) -- endif() -+ FIND_PACKAGE(Ircclient REQUIRED) -+ INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) -+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") ---- mk/cmake/Modules/FindMiniupnpc.cmake -+++ mk/cmake/Modules/FindMiniupnpc.cmake -@@ -35,7 +35,11 @@ - - find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h - PATH_SUFFIXES miniupnpc) --find_library(MINIUPNP_LIBRARY miniupnpc) -+IF(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.a) -+ELSE(WANT_STATIC_LIBS) -+ find_library(MINIUPNP_LIBRARY libminiupnpc.so) -+ENDIF(WANT_STATIC_LIBS) - - if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) - set (MINIUPNP_FOUND TRUE) ---- mk/cmake/Modules/FindOGG.cmake -+++ mk/cmake/Modules/FindOGG.cmake -@@ -19,12 +19,12 @@ - - FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) - --#IF (OGG_STATIC AND NOT OGG_LIBRARY) --# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) --#ELSE() -- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) --#ENDIF() -- -+IF (OGG_STATIC) -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) -+ELSE() -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) -+ENDIF() -+ - #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) - # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) - #ELSE() ---- mk/cmake/Modules/FindLUAJIT.cmake -+++ mk/cmake/Modules/FindLUAJIT.cmake -@@ -18,13 +18,13 @@ - NAMES luajit.h - PATH_SUFFIXES luajit-2.0) - --if (LUAJIT_FIND_STATIC) -+#if (LUAJIT_FIND_STATIC) - find_library(LUAJIT_LIBRARIES luajit.a - NAMES libluajit-5.1.a) --else (LUATJIT_FIND_STATIC) -- find_library(LUAJIT_LIBRARIES luajit -- NAMES luajit-5.1) --endif (LUAJIT_FIND_STATIC) -+#else (LUATJIT_FIND_STATIC) -+# find_library(LUAJIT_LIBRARIES luajit.so -+# NAMES libluajit-5.1.so) -+#endif (LUAJIT_FIND_STATIC) - - mark_as_advanced(LUAJIT_INCLUDE_DIR) - mark_as_advanced(LUAJIT_LIBRARIES) diff --git a/games-strategy/megaglest/files/megaglest-3.9.0.4-static-build.patch b/games-strategy/megaglest/files/megaglest-3.9.0.4-static-build.patch deleted file mode 100644 index 2586a561956b..000000000000 --- a/games-strategy/megaglest/files/megaglest-3.9.0.4-static-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a -Author: hasufell -Date: Mon Nov 18 21:54:54 2013 +0100 - - fix static build - -diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake -index 2a026cc..8ca8a23 100644 ---- a/mk/cmake/Modules/FindOGG.cmake -+++ b/mk/cmake/Modules/FindOGG.cmake -@@ -19,11 +19,11 @@ - - FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) - --#IF (OGG_STATIC AND NOT OGG_LIBRARY) --# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) --#ELSE() -- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) --#ENDIF() -+IF (OGG_STATIC AND NOT OGG_LIBRARY) -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) -+ELSE() -+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) -+ENDIF() - - #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) - # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) ---- a/mk/cmake/Modules/FindXercesC.cmake -+++ b/mk/cmake/Modules/FindXercesC.cmake -@@ -83,6 +83,9 @@ - /usr/lib - /usr/local/lib - ) -+ -+ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a) -+ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a) - - IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) - MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") -@@ -90,7 +93,7 @@ - - IF(UNIX AND NOT APPLE) - #SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata") -- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}") -+ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}") - ENDIF() - ENDIF() - ENDIF() ---- a/mk/cmake/Modules/FindFriBiDi.cmake -+++ b/mk/cmake/Modules/FindFriBiDi.cmake -@@ -28,9 +28,9 @@ - SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) - - OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) --IF(WANT_STATIC_LIBS) -- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) --ENDIF() -+#IF(WANT_STATIC_LIBS) -+# SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) -+#ENDIF() - - MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...") - diff --git a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild deleted file mode 100644 index 66c7693789c9..000000000000 --- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.10 2014/05/15 17:05:54 ulm Exp $ - -EAPI=4 -VIRTUALX_REQUIRED="manual" -inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="http://megaglest.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer" - -RDEPEND=" - >=dev-lang/lua-5.1 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype - media-libs/libsdl[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls - >=net-libs/libircclient-1.6-r1 - sys-libs/zlib - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:2.8[X,opengl] ) - model-viewer? ( x11-libs/wxGTK:2.8[X] ) - !static? ( - dev-libs/xerces-c[icu] - media-libs/ftgl - media-libs/glew - media-libs/libogg - media-libs/libpng:0 - net-libs/miniupnpc - net-misc/curl - virtual/jpeg - )" -DEPEND="${RDEPEND} - sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} ) - static? ( - dev-libs/xerces-c[icu,static-libs] - media-libs/ftgl[static-libs] - media-libs/glew[static-libs] - media-libs/libogg[static-libs] - media-libs/libpng:0[static-libs] - net-libs/miniupnpc[static-libs] - net-misc/curl[static-libs] - virtual/jpeg[static-libs] - )" -PDEPEND="~games-strategy/${PN}-data-${PV}" - -src_prepare() { - if use editor || use model-viewer ; then - WX_GTK_VER="2.8" - need-wxwidgets unicode - fi - - epatch "${FILESDIR}"/${P}-{static-build,build,as-needed,gcc-4.7}.patch - - # Workaround for glew >=1.9.0 - # https://sourceforge.net/tracker/?func=detail&aid=3565658&group_id=300350&atid=1266776 - sed \ - -e "//a #undef GL_TYPE" \ - -i source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h \ - || die "fixing vertex-buffer.h for glew >=1.9.0 failed" -} - -src_configure() { - if use sse3; then - SSE=3 - elif use sse2; then - SSE=2 - elif use sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - # configurator is deprecated and not included on purpose - -DBUILD_MEGAGLEST_CONFIGURATOR=OFF - $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) - $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) - $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) - -DMAX_SSE_LEVEL_DESIRED="${SSE}" - -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" - -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - # icons are used at runtime, wrong default location share/pixmaps - -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - -DUSE_FTGL=ON - $(cmake-utils_use_want static STATIC_LIBS) - $(cmake-utils_use_want streflop STREFLOP) - -DWANT_SVN_STAMP=off - $(cmake-utils_use static wxWidgets_USE_STATIC) - $(cmake-utils_use unicode wxWidgets_USE_UNICODE) - $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - - # support CMAKE_BUILD_TYPE=Gentoo - append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' - - cmake-utils_src_configure -} - -src_compile() { - if use editor || use model-viewer; then - VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake - else - cmake-utils_src_compile - fi -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc {AUTHORS.source_code,CHANGELOG,README}.txt - doicon -s 48 ${PN}.png - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" - - # provided by megaglest-data - rm "${D}${GAMES_DATADIR}"/${PN}/${PN}.bmp || die - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - einfo - elog 'Note about Configuration:' - elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' - elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' - elog 'values in these files.' - elog - elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' - elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' - elog 'Some graphics cards may require setting Max Lights to 1.' - einfo - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/megaglest/megaglest-3.7.0.ebuild b/games-strategy/megaglest/megaglest-3.7.0.ebuild deleted file mode 100644 index b39643fa66c8..000000000000 --- a/games-strategy/megaglest/megaglest-3.7.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.0.ebuild,v 1.4 2014/05/15 17:05:54 ulm Exp $ - -EAPI=4 -VIRTUALX_REQUIRED="manual" -inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="http://megaglest.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" - -LICENSE="GPL-3 BitstreamVera" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos" - -RDEPEND=" - >=dev-lang/lua-5.1 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype - media-libs/libsdl[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls - >=net-libs/libircclient-1.6-r1 - sys-libs/zlib - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:2.8[X,opengl] ) - model-viewer? ( x11-libs/wxGTK:2.8[X] ) - !static? ( - dev-libs/xerces-c[icu] - media-libs/ftgl - media-libs/glew - media-libs/libogg - media-libs/libpng:0 - net-libs/miniupnpc - net-misc/curl - virtual/jpeg - ) - videos? ( media-video/vlc )" -DEPEND="${RDEPEND} - sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} ) - static? ( - dev-libs/xerces-c[icu,static-libs] - media-libs/ftgl[static-libs] - media-libs/glew[static-libs] - media-libs/libogg[static-libs] - media-libs/libpng:0[static-libs] - net-libs/miniupnpc[static-libs] - net-misc/curl[static-libs] - virtual/jpeg[static-libs] - )" -PDEPEND="~games-strategy/${PN}-data-${PV}" - -src_prepare() { - if use editor || use model-viewer ; then - WX_GTK_VER="2.8" - need-wxwidgets unicode - fi - - epatch "${FILESDIR}"/${P}-{static-build,cmake,as-needed}.patch -} - -src_configure() { - if use sse3; then - SSE=3 - elif use sse2; then - SSE=2 - elif use sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) - $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) - $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) - $(cmake-utils_use_with videos VLC) - -DMAX_SSE_LEVEL_DESIRED="${SSE}" - -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" - -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - # icons are used at runtime, wrong default location share/pixmaps - -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - -DUSE_FTGL=ON - $(cmake-utils_use_want static STATIC_LIBS) - $(cmake-utils_use_want streflop STREFLOP) - -DWANT_SVN_STAMP=off - $(cmake-utils_use static wxWidgets_USE_STATIC) - $(cmake-utils_use unicode wxWidgets_USE_UNICODE) - $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - - # support CMAKE_BUILD_TYPE=Gentoo - append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' - - cmake-utils_src_configure -} - -src_compile() { - if use editor || use model-viewer; then - VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake - else - cmake-utils_src_compile - fi -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc {AUTHORS.source_code,CHANGELOG,README}.txt - doicon -s 48 ${PN}.png - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" - - # provided by megaglest-data - rm "${D}${GAMES_DATADIR}"/${PN}/${PN}.bmp || die - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - einfo - elog 'Note about Configuration:' - elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' - elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' - elog 'values in these files.' - elog - elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' - elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' - elog 'Some graphics cards may require setting Max Lights to 1.' - einfo - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/megaglest/megaglest-3.7.1.ebuild b/games-strategy/megaglest/megaglest-3.7.1.ebuild deleted file mode 100644 index 161bafd6dcec..000000000000 --- a/games-strategy/megaglest/megaglest-3.7.1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.7 2014/05/15 17:05:54 ulm Exp $ - -EAPI=4 -VIRTUALX_REQUIRED="manual" -inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="http://megaglest.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" - -LICENSE="GPL-3 BitstreamVera" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos" - -RDEPEND=" - >=dev-lang/lua-5.1 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype - media-libs/libsdl[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls - >=net-libs/libircclient-1.6-r1 - sys-libs/zlib - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:2.8[X,opengl] ) - model-viewer? ( x11-libs/wxGTK:2.8[X] ) - !static? ( - dev-libs/xerces-c[icu] - media-libs/ftgl - media-libs/glew - media-libs/libogg - media-libs/libpng:0 - net-libs/miniupnpc - net-misc/curl - virtual/jpeg - ) - videos? ( media-video/vlc )" -DEPEND="${RDEPEND} - sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} ) - static? ( - dev-libs/xerces-c[icu,static-libs] - media-libs/ftgl[static-libs] - media-libs/glew[static-libs] - media-libs/libogg[static-libs] - media-libs/libpng:0[static-libs] - net-libs/miniupnpc[static-libs] - net-misc/curl[static-libs] - virtual/jpeg[static-libs] - )" -PDEPEND="~games-strategy/${PN}-data-${PV}" - -src_prepare() { - if use editor || use model-viewer ; then - WX_GTK_VER="2.8" - need-wxwidgets unicode - fi - - epatch "${FILESDIR}"/${P}-{static-build,as-needed,miniupnpc-1.8,gcc47}.patch -} - -src_configure() { - if use sse3; then - SSE=3 - elif use sse2; then - SSE=2 - elif use sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) - $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) - $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) - $(cmake-utils_use_with videos VLC) - -DMAX_SSE_LEVEL_DESIRED="${SSE}" - -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" - -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - # icons are used at runtime, wrong default location share/pixmaps - -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - -DUSE_FTGL=ON - $(cmake-utils_use_want static STATIC_LIBS) - $(cmake-utils_use_want streflop STREFLOP) - -DWANT_SVN_STAMP=off - $(cmake-utils_use static wxWidgets_USE_STATIC) - $(cmake-utils_use unicode wxWidgets_USE_UNICODE) - $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - - # support CMAKE_BUILD_TYPE=Gentoo - append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' - - cmake-utils_src_configure -} - -src_compile() { - if use editor || use model-viewer; then - VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake - else - cmake-utils_src_compile - fi -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc {AUTHORS.source_code,CHANGELOG,README}.txt - doicon -s 48 ${PN}.png - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" - - # provided by megaglest-data - rm "${D}${GAMES_DATADIR}"/${PN}/${PN}.bmp || die - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - einfo - elog 'Note about Configuration:' - elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' - elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' - elog 'values in these files.' - elog - elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' - elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' - elog 'Some graphics cards may require setting Max Lights to 1.' - einfo - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/megaglest/megaglest-3.9.0.4.ebuild b/games-strategy/megaglest/megaglest-3.9.0.4.ebuild deleted file mode 100644 index f2095641ead8..000000000000 --- a/games-strategy/megaglest/megaglest-3.9.0.4.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.9.0.4.ebuild,v 1.3 2014/09/12 20:59:05 dilfridge Exp $ - -# google-breakpad -# TODO: fribidi, libvorbis static - -EAPI=5 -VIRTUALX_REQUIRED="manual" -inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="http://www.megaglest.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" - -LICENSE="GPL-3 BitstreamVera" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +editor fribidi sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos" - -RDEPEND=" - >=dev-lang/lua-5.1 - dev-libs/libxml2 - media-libs/fontconfig - media-libs/freetype - media-libs/libsdl[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls - sys-libs/zlib - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:2.8[X,opengl] ) - fribidi? ( dev-libs/fribidi ) - model-viewer? ( x11-libs/wxGTK:2.8[X] ) - !static? ( - dev-libs/icu:= - dev-libs/xerces-c[icu] - media-libs/ftgl - media-libs/glew - media-libs/libpng:0 - net-libs/libircclient - >=net-libs/miniupnpc-1.8 - net-misc/curl - virtual/jpeg - ) - videos? ( media-video/vlc )" -DEPEND="${RDEPEND} - sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} ) - static? ( - dev-libs/icu[static-libs] - dev-libs/xerces-c[icu,static-libs] - media-libs/ftgl[static-libs] - media-libs/glew[static-libs] - media-libs/libpng:0[static-libs] - net-libs/libircclient[static-libs] - net-libs/miniupnpc[static-libs] - net-misc/curl[static-libs] - virtual/jpeg[static-libs] - )" -PDEPEND="~games-strategy/${PN}-data-3.9.0" - -S=${WORKDIR}/${PN}-3.9.0 - -src_prepare() { - if use editor || use model-viewer ; then - WX_GTK_VER="2.8" - need-wxwidgets unicode - fi - - epatch "${FILESDIR}"/${P}-static-build.patch -} - -src_configure() { - if use sse3; then - SSE=3 - elif use sse2; then - SSE=2 - elif use sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - $(cmake-utils_use_enable fribidi FRIBIDI) - $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) - $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) - $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) - $(cmake-utils_use_with videos VLC) - -DMAX_SSE_LEVEL_DESIRED="${SSE}" - -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" - -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - # icons are used at runtime, wrong default location share/pixmaps - -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - -DUSE_FTGL=ON - $(cmake-utils_use_want static STATIC_LIBS) - $(cmake-utils_use_want streflop STREFLOP) - -DWANT_SVN_STAMP=off - $(cmake-utils_use static wxWidgets_USE_STATIC) - $(cmake-utils_use unicode wxWidgets_USE_UNICODE) - $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - - # support CMAKE_BUILD_TYPE=Gentoo - append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' - - cmake-utils_src_configure -} - -src_compile() { - if use editor || use model-viewer; then - VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake - else - cmake-utils_src_compile - fi -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc {AUTHORS.source_code,CHANGELOG,README}.txt - doicon -s 48 ${PN}.png - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" - - # provided by megaglest-data - rm "${ED%/}/${GAMES_DATADIR}"/${PN}/${PN}.bmp || die - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - einfo - elog 'Note about Configuration:' - elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' - elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' - elog 'values in these files.' - elog - elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' - elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' - elog 'Some graphics cards may require setting Max Lights to 1.' - einfo - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- 2.26.2