summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2017-05-15 14:38:25 +0200
committerSven Eden <sven.eden@gmx.de>2017-05-15 14:38:25 +0200
commit08f78bea735d0c516d33efe32ab35102fb5f5c19 (patch)
tree0af54b8f61d905b6325f1b84a07624e04eacdbcf /dev-games
parentdev-games/ogre-1.10.4 : Long overdue version bump (diff)
downloadseden-08f78bea735d0c516d33efe32ab35102fb5f5c19.tar.gz
seden-08f78bea735d0c516d33efe32ab35102fb5f5c19.tar.bz2
seden-08f78bea735d0c516d33efe32ab35102fb5f5c19.zip
dev-games/ogre-1.10.4-r1 : Minor updates
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ogre/Manifest2
-rw-r--r--dev-games/ogre/ogre-1.10.4-r1.ebuild (renamed from dev-games/ogre/ogre-1.10.4.ebuild)39
2 files changed, 22 insertions, 19 deletions
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index f3dae9d..6f165ff 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1 +1 @@
-DIST ogre-1.10.4.zip 144419463 SHA256 6db5a2d0d5e0bddfc99450e175d96dbd0884b17ed04c9c2ab408028d162fc950 SHA512 2f9e6ebc8353a10a35e5c2ebd101de5cac5eed36b333d51b0402a981eb6ce111412e5e9b8efcd89592f3688299f7dc3aa091cc2090af8b93c6d4e90beb1b31e1 WHIRLPOOL b4c786bf256db8e546e9d34ff6a305d26662ead9f16b955c4e5306a3405cdcea3a2c40dbc386f85e95eb3c09ad6e495ac1fd93e3f8d8223e14e91f90c45fd8f4
+DIST ogre-1.10.4.tar.bz2 134698188 SHA256 2fd3781ed533898602ced9ee528e9b42f0694ff8561e21341f44752e6d33d86b SHA512 6756648f7e90d8f6e6f49f85257f81be27b63c7b572028b97f9ded57d5a9256af39c0afba649190190565bd4a5b1b25354fb0d237e3b93453709bc4d49c777ad WHIRLPOOL 05ad8fd28787ed1cd847f02fcd5b2936615502c81ae455d4c6306184bccda3d8ae43cbb51348f3c104a27c64d9e9c567787869eb6ec15389c00f932b258c8c2f
diff --git a/dev-games/ogre/ogre-1.10.4.ebuild b/dev-games/ogre/ogre-1.10.4-r1.ebuild
index efffa97..d8f2297 100644
--- a/dev-games/ogre/ogre-1.10.4.ebuild
+++ b/dev-games/ogre/ogre-1.10.4-r1.ebuild
@@ -10,7 +10,7 @@ MY_PV=$(get_version_component_range 1-3)
DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.zip -> ${P}.zip"
+SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="MIT public-domain"
SLOT="0/1.10.0"
@@ -21,11 +21,12 @@ IUSE="\
gles3 ois +opengl poco profile source tbb threads tools +zip"
REQUIRED_USE="
- threads? ( || ( boost poco tbb ) )
- tbb? ( threads )
+ gl3plus? ( !gles2 !gles3 opengl )
gles2? ( !gl3plus )
- gles3? ( ( !gl3plus ) ( gles2 ) )
- gl3plus? ( ( opengl ) ( !gles2 ) ( !gles3 ) )
+ gles3? ( !gl3plus gles2 )
+ poco? ( !tbb threads )
+ tbb? ( !poco threads )
+ threads? ( || ( boost poco tbb ) )
"
RESTRICT="test" #139905
@@ -39,16 +40,20 @@ RDEPEND="
x11-libs/libXaw
x11-libs/libXrandr
x11-libs/libXt
- boost? ( dev-libs/boost )
- cg? ( media-gfx/nvidia-cg-toolkit )
- freeimage? ( media-libs/freeimage )
- gles2? ( >=media-libs/mesa-9.0.0[gles2] )
- gles3? ( >=media-libs/mesa-10.0.0[gles2] )
- gl3plus? ( >=media-libs/mesa-9.2.5 )
- ois? ( dev-games/ois )
- poco? ( dev-libs/poco )
- tbb? ( dev-cpp/tbb )
- zip? ( sys-libs/zlib dev-libs/zziplib )"
+ boost? ( dev-libs/boost )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ freeimage? ( media-libs/freeimage )
+ gles2? ( media-libs/mesa[gles2] )
+ gl3plus? ( || (
+ media-libs/mesa[dri3]
+ x11-drivers/nvidia-drivers
+ x11-drivers/xf86-video-amdgpu
+ ) )
+ ois? ( dev-games/ois )
+ opengl? ( virtual/opengl )
+ poco? ( dev-libs/poco )
+ tbb? ( dev-cpp/tbb )
+ zip? ( sys-libs/zlib dev-libs/zziplib )"
DEPEND="${RDEPEND}
x11-proto/xf86vidmodeproto
@@ -60,8 +65,6 @@ PATCHES=(
"${FILESDIR}"/1.10.4-02_remove_media_path_to_bindir.patch
)
-S="${WORKDIR}/sinbad-ogre-1fc934daba1e"
-
src_prepare() {
default
@@ -101,7 +104,7 @@ src_configure() {
if use threads ; then
local f
- for f in tbb poco boost ; do
+ for f in poco tbb boost ; do
use ${f} || continue
mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
break