Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
Date: Fri, 07 Sep 2018 11:42:49
Message-Id: 1536319370.220665f8a33f57b0c3c00301c120c5e248661e9a.asturm@gentoo
1 commit: 220665f8a33f57b0c3c00301c120c5e248661e9a
2 Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
3 AuthorDate: Mon Aug 6 06:13:01 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 7 11:22:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220665f8
7
8 dev-games/ogre: drop obsolete 1.10.11
9
10 dev-games/ogre/Manifest | 1 -
11 ...ogre-1.10.11-fix_double_precision-88f0d5b.patch | 29 ------
12 dev-games/ogre/ogre-1.10.11.ebuild | 116 ---------------------
13 3 files changed, 146 deletions(-)
14
15 diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
16 index fa7ffd7cf96..93a14df137a 100644
17 --- a/dev-games/ogre/Manifest
18 +++ b/dev-games/ogre/Manifest
19 @@ -1,3 +1,2 @@
20 -DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54
21 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
22 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
23
24 diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
25 deleted file mode 100644
26 index 53d7a0925d5..00000000000
27 --- a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
28 +++ /dev/null
29 @@ -1,29 +0,0 @@
30 -# HG changeset patch
31 -# User niparx <koliap@×××××.com>
32 -# Date 1515160111 -7200
33 -# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159
34 -# Parent bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c
35 -[OGRE-592] RTShaderSystem compile error when using double precision (#622)
36 -
37 -RTShaderSystem: compile error when using double precision
38 -
39 -https://ogre3d.atlassian.net/browse/OGRE-592
40 -
41 -diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
42 ---- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
43 -+++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
44 -@@ -654,8 +654,12 @@
45 - curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN);
46 - }
47 - else
48 -- {
49 -- curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN);
50 -+ {
51 -+ curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r,
52 -+ (Real)colourValue.g,
53 -+ (Real)colourValue.b,
54 -+ (Real)colourValue.a)),
55 -+ Operand::OPS_IN);
56 - }
57 -
58 - curFuncInvocation->pushOperand(arg, Operand::OPS_OUT);
59
60 diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild
61 deleted file mode 100644
62 index 3094851d1f6..00000000000
63 --- a/dev-games/ogre/ogre-1.10.11.ebuild
64 +++ /dev/null
65 @@ -1,116 +0,0 @@
66 -# Copyright 1999-2018 Gentoo Foundation
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=6
70 -
71 -inherit cmake-utils
72 -
73 -DESCRIPTION="Object-oriented Graphics Rendering Engine"
74 -HOMEPAGE="https://www.ogre3d.org/"
75 -SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
76 -
77 -LICENSE="MIT public-domain"
78 -SLOT="0/1.10.0"
79 -KEYWORDS="~amd64 ~arm ~x86"
80 -
81 -IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools"
82 -
83 -REQUIRED_USE="examples? ( ois )
84 - gles3? ( gles2 )
85 - gl3plus? ( opengl )"
86 -
87 -RESTRICT="test" #139905
88 -
89 -RDEPEND="
90 - dev-libs/boost
91 - dev-libs/zziplib
92 - media-libs/freetype:2
93 - virtual/glu
94 - virtual/opengl
95 - x11-libs/libX11
96 - x11-libs/libXaw
97 - x11-libs/libXrandr
98 - x11-libs/libXt
99 - cg? ( media-gfx/nvidia-cg-toolkit )
100 - freeimage? ( media-libs/freeimage )
101 - gl3plus? ( >=media-libs/mesa-9.2.5 )
102 - gles2? ( >=media-libs/mesa-9.0.0[gles2] )
103 - gles3? ( >=media-libs/mesa-10.0.0[gles2] )
104 - ois? ( dev-games/ois )
105 - tools? ( dev-libs/tinyxml[stl] )"
106 -DEPEND="${RDEPEND}
107 - virtual/pkgconfig
108 - x11-base/xorg-proto
109 - doc? ( app-doc/doxygen )"
110 -
111 -PATCHES=(
112 - "${FILESDIR}/${P}-samples.patch"
113 - "${FILESDIR}/${P}-resource_path.patch"
114 - "${FILESDIR}/${P}-media_path.patch"
115 - "${FILESDIR}/${P}-fix_double_precision-88f0d5b.patch"
116 -)
117 -
118 -src_prepare() {
119 - sed -i \
120 - -e "s:share/OGRE/docs:share/doc/${PF}:" \
121 - Docs/CMakeLists.txt || die
122 - # Stupid build system hardcodes release names
123 - sed -i \
124 - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
125 - CMake/Utils/OgreConfigTargets.cmake || die
126 -
127 - # make sure we're not using the included tinyxml
128 - # Update for 1.10.11: Unfortunately the build system does not
129 - # search for a system wide tinyxml at this moment. However,
130 - # TinyXML is meant to be built into and not linked to a using
131 - # project anyway.
132 - # rm -f Tools/XMLConverter/{include,src}/tiny*.*
133 -
134 - # Fix some path issues
135 - cmake-utils_src_prepare
136 -}
137 -
138 -src_configure() {
139 - local mycmakeargs=(
140 - -DOGRE_BUILD_COMPONENT_JAVA=NO
141 - -DOGRE_BUILD_COMPONENT_PYTHON=NO
142 - -DOGRE_BUILD_DEPENDENCIES=NO
143 - -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
144 - -DOGRE_BUILD_SAMPLES=$(usex examples)
145 - -DOGRE_BUILD_TESTS=FALSE
146 - -DOGRE_BUILD_TOOLS=$(usex tools)
147 - -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
148 - -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
149 - -DOGRE_CONFIG_THREADS=3
150 - -DOGRE_CONFIG_THREAD_PROVIDER=std
151 - -DOGRE_FULL_RPATH=NO
152 - -DOGRE_INSTALL_DOCS=$(usex doc)
153 - -DOGRE_INSTALL_SAMPLES=$(usex examples)
154 - -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
155 - -DOGRE_NODE_STORAGE_LEGACY=NO
156 - -DOGRE_PROFILING=$(usex profile)
157 - -DOGRE_RESOURCEMANAGER_STRICT=strict
158 - -DOGRE_USE_STD11=YES
159 - )
160 -
161 - cmake-utils_src_configure
162 -}
163 -
164 -src_install() {
165 - cmake-utils_src_install
166 -
167 - CONFIGDIR=/etc/OGRE
168 - SHAREDIR=/usr/share/OGRE
169 -
170 - # plugins and resources are the main configuration
171 - insinto "${CONFIGDIR}"
172 - doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
173 - doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
174 - dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
175 - dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
176 -
177 - # These are only for the sample browser
178 - insinto "${SHAREDIR}"
179 - doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
180 - doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
181 -}