1 |
commit: f5337cdf544c153250ab4602f297a390a4b0ca29 |
2 |
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net> |
3 |
AuthorDate: Sun Nov 10 15:43:00 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 7 22:58:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5337cdf |
7 |
|
8 |
dev-games/ogre: Bump 2.1 to pre20191212 and move to GitHub |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Sven Eden <sven.eden <AT> gmx.de> |
12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
13 |
|
14 |
dev-games/ogre/Manifest | 1 - |
15 |
dev-games/ogre/files/ogre-2.1-media_path.patch | 14 +---- |
16 |
dev-games/ogre/files/ogre-2.1-resource_path.patch | 9 +-- |
17 |
...20180901.ebuild => ogre-2.1_pre20191212.ebuild} | 65 ++++++++++++++-------- |
18 |
4 files changed, 49 insertions(+), 40 deletions(-) |
19 |
|
20 |
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest |
21 |
index aa4b1ac188e..0c2635641c1 100644 |
22 |
--- a/dev-games/ogre/Manifest |
23 |
+++ b/dev-games/ogre/Manifest |
24 |
@@ -3,4 +3,3 @@ DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308 |
25 |
DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 |
26 |
DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8 |
27 |
DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde |
28 |
-DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04 |
29 |
|
30 |
diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch |
31 |
index 5e7ad276ac0..a51d0576c98 100644 |
32 |
--- a/dev-games/ogre/files/ogre-2.1-media_path.patch |
33 |
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch |
34 |
@@ -1,6 +1,8 @@ |
35 |
+Media paths are fine already, the removed lines would screw them up. |
36 |
+ |
37 |
--- a/CMake/InstallResources.cmake 2018-03-23 10:49:24.620486243 +0100 |
38 |
+++ b/CMake/InstallResources.cmake 2018-03-23 10:50:52.089485597 +0100 |
39 |
-@@ -186,15 +186,16 @@ |
40 |
+@@ -186,15 +186,6 @@ |
41 |
|
42 |
# CREATE CONFIG FILES - BUILD DIR VERSIONS |
43 |
if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) |
44 |
@@ -13,16 +15,6 @@ |
45 |
- endif() |
46 |
- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") |
47 |
- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") |
48 |
-+# No, they were fine already |
49 |
-+# if( NOT APPLE ) |
50 |
-+# set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") |
51 |
-+# set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") |
52 |
-+# else() |
53 |
-+# set(OGRE_MEDIA_DIR_REL "Contents/Resources") |
54 |
-+# set(OGRE_MEDIA_DIR_DBG "Contents/Resources") |
55 |
-+# endif() |
56 |
-+# set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") |
57 |
-+# set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") |
58 |
else () |
59 |
# iOS needs to use relative paths in the config files |
60 |
set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") |
61 |
|
62 |
diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch |
63 |
index 32cfef0d8d1..32cbc94e7d0 100644 |
64 |
--- a/dev-games/ogre/files/ogre-2.1-resource_path.patch |
65 |
+++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch |
66 |
@@ -1,6 +1,8 @@ |
67 |
+These was already configured above, the BINARY paths are wrong! |
68 |
+ |
69 |
--- a/CMake/InstallResources.cmake 2018-03-23 10:48:44.371486540 +0100 |
70 |
+++ b/CMake/InstallResources.cmake 2018-03-23 10:49:08.333486363 +0100 |
71 |
-@@ -226,10 +226,11 @@ |
72 |
+@@ -226,10 +226,6 @@ |
73 |
set(OGRE_SAMPLES_DIR_REL "") |
74 |
set(OGRE_SAMPLES_DIR_DBG "") |
75 |
elseif (UNIX) |
76 |
@@ -8,11 +10,6 @@ |
77 |
- set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") |
78 |
- set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") |
79 |
- set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") |
80 |
-+# No, this was already configured above, the BINARY paths are wrong! |
81 |
-+# set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") |
82 |
-+# set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") |
83 |
-+# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") |
84 |
-+# set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") |
85 |
endif () |
86 |
|
87 |
if (WINDOWS_STORE OR WINDOWS_PHONE) |
88 |
|
89 |
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20191212.ebuild |
90 |
similarity index 70% |
91 |
rename from dev-games/ogre/ogre-2.1_pre20180901.ebuild |
92 |
rename to dev-games/ogre/ogre-2.1_pre20191212.ebuild |
93 |
index f7805764e6e..4973a50d793 100644 |
94 |
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild |
95 |
+++ b/dev-games/ogre/ogre-2.1_pre20191212.ebuild |
96 |
@@ -1,29 +1,30 @@ |
97 |
-# Copyright 1999-2019 Gentoo Authors |
98 |
+# Copyright 1999-2020 Gentoo Authors |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
EAPI=7 |
102 |
|
103 |
-CMAKE_REMOVE_MODULES="yes" |
104 |
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" |
105 |
-inherit cmake-utils |
106 |
|
107 |
-MY_COMMIT="35b083cba64a" |
108 |
-MY_P="sinbad-${PN}-${MY_COMMIT}" |
109 |
+inherit cmake flag-o-matic git-r3 |
110 |
|
111 |
DESCRIPTION="Object-oriented Graphics Rendering Engine" |
112 |
HOMEPAGE="https://www.ogre3d.org/" |
113 |
-SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" |
114 |
+ |
115 |
+EGIT_BRANCH="v2-1" |
116 |
+EGIT_COMMIT="5b682fb90c9e8e660e2fbf92bbf7797a9246700d" |
117 |
+EGIT_REPO_URI="https://github.com/OGRECave/ogre-next.git" |
118 |
+EGIT_SUBMODULES=() |
119 |
|
120 |
LICENSE="MIT public-domain" |
121 |
SLOT="0/2.1" |
122 |
KEYWORDS="~amd64" |
123 |
|
124 |
-IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations |
125 |
- mobile +opengl profile tools" |
126 |
+IUSE="+cache debug doc egl examples +freeimage gles2 json |
127 |
+ legacy-animations mobile +opengl profile tools" |
128 |
|
129 |
# USE flags that do not work, as their options aren't ported, yet. |
130 |
-# cg |
131 |
-# double-precision |
132 |
+# cg |
133 |
+# double-precision |
134 |
|
135 |
REQUIRED_USE=" |
136 |
|| ( gles2 opengl ) |
137 |
@@ -51,6 +52,7 @@ RDEPEND=" |
138 |
" |
139 |
# Dependencies for USE flags that do not work, yet. |
140 |
# cg? ( media-gfx/nvidia-cg-toolkit ) |
141 |
+ |
142 |
DEPEND="${RDEPEND} |
143 |
virtual/pkgconfig |
144 |
x11-base/xorg-proto |
145 |
@@ -63,8 +65,6 @@ PATCHES=( |
146 |
"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch" |
147 |
) |
148 |
|
149 |
-S=${WORKDIR}/${MY_P} |
150 |
- |
151 |
src_prepare() { |
152 |
sed -i \ |
153 |
-e "s:share/OGRE/docs:share/doc/${PF}:" \ |
154 |
@@ -75,7 +75,7 @@ src_prepare() { |
155 |
CMake/Utils/OgreConfigTargets.cmake || die |
156 |
|
157 |
# Fix some path issues |
158 |
- cmake-utils_src_prepare |
159 |
+ cmake_src_prepare |
160 |
} |
161 |
|
162 |
src_configure() { |
163 |
@@ -86,18 +86,22 @@ src_configure() { |
164 |
-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile) |
165 |
-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes |
166 |
-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes |
167 |
+ -DOGRE_BUILD_PLATFORM_NACL=no |
168 |
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) |
169 |
-DOGRE_BUILD_RENDERSYSTEM_GLES=no |
170 |
-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) |
171 |
-DOGRE_BUILD_SAMPLES2=$(usex examples) |
172 |
-DOGRE_BUILD_TESTS=no |
173 |
-DOGRE_BUILD_TOOLS=$(usex tools) |
174 |
+ -DOGRE_CONFIG_ALLOCATOR=$(usex debug 5 1) |
175 |
+ -DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=yes |
176 |
-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage) |
177 |
-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache) |
178 |
-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\ |
179 |
usex gles2 $(\ |
180 |
usex mobile no yes) no) |
181 |
-DOGRE_CONFIG_ENABLE_JSON=$(usex json) |
182 |
+ -DOGRE_CONFIG_MEMTRACK_DEBUG=$(usex debug) |
183 |
-DOGRE_CONFIG_THREADS=2 |
184 |
-DOGRE_CONFIG_THREAD_PROVIDER=std |
185 |
-DOGRE_FULL_RPATH=no |
186 |
@@ -108,10 +112,16 @@ src_configure() { |
187 |
-DOGRE_PROFILING_PROVIDER=$(usex profile none internal) |
188 |
-DOGRE_USE_BOOST=no |
189 |
) |
190 |
- # Options that aren't ported, yet: |
191 |
- # -DOGRE_BUILD_PLUGIN_CG=$(usex cg) |
192 |
+ |
193 |
+ # The double-precision mode can not be enabled, yet. |
194 |
# -DOGRE_CONFIG_DOUBLE=$(usex double-precision) |
195 |
|
196 |
+ # The CgFxScriptLoader doesn't seem to be completely ported, yet. |
197 |
+ # USE flag disabled. |
198 |
+ mycmakeargs+=( |
199 |
+ -DOGRE_BUILD_PLUGIN_CG=no |
200 |
+ ) |
201 |
+ |
202 |
# These components are off by default, as they might not be ported, yet. |
203 |
# When advancing to a newer commit, try whether any of the disabled |
204 |
# components can be activated now. |
205 |
@@ -125,21 +135,32 @@ src_configure() { |
206 |
-DOGRE_BUILD_COMPONENT_VOLUME=no |
207 |
) |
208 |
|
209 |
- cmake-utils_src_configure |
210 |
+ # Take out the warning about deprecated copy, as Ogre emits thousands of |
211 |
+ # those. But using a deprecated way of doing things isn't an error and |
212 |
+ # mainly of interest for developers. |
213 |
+ # (The warning is part of -Wextra and only effects C++ compilation.) |
214 |
+ append-cxxflags $(test-flags-CXX -Wno-deprecated-copy) |
215 |
+ |
216 |
+ # The same with the old ways of using memset(0...) on objects. It is |
217 |
+ # no longer assumed to be a good idea, but a warning about it isn't |
218 |
+ # of any value to the user. (And it happens many times in Ogre.) |
219 |
+ append-cxxflags $(test-flags-CXX -Wno-class-memaccess) |
220 |
+ |
221 |
+ cmake_src_configure |
222 |
} |
223 |
|
224 |
src_install() { |
225 |
- cmake-utils_src_install |
226 |
+ cmake_src_install |
227 |
|
228 |
CONFIGDIR=/etc/OGRE |
229 |
SHAREDIR=/usr/share/OGRE |
230 |
|
231 |
# plugins and resources are the main configuration |
232 |
insinto "${CONFIGDIR}" |
233 |
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg |
234 |
- doins "${CMAKE_BUILD_DIR}"/bin/plugins_tools.cfg |
235 |
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg |
236 |
- doins "${CMAKE_BUILD_DIR}"/bin/resources2.cfg |
237 |
+ doins "${BUILD_DIR}"/bin/plugins.cfg |
238 |
+ doins "${BUILD_DIR}"/bin/plugins_tools.cfg |
239 |
+ doins "${BUILD_DIR}"/bin/resources.cfg |
240 |
+ doins "${BUILD_DIR}"/bin/resources2.cfg |
241 |
dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg |
242 |
dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg |
243 |
dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg |
244 |
@@ -148,6 +169,6 @@ src_install() { |
245 |
# These are only for the Samples |
246 |
if use examples ; then |
247 |
insinto "${SHAREDIR}" |
248 |
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg |
249 |
+ doins "${BUILD_DIR}"/bin/samples.cfg |
250 |
fi |
251 |
} |