diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-09-08 21:49:44 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-09-08 21:49:44 +0000 |
| commit | 8024cb51ea09b7362ddf4b6a2ba229bfde9c7fe4 (patch) | |
| tree | d2bc15fcc87223c1cf713a84fc8ab145cd86174f /games-strategy/megaglest | |
| parent | Actually enable /var/lock and /var/run mounts. Stupid me. (diff) | |
| download | historical-8024cb51ea09b7362ddf4b6a2ba229bfde9c7fe4.tar.gz historical-8024cb51ea09b7362ddf4b6a2ba229bfde9c7fe4.tar.bz2 historical-8024cb51ea09b7362ddf4b6a2ba229bfde9c7fe4.zip | |
fix various compilation issues thanks to Arfrever
Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64
Diffstat (limited to 'games-strategy/megaglest')
| -rw-r--r-- | games-strategy/megaglest/ChangeLog | 5 | ||||
| -rw-r--r-- | games-strategy/megaglest/Manifest | 18 | ||||
| -rw-r--r-- | games-strategy/megaglest/megaglest-3.6.0.3.ebuild | 22 |
3 files changed, 31 insertions, 14 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index 58505733f74e..da1fdd5d7089 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.4 2012/09/07 20:03:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.5 2012/09/08 21:49:44 hasufell Exp $ + + 08 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild: + fix various compilation issues thanks to Arfrever 07 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild: fix dependencies diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 964145e1f126..ef3033f1d0b6 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -5,17 +5,17 @@ AUX megaglest-3.6.0.3-as-needed.patch 909 SHA256 e3b2117f9e524e44e815d9fe7d56c7f AUX megaglest-3.6.0.3-build.patch 1050 SHA256 fe00f58335e551b29e23efd66cb6ff16780d81c992522601981bd2a211932bc1 SHA512 f1ab9698f2a91a765a888030bb317d4ae6093f6070d7f068d142993100975be826c6db84278a6bb662b6a2e25df94b5968aa10cf9db08083d76e9c4beb4b2f62 WHIRLPOOL 04d1b7e3cd40a265a6ba181a63b28fbf5edef2b88174afda71fc5940ce2f3a65fbf77db1531c6e368619904bc5ab940279442c4d9a1b301d7f03ee9ac4020cfb AUX megaglest-3.6.0.3-static-build.patch 3821 SHA256 cca9eb7180bd4f47030d96d95ea0ff63b6ba567d1ace43df908bcb847d9b1c26 SHA512 2706643eaa597bc2629179541f180508c4d7f89f205e9a5a072671acaf0bb519ff216a5dc06feb11b74ff5614c9ef8e58f5031f3aaa66c1b27ab2f7b32927d60 WHIRLPOOL 2125cf9ab83e01d5a2987b5bf9f07f0a4e33d742585b0ff58bb6c0ae115cd2055bf4442ab26483bececa9fcba324a872af36d7a8cbb6f920797cfafbf595c28f DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f -EBUILD megaglest-3.6.0.3.ebuild 4196 SHA256 12d22a75cf49790481827184f4e88aeeee96eac473b7462541268f21bd75f2d9 SHA512 be501353fcdd929ab7b567c2c12551ddbf21bc410a293786e7d07f874768b25f37d3fdab2c7e6c50b42ab852204ad78e1f98fd402c50ac8774533fb7cc0c81a1 WHIRLPOOL c46fdd49625ff71878e817745e0ad2050bacd945c10c22786165d5ef85a350d0c01e56a5dbcba640cc18b86ec54e93bbbf6daf9aaed03b5c4e8f1baacbb928b8 -MISC ChangeLog 820 SHA256 407fe1f2f509e8040ad8df16fc0be55a908fba0e5aa4bda132bffe8c1e2beb43 SHA512 7180b8023455836869c784c8a70b7300ec0435b3a0e37dca80b04163c8b70239ca2b08cdf165e8d9d39034c5c8044b7c8e92560d6c47f2fb7311e32c4986677e WHIRLPOOL 0367078033ded65d0137d76aa2711141e1b1d77b8f5aeb854dad85dafd7529fce4dfd7cb5fb9b9c023720fb17457f25e0aa60b6c6af67187cb9497e0b5e3a294 +EBUILD megaglest-3.6.0.3.ebuild 4716 SHA256 6ee08f9f27f3093b3461c639bf49c21eb45b3fbc0660c7ba5aab90ce6c1cc892 SHA512 a3aa6d11945390ce2c610fbf7b10dfe21af8b33145469a4e443b2902ba33ea16fdcb3290d1cfa21ff575c0ed9f5b72315bed6030b3c2b7391de7b52e5eafb5c4 WHIRLPOOL a37637c3c0454e8dece7bbd4e4e0c21fad96b313e8a635daaecbcdbe1e7c191ab3cc364e62e8b93ed4124313eab9b800e6bb28846a829cf558a98bab0c3460e1 +MISC ChangeLog 950 SHA256 f595653dd4b32b8f5237262d11838b55743e030f3c18eb6cc6a0d71cd4e014e6 SHA512 8c2b76a34d6ab5cffad71d8d11b2a80b33c0914b2b7626b5f41f71b9f27a0e9f50792a78125b6bb3b43152ef05b9a4893b07f8594308ebfb59cbd5bdf8a78304 WHIRLPOOL a3d5f3a8d0bf9bcd4ea6c5a8c7aa069bb4396d766c30ed71a9bea0f4b1df31f975bc750c025d585b5bffbf5097842c691789f72544a44c2836fbdf7c2a8f2f8c MISC metadata.xml 1673 SHA256 e82372357b85e23eab725ab1aaec9183f2df25f481b1bd2c972e5ef95136be00 SHA512 abaaaddadfd5db1b94c6281f3a46adfdaccd0f6b3172af887787a6c448e61601742f3f2663fb1c4dcb7b59deaf9fb3348d081683f65bc131c3dbb22516e3c7d7 WHIRLPOOL ca2dfc91de1fb3a4d560a97a876628d47f98b0f3a0e1165573c8c9381f7da5bbf7632670976c880953057a14c28a6fa34d6faabd1c936ec8473e5dcfadb81679 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQSlMmAAoJEFpvPKfnPDWzRdUH/2W5rD1cRWOElYd+c207p2Ff -Gg6D19RtMQvQsa3C1q7yWVRHvqlu6MyKe5E/dCFFRqHgI1fntnWjn+qXAAKx69HT -qnTNc/EXh04Z4LuI8bFALr0Ga+mzXC2bwbF3v9eU0yUnr4dYcbF/Vv+cfkuIJshT -N9oaunqfTyMJ0AW9qUQk86jaYyH/mOFXopEMavcVnjOM08XiXU7CaYf3OmCTWpXX -Xq1s1LMB/lYbZ6G6thEwPZg31nHAUnWgRhoiVwj1BTrnhMUFW4lLGozFKLVMQC3y -2fYIOyx4ibNe3ymKneOgipf41xtAb/sCOSSjOyx1nOY8OM/fx3SIPBZCtptjBFw= -=VLOq +iQEcBAEBCAAGBQJQS72BAAoJEFpvPKfnPDWziIMH/1dpqCX95k8d5yyLFvf6r4Zg +KMbAnqXF3jtVWgQQLGhlTVP4r5PtLTjDbkQnJrGAHUpZ2PjNNieERFlD8EqA+EEB +/NyZjzwp3sxx75jm6xE8jMy9qJoNFxJFnt1nlJPUmbZAJQT63AG2gHcutly+yEWS +oi0O9zl1JV9GbwHkfpUGJlmONhFWiX+k7EX5NTVbHIE2WaDcUMKtyvBNcqoTSAH9 +rk2Fb9AE3R4XEU700zKZd5WTunJe+B4CVUjeF9THNxrcdxY/mH3nSygN+2uYpmEP +HGNcQBETg8X2vlWSkR+oXdGEflEeN8NBdin7mLQ66hzTN7erqab3zTz+Z5JfA38= +=XYWa -----END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild index 869abed77a62..8485bf982262 100644 --- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild +++ b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2012 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.4 2012/09/07 20:03:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.5 2012/09/08 21:49:44 hasufell Exp $ EAPI=4 -inherit eutils flag-o-matic cmake-utils wxwidgets gnome2-utils games +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/" @@ -23,6 +24,7 @@ RDEPEND=" media-libs/libvorbis media-libs/openal net-libs/gnutls + >=net-libs/libircclient-1.6-r1 sys-libs/zlib virtual/opengl virtual/glu @@ -42,9 +44,10 @@ RDEPEND=" ftgl? ( media-libs/ftgl ) )" DEPEND="${RDEPEND} - net-libs/libircclient sys-apps/help2man virtual/pkgconfig + editor? ( ${VIRTUALX_DEPEND} ) + model-viewer? ( ${VIRTUALX_DEPEND} ) static? ( dev-libs/xerces-c[static-libs] media-libs/glew[static-libs] @@ -64,6 +67,13 @@ src_prepare() { fi epatch "${FILESDIR}"/${P}-{static-build,build,as-needed}.patch + + # Workaround for glew >=1.9.0 + # https://sourceforge.net/tracker/?func=detail&aid=3565658&group_id=300350&atid=1266776 + sed \ + -e "/<GL\/glew.h>/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() { @@ -107,7 +117,11 @@ src_configure() { } src_compile() { - cmake-utils_src_compile + if use editor || use model-viewer; then + VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake + else + cmake-utils_src_compile + fi } src_install() { |