diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-11-09 02:04:08 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-11-09 02:04:08 +0000 |
| commit | 22aa01505c0f45c1d8aaca1a9ad53fcec2c72a0c (patch) | |
| tree | 37321545e7742a9a70a0f8d72e45f7f514e7f3ea /dev-games | |
| parent | Version bump (bug #383257). Change opts to extra_commands in new init script ... (diff) | |
| download | gentoo-2-22aa01505c0f45c1d8aaca1a9ad53fcec2c72a0c.tar.gz gentoo-2-22aa01505c0f45c1d8aaca1a9ad53fcec2c72a0c.tar.bz2 gentoo-2-22aa01505c0f45c1d8aaca1a9ad53fcec2c72a0c.zip | |
build with newer zlib (bug #389863); kill ogre use flag (bug #387103)
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/cegui/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-games/cegui/cegui-0.7.5-r1.ebuild | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog index f92f09cbbe42..d7c32749290e 100644 --- a/dev-games/cegui/ChangeLog +++ b/dev-games/cegui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-games/cegui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.38 2011/10/09 16:44:38 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.39 2011/11/09 02:04:08 mr_bones_ Exp $ + + 09 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> cegui-0.7.5-r1.ebuild: + build with newer zlib (bug #389863); kill ogre use flag (bug #387103) 09 Oct 2011; Markus Meier <maekke@gentoo.org> cegui-0.7.5-r1.ebuild: x86 stable, bug #375503 diff --git a/dev-games/cegui/cegui-0.7.5-r1.ebuild b/dev-games/cegui/cegui-0.7.5-r1.ebuild index b25f1e55c8fc..b329561900cb 100644 --- a/dev-games/cegui/cegui-0.7.5-r1.ebuild +++ b/dev-games/cegui/cegui-0.7.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.4 2011/10/09 16:44:38 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.5 2011/11/09 02:04:08 mr_bones_ Exp $ EAPI=4 inherit eutils @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="amd64 -ppc x86" -IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip" +IUSE="bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip" REQUIRED_USE="|| ( xml tinyxml )" # bug 362223 RDEPEND="bidi? ( dev-libs/fribidi ) @@ -27,7 +27,6 @@ RDEPEND="bidi? ( dev-libs/fribidi ) dev-lang/lua dev-lua/toluapp ) - ogre? ( dev-games/ogre ) opengl? ( virtual/opengl virtual/glu @@ -48,6 +47,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-tinyxml.patch \ "${FILESDIR}"/${P}-gcc46.patch + # build with newer zlib (bug #389863) + sed -i -e '74i#define OF(x) x' cegui/src/minizip/unzip.h || die if use examples ; then cp -r Samples Samples.clean rm -f $(find Samples.clean -name 'Makefile*') @@ -55,7 +56,9 @@ src_prepare() { } src_configure() { + # ogre-1.6.5 needs older cegui (bug #387103) econf \ + --disable-ogre-renderer \ $(use_enable bidi bidirectional-text) \ $(use_enable debug) \ $(use_enable devil) \ @@ -66,7 +69,6 @@ src_configure() { $(use_enable lua lua-module) \ $(use_enable lua toluacegui) \ --enable-external-toluapp \ - $(use_enable ogre ogre-renderer) \ $(use_enable opengl opengl-renderer) \ --enable-external-glew \ $(use_enable pcre) \ |