diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-11 18:38:14 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-11 18:38:14 +0000 |
commit | eb46d863e50fcbdf02e8a3dc2096d77d656a1195 (patch) | |
tree | 6a580f744a47f9a3b98ddb24a42f2e9e0c2b27e2 /dev-games/ogre | |
parent | Remove old version. (diff) | |
download | gentoo-2-eb46d863e50fcbdf02e8a3dc2096d77d656a1195.tar.gz gentoo-2-eb46d863e50fcbdf02e8a3dc2096d77d656a1195.tar.bz2 gentoo-2-eb46d863e50fcbdf02e8a3dc2096d77d656a1195.zip |
version bump
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-games/ogre')
-rw-r--r-- | dev-games/ogre/ChangeLog | 10 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.6.5-automake.patch | 9 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.6.5-boost.patch | 10 | ||||
-rw-r--r-- | dev-games/ogre/ogre-1.6.5.ebuild | 85 |
4 files changed, 112 insertions, 2 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 5ccad1524752..b6578eaa8d83 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -1,6 +1,12 @@ # 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.62 2009/12/21 20:44:22 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.63 2010/01/11 18:38:13 mr_bones_ Exp $ + +*ogre-1.6.5 (11 Jan 2010) + + 11 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org> +ogre-1.6.5.ebuild, + +files/ogre-1.6.5-automake.patch, +files/ogre-1.6.5-boost.patch: + version bump 21 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.4.ebuild: look in /opt for nvidia-cg-toolkit (bug #259169) diff --git a/dev-games/ogre/files/ogre-1.6.5-automake.patch b/dev-games/ogre/files/ogre-1.6.5-automake.patch new file mode 100644 index 000000000000..bfb473a2381c --- /dev/null +++ b/dev-games/ogre/files/ogre-1.6.5-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/files/ogre-1.6.5-boost.patch b/dev-games/ogre/files/ogre-1.6.5-boost.patch new file mode 100644 index 000000000000..9f1784c558cd --- /dev/null +++ b/dev-games/ogre/files/ogre-1.6.5-boost.patch @@ -0,0 +1,10 @@ +--- OgreMain/include/OgreStdHeaders.h.old 2009-11-18 14:08:48.000000000 +0100 ++++ OgreMain/include/OgreStdHeaders.h 2009-11-18 14:09:59.000000000 +0100 +@@ -110,6 +110,7 @@ + # include <boost/thread/recursive_mutex.hpp> + # include <boost/thread/condition.hpp> + # include <boost/thread/thread.hpp> ++# include <boost/function.hpp> + #endif + + #if defined ( OGRE_GCC_VISIBILITY ) diff --git a/dev-games/ogre/ogre-1.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild new file mode 100644 index 000000000000..4deaaffb4a18 --- /dev/null +++ b/dev-games/ogre/ogre-1.6.5.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.1 2010/01/11 18:38:13 mr_bones_ Exp $ + +EAPI=2 +inherit multilib eutils autotools flag-o-matic + +DESCRIPTION="Object-oriented Graphics Rendering Engine" +HOMEPAGE="http://www.ogre3d.org/" +SRC_URI="mirror://sourceforge/ogre/ogre-v${PV//./-}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc cg devil double-precision examples gtk threads" +RESTRICT="test" #139905 + +RDEPEND="dev-libs/zziplib + media-libs/freetype:2 + virtual/opengl + virtual/glu + x11-libs/libXt + x11-libs/libXaw + x11-libs/libXrandr + x11-libs/libX11 + cg? ( media-gfx/nvidia-cg-toolkit ) + devil? ( media-libs/devil ) + gtk? ( x11-libs/gtk+:2 ) + threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) )" +DEPEND="${RDEPEND} + x11-proto/xf86vidmodeproto + dev-util/pkgconfig" + +S=${WORKDIR}/${PN} + +src_prepare() { + ecvs_clean + if use examples ; then + cp -r Samples install-examples || die + find install-examples \ + '(' -name .keepme -o -name '*.cbp' -o -name '*.vcproj*' ')' \ + -print0 | xargs -0 rm -rf + find install-examples -type d -print0 | xargs -0 rmdir 2> /dev/null + sed -i \ + -e "s:/usr/local/lib/OGRE:/usr/$(get_libdir)/OGRE:" \ + $(grep -rl /usr/local/lib/OGRE install-examples) \ + || die "sed failed" + fi + sed -i -e '/CPPUNIT/d' configure.in || die "sed failed" + epatch "${FILESDIR}"/${P}-boost.patch \ + "${FILESDIR}"/${P}-automake.patch + eautoreconf +} + +src_configure() { + append-ldflags -L/opt/nvidia-cg-toolkit/lib + append-cppflags -I/opt/nvidia-cg-toolkit/include + strip-flags + + econf \ + --disable-dependency-tracking \ + --disable-freeimage \ + --disable-openexr \ + --disable-ogre-demos \ + --enable-static \ + --with-platform=GLX \ + --with-gui=$(usev gtk || echo Xt) \ + $(use_enable cg) \ + $(use_enable devil) \ + $(use_enable double-precision double) \ + $(use_enable threads threading) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + if use doc ; then + insinto /usr/share/doc/${PF}/html + doins -r Docs/* || die "doins Docs failed" + fi + if use examples ; then + insinto /usr/share/doc/${PF}/Samples + doins -r install-examples/* || die "doins Samples failed" + fi + dodoc AUTHORS BUGS LINUX.DEV README +} |