summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2012-04-19 23:44:41 +0200
committerSven Eden <sven.eden@gmx.de>2012-04-19 23:44:41 +0200
commita63a14cea67558ddd3d6451d7107a1f6efd08986 (patch)
tree3f9bb5d2d14896df58eb7f4aca36ad35542a9226
parentCrystalSpace: New ebuild for the 2.0 beta3 ebuild with some fixes (diff)
downloadseden-a63a14cea67558ddd3d6451d7107a1f6efd08986.tar.gz
seden-a63a14cea67558ddd3d6451d7107a1f6efd08986.tar.bz2
seden-a63a14cea67558ddd3d6451d7107a1f6efd08986.zip
FreeOrion: Some updates regarding changes with ogre and boost
-rw-r--r--games-strategy/freeorion/ChangeLog11
-rw-r--r--games-strategy/freeorion/Manifest5
-rw-r--r--games-strategy/freeorion/freeorion-9999-r5.ebuild106
-rw-r--r--games-strategy/freeorion/freeorion-9999-r7.ebuild (renamed from games-strategy/freeorion/freeorion-9999-r6.ebuild)14
4 files changed, 14 insertions, 122 deletions
diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 1d4b97a..2626db8 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for games-strategy/freeorion
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*freeorion-9999-r7 (19 Apr 2012)
+
+ 19 Apr 2012; Sven Eden <sven.eden@gmx.de>
+ +freeorion-9999-r7.ebuild,
+ -freeorion-9999-r5.ebuild,
+ -freeorion-9999-r6.ebuild:
+ ogre has been updated and does not fit any more to the old ebuilds.
+ Further this eliminates the nead for Cg if multi threading is wanted.
+
*freeorion-9999-r6 (26 Jun 2011)
26 Jun 2011; Sven Eden <sven.eden@gmx.de> +freeorion-9999-r6.ebuild :
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 6e56282..017c6f0 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,4 +1,3 @@
-EBUILD freeorion-9999-r5.ebuild 2829 RMD160 ddbb4bb5ac6b03e36dbcbe8fba9f489d3286cbd8 SHA1 dbdd4eb8e819b9262ae145155e481a3794645a3b SHA256 4a550b9a6a11c38f58e26030c45ae9d6093e65b8d94b13feec321548933fe566
-EBUILD freeorion-9999-r6.ebuild 2825 RMD160 f6291e38ccc0842645af72c89d3088760b8154a3 SHA1 b6b167c596f14faabb3806455e6d3944c3be5beb SHA256 8183e27d96ff0fee3df1f47afc36c217d489422fbd07781297e8abb2c3c2b1c7
-MISC ChangeLog 457 RMD160 8e6b1257fd95f0c88b390ddead71014792ce2eca SHA1 55e562f9aba1ebc9bd540b1a82ce4bad0820875c SHA256 ec8426df7c83758b8434bfafead74fc096be17aa2b78fac3055f4df03ac0df4d
+EBUILD freeorion-9999-r7.ebuild 2341 RMD160 3496d21fd9877817b7b06c02c5bcb7fe4b32af43 SHA1 371429e690906d772d3608da57b2de8389ba45f1 SHA256 93c9b089417294ca50ceb70faac3f1800bac0429f33f0a319db23aee00a44ae5
+MISC ChangeLog 765 RMD160 85fdd9dacfff70e32f4b116beb3fb0a2a6af3906 SHA1 1fe19ad179fac8cd805b0dc1ed4d87ad0e0e32dd SHA256 9fd57cbc75d72919cb575c8e30c01dec081410cba6d0a7fecca7e00bb4d0fd51
MISC metadata.xml 482 RMD160 4d1a06c8b3833acbcf43d0b56a0c0ff3ba938fde SHA1 fdcead5b8dc226ee4bc44e19642fdec006831c2d SHA256 d440736d71b8eaac1b5a2a5171274171e7b5bbbcc6d4b8d2c14fd37c36e51a96
diff --git a/games-strategy/freeorion/freeorion-9999-r5.ebuild b/games-strategy/freeorion/freeorion-9999-r5.ebuild
deleted file mode 100644
index 477574d..0000000
--- a/games-strategy/freeorion/freeorion-9999-r5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils games subversion
-
-DESCRIPTION="FreeOrion is a free and open source clone of Master Of Orion"
-HOMEPAGE="http://www.freeorion.org"
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk"
-ESVN_PROJECT="${PN}"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cg debug threads xml"
-
-SLOT="0"
-
-RDEPEND="
- dev-games/gigi[ogre,threads=]
- || ( threads? ( >=dev-games/ogre-1.7.1[boost,cg=,boost-threads] )
- !threads? ( >=dev-games/ogre-1.7.1[boost,cg=,-boost-threads] )
- )
- <dev-lang/python-3
- || ( dev-libs/boost:1.44
- dev-libs/boost:1.45
- )
- media-gfx/graphviz
- media-libs/freealut
- >=media-libs/libogg-1.1.3
- >=media-libs/libsdl-1.2
- >=media-libs/libvorbis-1.1.2
- media-libs/openal
- sci-physics/bullet
- sys-devel/libtool
- sys-libs/zlib"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-CMAKE_USE_DIR="${S}/FreeOrion"
-
-src_prepare() {
- # Let's make the autorevision work.
- subversion_wc_info
- sed -i -e \
- "s:svn_revision_number ???:svn_revision_number ${ESVN_WC_REVISION}:" \
- FreeOrion/CMakeLists.txt || die "sed FreeOrion/CMakeLists.txt failed"
-}
-
-src_configure() {
- # Due to the testing nature of gigi and freeorion,
- # and all the ogre+boost stuff, flags should be filtered:
- strip-flags
-
- # Type-Pun pointers always break strict aliasing rules,
- # and this thing is full of those
- append-flags -fno-strict-aliasing
-
- # using xml serialization seems to break on linker level with
- # boost-1.45. For this the new xml USE flag will switch to
- # binary archives if -xml is used:
- use xml || sed -i -e \
- "s:define FREEORION_BINARY_SERIALIZATION 0:define FREEORION_BINARY_SERIALIZATION 1:" \
- FreeOrion/util/Serialize.h || die "sed FreeOrion/util/Serialize.h failed"
-
- local mycmakeargs+=(
- $(cmake-utils_use_enable debug DEBUG)
- $(cmake-utils_use_build debug DEBUG)
- )
-
- mycmakeargs+=(
- "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}/${PN}"
- "-DCMAKE_INSTALL_ICONDIR=${GAMES_DATADIR_BASE}/pixmaps/"
- "-DCMAKE_INSTALL_DESKTOPDIR=${GAMES_DATADIR_BASE}/applications/"
- "-DCMAKE_DOC_DIR=/usr/share/doc/${PF}"
- "-DCMAKE_MAN_DIR=/usr/share/man"
- "-DCMAKE_DATA_DIR=${GAMES_DATADIR}"
- "-DCMAKE_DATA_PATH=${GAMES_DATADIR}"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- ## This is a rather wild thing, but I can't think of a quicker way right now:
- # Add ogre_plugins config:
-
- OGRECFG="${D}/${GAMES_PREFIX}/${PN}/ogre_plugins.cfg"
- cat > ${OGRECFG} <<EOF
-# Plugin folder
-PluginFolder=/usr/lib64/OGRE
-# Plugins
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_OctreeSceneManager
-EOF
-
- ## Extra-Plugin with cg enabled:
- use cg && echo "Plugin=Plugin_CgProgramManager" >> ${OGRECFG}
-
- prepgamesdirs
-}
diff --git a/games-strategy/freeorion/freeorion-9999-r6.ebuild b/games-strategy/freeorion/freeorion-9999-r7.ebuild
index 589a054..6afdfdc 100644
--- a/games-strategy/freeorion/freeorion-9999-r6.ebuild
+++ b/games-strategy/freeorion/freeorion-9999-r7.ebuild
@@ -13,18 +13,15 @@ ESVN_PROJECT="${PN}"
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
KEYWORDS="~amd64 ~x86"
-# IUSE="cg debug threads xml"
IUSE="cg debug threads"
SLOT="0"
RDEPEND="
dev-games/gigi[ogre,threads=]
- || ( threads? ( >=dev-games/ogre-1.7.1[boost,cg=,boost-threads] )
- !threads? ( >=dev-games/ogre-1.7.1[boost,cg=,-boost-threads] )
- )
+ >=dev-games/ogre-1.7.4[threads=]
<dev-lang/python-3
- dev-libs/boost:1.46
+ >=dev-libs/boost-1.47
media-gfx/graphviz
media-libs/freealut
>=media-libs/libogg-1.1.3
@@ -57,13 +54,6 @@ src_configure() {
# and this thing is full of those
append-flags -fno-strict-aliasing
- # using xml serialization seems to break on linker level with
- # boost-1.45. For this the new xml USE flag will switch to
- # binary archives if -xml is used:
-# use xml || sed -i -e \
-# "s:define FREEORION_BINARY_SERIALIZATION 0:define FREEORION_BINARY_SERIALIZATION 1:" \
-# FreeOrion/util/Serialize.h || die "sed FreeOrion/util/Serialize.h failed"
-
local mycmakeargs+=(
$(cmake-utils_use_enable debug DEBUG)
$(cmake-utils_use_build debug DEBUG)