summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-11-18 14:15:44 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-11-18 14:15:44 +0000
commit92f2c6981dfbb08e04ce80f56e021c1ea425f4a7 (patch)
treef0ef9861eef403988746991c7f21d9d5e51c55c0 /dev-games/ogre
parentStable for ppc. (diff)
downloadhistorical-92f2c6981dfbb08e04ce80f56e021c1ea425f4a7.tar.gz
historical-92f2c6981dfbb08e04ce80f56e021c1ea425f4a7.tar.bz2
historical-92f2c6981dfbb08e04ce80f56e021c1ea425f4a7.zip
Fix build with dev-libs/boost-1.40 Bug #292874
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-games/ogre')
-rw-r--r--dev-games/ogre/ChangeLog6
-rw-r--r--dev-games/ogre/Manifest5
-rw-r--r--dev-games/ogre/files/ogre-1.6.3-boost.patch10
-rw-r--r--dev-games/ogre/ogre-1.6.3.ebuild3
4 files changed, 20 insertions, 4 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 9e0f51be68c0..ebbc4fc812dd 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.58 2009/11/05 01:42:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.59 2009/11/18 14:15:44 tupone Exp $
+
+ 18 Nov 2009; Alfredo Tupone <tupone@gentoo.org> ogre-1.6.3.ebuild,
+ +files/ogre-1.6.3-boost.patch:
+ Fix build with dev-libs/boost-1.40 Bug #292874 by Sebastian Mingramm
05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> ogre-1.6.3.ebuild,
metadata.xml:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 0b556fe62248..8d0596c2811d 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,8 +1,9 @@
AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+AUX ogre-1.6.3-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
DIST ogre-v1-6-3.tar.bz2 41790055 RMD160 e1e16c152d5cb3141e306e4886092b5675695e9a SHA1 0bde8f8d982151c561e9e6c9ccb51e0d19b5eab6 SHA256 cd5897b49d9a9fd12e5a67d0b804ef9302cfff62fa8bfde4941cb488b677a2ef
EBUILD ogre-1.4.9.ebuild 2474 RMD160 fde3e4726d13e7e33e09ef504113eb6a20754c9c SHA1 9e4c7432007c6fe97b7407db03c18d1c726fddfd SHA256 64c1648585f07452afbac82a81f2a9fef3d65a176b553857f90c91c0c5a0ebfa
-EBUILD ogre-1.6.3.ebuild 2155 RMD160 113afe4eb77c82e7e4b20136a305ddae5d12e435 SHA1 7d0b805b380dad72c72dad7b4a716fb56a2a590d SHA256 dcc13dafa35b449f6afb4486f94f73a45658d661fa99fda4f9e7b0c8c7f2d46b
-MISC ChangeLog 8333 RMD160 78a2925122d5c0fc9280ef1f4d0651095c43aeec SHA1 4f3c2f134288bb954b39d38401837529cbe408ed SHA256 94c597a35a0d272756612c8ef08e94a4212c14d8086b7a14ebe55c157be1e331
+EBUILD ogre-1.6.3.ebuild 2196 RMD160 84623534fe35488baf4490e9dc2690de4c98d1cb SHA1 87c9421a0c731aa33847c5207511c765c0034f0b SHA256 b9208d9237263723bf53eb142796b4e3d8fabc65e4c1bedd8a36f7e853c2efce
+MISC ChangeLog 8509 RMD160 b505f8250d90341bd1fbc3aa20f5e2bd7c964aa5 SHA1 7cabd2f216cd5962ef4340f11f147db7e998c770 SHA256 ab482fb2a831cbfc1de899e3df5b073dbccbfe6dac26d4d0e2d720b8f55296b3
MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/files/ogre-1.6.3-boost.patch b/dev-games/ogre/files/ogre-1.6.3-boost.patch
new file mode 100644
index 000000000000..9f1784c558cd
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.3-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.3.ebuild b/dev-games/ogre/ogre-1.6.3.ebuild
index d89cae4ac471..d369d64bcf06 100644
--- a/dev-games/ogre/ogre-1.6.3.ebuild
+++ b/dev-games/ogre/ogre-1.6.3.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.3.ebuild,v 1.2 2009/11/05 01:42:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.3.ebuild,v 1.3 2009/11/18 14:15:44 tupone Exp $
EAPI=2
inherit multilib eutils autotools flag-o-matic
@@ -47,6 +47,7 @@ src_prepare() {
|| die "sed failed"
fi
sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
+ epatch "${FILESDIR}"/${P}-boost.patch
eautoreconf
}