public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Sterrett (mr_bones_)" <mr_bones_@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/cegui: ChangeLog cegui-0.7.5-r1.ebuild
Date: Wed,  9 Nov 2011 02:04:08 +0000 (UTC)	[thread overview]
Message-ID: <20111109020408.92ED32004B@flycatcher.gentoo.org> (raw)

mr_bones_    11/11/09 02:04:08

  Modified:             ChangeLog cegui-0.7.5-r1.ebuild
  Log:
  build with newer zlib (bug #389863); kill ogre use flag (bug #387103)
  
  (Portage version: 2.1.10.11/cvs/Linux i686)

Revision  Changes    Path
1.39                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	9 Oct 2011 16:44:38 -0000	1.38
+++ ChangeLog	9 Nov 2011 02:04:08 -0000	1.39
@@ -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



1.5                  dev-games/cegui/cegui-0.7.5-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild?r1=1.4&r2=1.5

Index: cegui-0.7.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cegui-0.7.5-r1.ebuild	9 Oct 2011 16:44:38 -0000	1.4
+++ cegui-0.7.5-r1.ebuild	9 Nov 2011 02:04:08 -0000	1.5
@@ -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 @@
 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 @@
 		dev-lang/lua
 		dev-lua/toluapp
 	)
-	ogre? ( dev-games/ogre )
 	opengl? (
 		virtual/opengl
 		virtual/glu
@@ -48,6 +47,8 @@
 	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_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 @@
 		$(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) \






             reply	other threads:[~2011-11-09  2:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-09  2:04 Michael Sterrett (mr_bones_) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-11-17  6:12 [gentoo-commits] gentoo-x86 commit in dev-games/cegui: ChangeLog cegui-0.7.5-r1.ebuild Michael Sterrett (mr_bones_)
2011-10-09 16:44 Markus Meier (maekke)
2011-08-02 16:23 Markos Chandras (hwoarang)
2011-04-27 13:34 Alfredo Tupone (tupone)
2011-04-26 21:08 Tristan Heaven (nyhm)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111109020408.92ED32004B@flycatcher.gentoo.org \
    --to=mr_bones_@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox