From 733ed1c4e49d0e02d20ac354fe4a8378edf53352 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 12 Jan 2007 21:53:05 +0000 Subject: [PATCH] Fix USE=-opengl linking error Package-Manager: portage-2.1.2_rc4-r8 --- games-engines/stratagus/ChangeLog | 5 +++- games-engines/stratagus/Manifest | 26 ++++++++++++------ .../stratagus/stratagus-2.2.1.ebuild | 27 ++++++++++++------- 3 files changed, 39 insertions(+), 19 deletions(-) diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog index 3bd857d3e8af..f1a2e302dba4 100644 --- a/games-engines/stratagus/ChangeLog +++ b/games-engines/stratagus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-engines/stratagus # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.10 2007/01/12 03:12:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.11 2007/01/12 21:53:05 nyhm Exp $ + + 12 Jan 2007; Tristan Heaven stratagus-2.2.1.ebuild: + Fix USE=-opengl linking error *stratagus-2.2.1 (12 Jan 2007) diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest index 15a9feef580d..6dc1b4ce88a3 100644 --- a/games-engines/stratagus/Manifest +++ b/games-engines/stratagus/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX flac-1.1.3.patch 2332 RMD160 8018503ece12c6a7885a7de564009004b05c32ea SHA1 16da857ab6d2093697ae20ff510c9981574ef801 SHA256 2b10d6657949c9b848129f97eaeee374ba6e5dac6644ec2daad6ca5e441570ab MD5 7385442b8b647c32e3fe19dd9f68b734 files/flac-1.1.3.patch 2332 RMD160 8018503ece12c6a7885a7de564009004b05c32ea files/flac-1.1.3.patch 2332 @@ -8,14 +11,14 @@ EBUILD stratagus-2.1.ebuild 1488 RMD160 3c7594e437e222bfb3f90524ac036f7427752cc4 MD5 3cd7fdf5ebb09b5ef4d4565586ca99c7 stratagus-2.1.ebuild 1488 RMD160 3c7594e437e222bfb3f90524ac036f7427752cc4 stratagus-2.1.ebuild 1488 SHA256 3d8c0000934141247ae5b8ac48b92d4ca20560cbdb8aaa0ca01132f8a8383ac9 stratagus-2.1.ebuild 1488 -EBUILD stratagus-2.2.1.ebuild 1268 RMD160 579683a5501a1f6345c8589cf98b8c91e24d27b1 SHA1 41c59f7bd7515a4eab1549842685d0f047b8169b SHA256 22e3d3781711276da9df37f67a6ad455c271c0ca6c1d112d99938b67b1d9de9d -MD5 d8071dd0402f7489ca88191ab60532f1 stratagus-2.2.1.ebuild 1268 -RMD160 579683a5501a1f6345c8589cf98b8c91e24d27b1 stratagus-2.2.1.ebuild 1268 -SHA256 22e3d3781711276da9df37f67a6ad455c271c0ca6c1d112d99938b67b1d9de9d stratagus-2.2.1.ebuild 1268 -MISC ChangeLog 1537 RMD160 5cbdbcbc1328d788be352d38fdf4b40b81ea7ed0 SHA1 5befc0cdffed25630997ea575751ab45a44a1bb9 SHA256 72a0922d75f4c702f68a686e52a668240dec004e40fbc6addb51ab123d7d3b6e -MD5 54535a9d40b73f44bcdefad19fb31c29 ChangeLog 1537 -RMD160 5cbdbcbc1328d788be352d38fdf4b40b81ea7ed0 ChangeLog 1537 -SHA256 72a0922d75f4c702f68a686e52a668240dec004e40fbc6addb51ab123d7d3b6e ChangeLog 1537 +EBUILD stratagus-2.2.1.ebuild 1387 RMD160 2f4c93420595351c818946f52a2ee1bf9329734f SHA1 f3959d4fbb819c986098ae5ff40dc069581bdf51 SHA256 8a0cfe932dbfcc91a4fc51e4791fca75e4a759daba3042958fbd0eea330adfab +MD5 c70c0fec22399f4654404674d9479c26 stratagus-2.2.1.ebuild 1387 +RMD160 2f4c93420595351c818946f52a2ee1bf9329734f stratagus-2.2.1.ebuild 1387 +SHA256 8a0cfe932dbfcc91a4fc51e4791fca75e4a759daba3042958fbd0eea330adfab stratagus-2.2.1.ebuild 1387 +MISC ChangeLog 1637 RMD160 bc6eb69c6f22d42ac2314d8781ebe04c85a5211f SHA1 ccc8884301fe0fe5edad79e1c6b2a85ac68702d1 SHA256 71a1fcf3b1f9fdd3d2bbe77f0d1beef0e9affc739fc597593dc932f96a581328 +MD5 09072ccf62e9fc2edf273f73eb337990 ChangeLog 1637 +RMD160 bc6eb69c6f22d42ac2314d8781ebe04c85a5211f ChangeLog 1637 +SHA256 71a1fcf3b1f9fdd3d2bbe77f0d1beef0e9affc739fc597593dc932f96a581328 ChangeLog 1637 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -26,3 +29,10 @@ SHA256 ceadacde233f36a29b09ea539172dad0496d303884c9c41f7b39a8b5c00d8642 files/di MD5 95568f1a3ce4e181a957077d91409d89 files/digest-stratagus-2.2.1 259 RMD160 4152e798d137dcdee9486d4015604eb92ec7d378 files/digest-stratagus-2.2.1 259 SHA256 b723040c1302690d5b171dfcced890f133a5aaab62a3e4234d47fefacde9a712 files/digest-stratagus-2.2.1 259 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFqANHdz7hIScOURERAlcgAJ4zVKeyJNnuPD4gJck6Y0GDOrMQaQCg83A0 +XYkL1sZemaRfsCPqRUymkxU= +=IhPY +-----END PGP SIGNATURE----- diff --git a/games-engines/stratagus/stratagus-2.2.1.ebuild b/games-engines/stratagus/stratagus-2.2.1.ebuild index 9649dea38f72..ff27ec1dd1cd 100644 --- a/games-engines/stratagus/stratagus-2.2.1.ebuild +++ b/games-engines/stratagus/stratagus-2.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.1.ebuild,v 1.1 2007/01/12 03:12:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.1.ebuild,v 1.2 2007/01/12 21:53:05 nyhm Exp $ -inherit eutils games +inherit games DESCRIPTION="A realtime strategy game engine" HOMEPAGE="http://www.stratagus.org/" @@ -11,28 +11,35 @@ SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc mikmod mng opengl theora vorbis" +IUSE="bzip2 debug doc mikmod mng opengl theora vorbis" -RDEPEND="app-arch/bzip2 +RDEPEND="x11-libs/libX11 >=dev-lang/lua-5 media-libs/libpng media-libs/libsdl - sys-libs/zlib mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) + opengl? ( virtual/opengl ) theora? ( media-libs/libtheora ) - vorbis? ( media-libs/libogg media-libs/libvorbis )" - + vorbis? ( media-libs/libvorbis )" DEPEND="${RDEPEND} - x11-libs/libXt doc? ( app-doc/doxygen )" +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e '/SDLCONFIG --libs/s:"$: -lX11":' \ + -e 's/-O.*\(-fsigned-char\).*/\1"/' \ + configure \ + || die "sed failed" +} + src_compile() { econf \ $(use_enable debug) \ + $(use_with bzip2) \ $(use_with mikmod) \ - $(use_with flac) \ - $(use_with mp3 mad) \ $(use_with mng) \ $(use_with opengl) \ $(use_with theora) \ -- 2.26.2