Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
Date: Tue, 25 Aug 2020 22:00:21
Message-Id: 1598392794.089bef6fa06174418903e7ce6ce0e8be242efbb7.chewi@gentoo
1 commit: 089bef6fa06174418903e7ce6ce0e8be242efbb7
2 Author: Sven Eden <yamakuzue <AT> gmx <DOT> net>
3 AuthorDate: Sun Apr 26 12:46:19 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 25 21:59:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089bef6f
7
8 dev-games/ogre: 1.12.8 version bump plus fixes/additions
9
10 Changes:
11 * imgui version has been raised to 1.76
12 * gles2 USE flag has been removed. Ogre with GLES2/3 support now
13 depends on HLSL2GLSL unconditionally. The flags and their config
14 options have been 'backed up' as comments for easy re-integration
15 once we have an ebuild for HLSL2GLSL.
16 ( See: https://github.com/aras-p/hlsl2glslfork )
17 * 'experimental' USE flag renamed to 'deprecated'. The HLMS
18 component has switched from experimental to deprecated.
19 * quakemap.cfg is gone
20 * tests.cfg has been added
21
22 Fixes:
23 * The 'Simple' demo has been fixed to compile with pedantic resource
24 manager.
25
26 Bug: https://bugs.gentoo.org/728458
27 Package-Manager: Portage-2.3.101, Repoman-2.3.22
28 Signed-off-by: Sven Eden <yamakuzure <AT> gmx.net>
29 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
30
31 dev-games/ogre/Manifest | 4 +-
32 .../ogre-1.12.4-fix_sample_source_install.patch | 15 ----
33 .../ogre/files/ogre-1.12.8-fix_Simple_demo.patch | 11 +++
34 ...dia_path.patch => ogre-1.12.8-media_path.patch} | 0
35 ..._path.patch => ogre-1.12.8-resource_path.patch} | 0
36 .../ogre/files/ogre-1.12.8-upgrade_imgui.patch | 28 ++++++++
37 dev-games/ogre/metadata.xml | 5 +-
38 .../{ogre-1.12.4.ebuild => ogre-1.12.8.ebuild} | 82 +++++++++++-----------
39 8 files changed, 85 insertions(+), 60 deletions(-)
40
41 diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
42 index 0fa39921ef9..32e62fd3783 100644
43 --- a/dev-games/ogre/Manifest
44 +++ b/dev-games/ogre/Manifest
45 @@ -1,3 +1,3 @@
46 -DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832
47 -DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8
48 +DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa
49 +DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2
50 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
51
52 diff --git a/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
53 deleted file mode 100644
54 index 616a5e33680..00000000000
55 --- a/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
56 +++ /dev/null
57 @@ -1,15 +0,0 @@
58 -The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25)
59 -
60 ---- a/Samples/CMakeLists.txt 2018-04-25 07:30:38.211048775 +0200
61 -+++ b/Samples/CMakeLists.txt 2018-04-25 07:32:32.842049802 +0200
62 -@@ -97,10 +97,6 @@
63 - PATTERN "scripts" EXCLUDE
64 - )
65 - # install a new CMakeLists.txt file to allow building of samples
66 -- configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY)
67 -- configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
68 -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
69 -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
70 - endif ()
71 -
72 - # Install sample headers, some people rely on these
73
74 diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch
75 new file mode 100644
76 index 00000000000..49ed0190e0a
77 --- /dev/null
78 +++ b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch
79 @@ -0,0 +1,11 @@
80 +--- a/Samples/Simple/include/SSAO.h 2020-04-26 13:54:31.321908377 +0200
81 ++++ b/Samples/Simple/include/SSAO.h 2020-04-26 13:54:47.497909935 +0200
82 +@@ -65,7 +65,7 @@
83 + SSAOGBufferSchemeHandler()
84 + {
85 + mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer");
86 +- RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer");
87 ++ RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect");
88 + mGBufRefMat->load();
89 + }
90 +
91
92 diff --git a/dev-games/ogre/files/ogre-1.12.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.8-media_path.patch
93 similarity index 100%
94 rename from dev-games/ogre/files/ogre-1.12.4-media_path.patch
95 rename to dev-games/ogre/files/ogre-1.12.8-media_path.patch
96
97 diff --git a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch
98 similarity index 100%
99 rename from dev-games/ogre/files/ogre-1.12.4-resource_path.patch
100 rename to dev-games/ogre/files/ogre-1.12.8-resource_path.patch
101
102 diff --git a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch
103 new file mode 100644
104 index 00000000000..4c7803a0a2f
105 --- /dev/null
106 +++ b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch
107 @@ -0,0 +1,28 @@
108 +--- a/Components/Overlay/CMakeLists.txt 2020-08-16 17:45:59.605165822 +0200
109 ++++ b/Components/Overlay/CMakeLists.txt 2020-08-16 17:48:45.796175402 +0200
110 +@@ -19,14 +19,14 @@
111 + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
112 +
113 + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
114 +- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "")
115 ++ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "")
116 + if(NOT EXISTS ${IMGUI_DIR})
117 + message(STATUS "Dowloading imgui")
118 + file(DOWNLOAD
119 +- https://github.com/ocornut/imgui/archive/v1.73.tar.gz
120 +- ${PROJECT_BINARY_DIR}/imgui.tar.gz)
121 ++ https://github.com/ocornut/imgui/archive/v1.76.tar.gz
122 ++ ${PROJECT_SOURCE_DIR}/imgui.tar.gz)
123 + execute_process(COMMAND ${CMAKE_COMMAND}
124 +- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
125 ++ -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
126 + endif()
127 + list(APPEND SOURCE_FILES
128 + ${IMGUI_DIR}/imgui.cpp
129 +@@ -84,4 +84,4 @@
130 + )
131 + install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
132 + DESTINATION "${OGRE_MEDIA_PATH}/packs/"
133 +-)
134 +\ Kein Zeilenumbruch am Dateiende.
135 ++)
136
137 diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
138 index 6d7e9fc14eb..937478502a0 100644
139 --- a/dev-games/ogre/metadata.xml
140 +++ b/dev-games/ogre/metadata.xml
141 @@ -82,10 +82,9 @@ Exporters
142 <flag name="cg">NVIDIA toolkit plugin</flag>
143 <flag name="double-precision">More precise calculations at the expense of speed</flag>
144 <flag name="egl">Use egl instead of glx</flag>
145 - <flag name="experimental" restrict="&lt;dev-games/ogre-1.11">
146 - Build experimental BETA components 'Bites' and 'HLMS'
147 + <flag name="deprecated" restrict="~dev-games/ogre-1.12.6">
148 + Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras.
149 </flag>
150 - <flag name="experimental">Build experimental BETA component 'HLMS'</flag>
151 <flag name="freeimage">Support images via media-libs/freeimage</flag>
152 <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
153 <flag name="gles2" restrict="&gt;dev-games/ogre-1.10">
154
155 diff --git a/dev-games/ogre/ogre-1.12.4.ebuild b/dev-games/ogre/ogre-1.12.8.ebuild
156 similarity index 71%
157 rename from dev-games/ogre/ogre-1.12.4.ebuild
158 rename to dev-games/ogre/ogre-1.12.8.ebuild
159 index 5a8d78edfa9..d7a634ba0da 100644
160 --- a/dev-games/ogre/ogre-1.12.4.ebuild
161 +++ b/dev-games/ogre/ogre-1.12.8.ebuild
162 @@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
163 inherit cmake
164
165 IMGUI_PN="imgui"
166 -IMGUI_PV="1.74"
167 +IMGUI_PV="1.76"
168 IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
169
170 DESCRIPTION="Object-oriented Graphics Rendering Engine"
171 @@ -19,11 +19,24 @@ LICENSE="MIT public-domain"
172 SLOT="0/1.12"
173 KEYWORDS="~amd64 ~arm ~x86"
174
175 -IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
176 - gles2 json openexr +opengl pch profile resman-pedantic tools"
177 -
178 +IUSE="+cache cg debug deprecated doc double-precision egl examples +freeimage
179 + json openexr +opengl pch profile resman-pedantic tools"
180 +
181 +# Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely
182 +# on HLSL2GLSL (https://github.com/aras-p/hlsl2glslfork) unconditionally
183 +# for GLES2. So unless we have an ebuild for that, gles2/3 are off the
184 +# table.
185 +# ~~sed 2020-04-26 (yamakuzure@×××.net)
186 +#
187 +# Note: Without gles2 USE flag, the opengl USE flag is next to useless. But
188 +# there are packages which enforce it, so it has to stay.
189 +#
190 +# USE="gles2"
191 +# REQUIRED_USE="
192 +# || ( gles2 opengl )
193 +# "
194 REQUIRED_USE="
195 - || ( gles2 opengl )
196 + examples? ( opengl )
197 "
198
199 RESTRICT="test" #139905
200 @@ -40,7 +53,6 @@ RDEPEND="
201 cg? ( media-gfx/nvidia-cg-toolkit )
202 egl? ( media-libs/mesa[egl] )
203 freeimage? ( media-libs/freeimage )
204 - gles2? ( media-libs/mesa[gles2] )
205 json? ( dev-libs/rapidjson )
206 openexr? ( media-libs/openexr:= )
207 opengl? (
208 @@ -49,6 +61,7 @@ RDEPEND="
209 )
210 tools? ( dev-libs/tinyxml[stl] )
211 "
212 +# gles2? ( media-libs/mesa[gles2] )
213 DEPEND="
214 ${RDEPEND}
215 x11-base/xorg-proto
216 @@ -61,21 +74,21 @@ BDEPEND="
217 PATCHES=(
218 "${FILESDIR}"/${P}-media_path.patch
219 "${FILESDIR}"/${P}-resource_path.patch
220 - "${FILESDIR}"/${P}-fix_sample_source_install.patch
221 + "${FILESDIR}"/${P}-fix_Simple_demo.patch
222 + "${FILESDIR}"/${P}-upgrade_imgui.patch
223 "${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
224 )
225
226 src_unpack() {
227 unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
228
229 - # Ogre 1.12.3 includes imgui, but as a submodule, it is not included
230 - # in the release.
231 - cd "${S}"/Components/Overlay/src || die "Unpack incomplete"
232 + # Ogre 1.12.8 includes imgui, but as a submodule, it is not included
233 + # in the release. The build system tries to download it, that may
234 + # a) fail and
235 + # b) uses an old release 1.73
236 + # So we are doing it ourselves.
237 + cd "${S}" || die "Unpack incomplete"
238 unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
239 -
240 - # Without this 'rm', mv puts imgui-1.73 *into* imgui/ instead of renaming.
241 - rm -rf "${IMGUI_PN}" || die "Removing ${IMGUI_PN} failed"
242 - mv "${IMGUI_P}" "${IMGUI_PN}" || die "Moving ${IMGUI_P} to ${IMGUI_PN} failed"
243 }
244
245 src_prepare() {
246 @@ -92,25 +105,11 @@ src_prepare() {
247 # In this series, the CMAKE_BUILD_TARGET is hard-wired to the
248 # installation. And only Debug, MinSizeRel and RelWithDebInfo
249 # are supported.
250 - if use debug; then
251 - sed -i \
252 - -e 's/Debug/Gentoo/g' \
253 - CMake/InstallResources.cmake \
254 - || die
255 - sed -i \
256 - -e 's/Debug/Gentoo/g' \
257 - CMake/Utils/OgreConfigTargets.cmake \
258 - || die
259 - else
260 - sed -i \
261 - -e 's/MinSizeRel/Gentoo/g' \
262 - CMake/InstallResources.cmake \
263 - || die
264 - sed -i \
265 - -e 's/MinSizeRel/Gentoo/g' \
266 - CMake/Utils/OgreConfigTargets.cmake \
267 - || die
268 - fi
269 + sed -i \
270 + -e "s/$(usex debug Debug Release)/Gentoo/g" \
271 + CMake/InstallResources.cmake \
272 + CMake/Utils/OgreConfigTargets.cmake \
273 + || die
274
275 # Fix broken png files
276 einfo "Fixing broken png files."
277 @@ -131,7 +130,7 @@ src_configure() {
278 -DCMAKE_SKIP_INSTALL_RPATH=yes
279 -DOGRE_BUILD_COMPONENT_BITES=yes
280 -DOGRE_BUILD_COMPONENT_CSHARP=no
281 - -DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
282 + -DOGRE_BUILD_COMPONENT_HLMS=$(usex deprecated)
283 -DOGRE_BUILD_COMPONENT_JAVA=no
284 -DOGRE_BUILD_COMPONENT_OVERLAY=yes
285 -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
286 @@ -147,24 +146,27 @@ src_configure() {
287 -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr)
288 -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
289 -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
290 - -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
291 + -DOGRE_BUILD_RENDERSYSTEM_GLES2=no
292 -DOGRE_BUILD_SAMPLES=$(usex examples)
293 -DOGRE_BUILD_TESTS=no
294 -DOGRE_BUILD_TOOLS=$(usex tools)
295 -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
296 -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
297 - -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
298 - -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
299 + -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=no
300 + -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=no
301 -DOGRE_CONFIG_THREADS=3
302 -DOGRE_CONFIG_THREAD_PROVIDER=std
303 -DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
304 - -DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
305 -DOGRE_INSTALL_DOCS=$(usex doc)
306 -DOGRE_INSTALL_SAMPLES=$(usex examples)
307 -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
308 + -DOGRE_NODELESS_POSITIONING=$(usex deprecated)
309 -DOGRE_PROFILING=$(usex profile)
310 -DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
311 )
312 +# -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
313 +# -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
314 +# -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
315
316 cmake_src_configure
317 }
318 @@ -193,8 +195,8 @@ src_install() {
319 # These are only for the sample browser
320 if use examples ; then
321 insinto "${SHAREDIR}"
322 - doins "${BUILD_DIR}"/bin/quakemap.cfg
323 doins "${BUILD_DIR}"/bin/samples.cfg
324 + doins "${BUILD_DIR}"/bin/tests.cfg
325 fi
326 }
327
328 @@ -202,5 +204,5 @@ pkg_postinst() {
329 elog "If you experience crashes when starting /usr/bin/SampleBrowser,"
330 elog "remove the cache directory at:"
331 elog " '~/.cache/OGRE Sample Browser'"
332 - elog "first, before filling a bug report."
333 + elog "first, before filing a bug report."
334 }