diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-12-16 21:17:35 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-12-16 21:17:35 +0000 |
| commit | bde14e7269d7c2f694665ae823b43decb22bb1c0 (patch) | |
| tree | ad6515e20ba1b818e7526efb04ac16aa4dfce9cc /dev-games/ogre | |
| parent | amd64/x86 stable, bug #296418 (diff) | |
| download | gentoo-2-bde14e7269d7c2f694665ae823b43decb22bb1c0.tar.gz gentoo-2-bde14e7269d7c2f694665ae823b43decb22bb1c0.tar.bz2 gentoo-2-bde14e7269d7c2f694665ae823b43decb22bb1c0.zip | |
Hopefully fixed upgrade. Bug #295987
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-games/ogre')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.6.4-automake.patch | 9 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.4.9.ebuild | 4 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.6.4.ebuild | 5 |
4 files changed, 19 insertions, 5 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 2d7de586316b..0317bce4ec52 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/ogre # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.60 2009/12/03 01:41:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.61 2009/12/16 21:17:34 tupone Exp $ + + 16 Dec 2009; Tupone Alfredo <tupone@gentoo.org> ogre-1.6.4.ebuild, + +files/ogre-1.6.4-automake.patch: + Hopefully fixed upgrade. Bug #295987 by Dennis Schridde *ogre-1.6.4 (03 Dec 2009) diff --git a/dev-games/ogre/files/ogre-1.6.4-automake.patch b/dev-games/ogre/files/ogre-1.6.4-automake.patch new file mode 100644 index 000000000000..bfb473a2381c --- /dev/null +++ b/dev-games/ogre/files/ogre-1.6.4-automake.patch @@ -0,0 +1,9 @@ +--- RenderSystems/GL/src/Makefile.am.old 2009-12-16 12:12:56.000000000 +0100 ++++ RenderSystems/GL/src/Makefile.am 2009-12-16 12:14:43.000000000 +0100 +@@ -42,4 +42,5 @@ + $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \ + $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \ + $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \ +- $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) ++ $(top_builddir)/OgreMain/src/libOgreMain.la \ ++ $(GL_LIBS) $(GLSUPPORT_LIBS) $(OGRE_THREAD_LIBS) diff --git a/dev-games/ogre/ogre-1.4.9.ebuild b/dev-games/ogre/ogre-1.4.9.ebuild index 01dc9d96be62..212ff0669e1f 100644 --- a/dev-games/ogre/ogre-1.4.9.ebuild +++ b/dev-games/ogre/ogre-1.4.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.5 2009/11/12 21:30:30 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.6 2009/12/16 21:17:34 tupone Exp $ inherit multilib eutils autotools flag-o-matic diff --git a/dev-games/ogre/ogre-1.6.4.ebuild b/dev-games/ogre/ogre-1.6.4.ebuild index cb6c281c8439..154828207b1f 100644 --- a/dev-games/ogre/ogre-1.6.4.ebuild +++ b/dev-games/ogre/ogre-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.1 2009/12/03 01:41:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.2 2009/12/16 21:17:34 tupone Exp $ EAPI=2 inherit multilib eutils autotools flag-o-matic @@ -47,7 +47,8 @@ src_prepare() { || die "sed failed" fi sed -i -e '/CPPUNIT/d' configure.in || die "sed failed" - epatch "${FILESDIR}"/${P}-boost.patch + epatch "${FILESDIR}"/${P}-boost.patch \ + "${FILESDIR}"/${P}-automake.patch eautoreconf } |