dev-games/ogre: 1.12.8 version bump plus fixes/additions

Changes:
 * imgui version has been raised to 1.76
 * gles2 USE flag has been removed. Ogre with GLES2/3 support now
   depends on HLSL2GLSL unconditionally. The flags and their config
   options have been 'backed up' as comments for easy re-integration
   once we have an ebuild for HLSL2GLSL.
   ( See: https://github.com/aras-p/hlsl2glslfork )
 * 'experimental' USE flag renamed to 'deprecated'. The HLMS
   component has switched from experimental to deprecated.
 * quakemap.cfg is gone
 * tests.cfg has been added

Fixes:
 * The 'Simple' demo has been fixed to compile with pedantic resource
   manager.

Bug: https://bugs.gentoo.org/728458
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sven Eden <yamakuzure@gmx.net>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

8 files changed, 85 insertions, 60 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 0fa39921ef90..32e62fd3783b 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,3 +1,3 @@
-DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832
-DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8
+DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa
+DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
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
deleted file mode 100644
index 616a5e33680b..000000000000
--- a/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25)
-
---- a/Samples/CMakeLists.txt	2018-04-25 07:30:38.211048775 +0200
-+++ b/Samples/CMakeLists.txt	2018-04-25 07:32:32.842049802 +0200
-@@ -97,10 +97,6 @@
- 	PATTERN "scripts" EXCLUDE
-   )
-   # install a new CMakeLists.txt file to allow building of samples
--  configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY)
--  configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
- endif ()
- 
- # Install sample headers, some people rely on these
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
new file mode 100644
index 000000000000..49ed0190e0a1
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch
@@ -0,0 +1,11 @@
+--- a/Samples/Simple/include/SSAO.h	2020-04-26 13:54:31.321908377 +0200
++++ b/Samples/Simple/include/SSAO.h	2020-04-26 13:54:47.497909935 +0200
+@@ -65,7 +65,7 @@
+     SSAOGBufferSchemeHandler()
+     {
+         mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer");
+-        RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer");
++        RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect");
+         mGBufRefMat->load();
+     }
+ 
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
index 3030cc5b9fad..3030cc5b9fad 100644
--- a/dev-games/ogre/files/ogre-1.12.4-media_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.8-media_path.patch
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
index cf35e2f99e8e..cf35e2f99e8e 100644
--- a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch
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
new file mode 100644
index 000000000000..4c7803a0a2f2
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch
@@ -0,0 +1,28 @@
+--- a/Components/Overlay/CMakeLists.txt	2020-08-16 17:45:59.605165822 +0200
++++ b/Components/Overlay/CMakeLists.txt	2020-08-16 17:48:45.796175402 +0200
+@@ -19,14 +19,14 @@
+ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+ 
+ if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
+-  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "")
++  set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "")
+   if(NOT EXISTS ${IMGUI_DIR})
+     message(STATUS "Dowloading imgui")
+     file(DOWNLOAD
+-        https://github.com/ocornut/imgui/archive/v1.73.tar.gz
+-        ${PROJECT_BINARY_DIR}/imgui.tar.gz)
++        https://github.com/ocornut/imgui/archive/v1.76.tar.gz
++        ${PROJECT_SOURCE_DIR}/imgui.tar.gz)
+     execute_process(COMMAND ${CMAKE_COMMAND}
+-        -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
++        -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+   endif()
+   list(APPEND SOURCE_FILES
+     ${IMGUI_DIR}/imgui.cpp
+@@ -84,4 +84,4 @@
+ )
+ install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
+   DESTINATION "${OGRE_MEDIA_PATH}/packs/"
+-)
+\ Kein Zeilenumbruch am Dateiende.
++)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 6d7e9fc14ebf..937478502a04 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -82,10 +82,9 @@ Exporters
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">More precise calculations at the expense of speed</flag>
     <flag name="egl">Use egl instead of glx</flag>
-    <flag name="experimental" restrict="&lt;dev-games/ogre-1.11">
-        Build experimental BETA components 'Bites' and 'HLMS'
+    <flag name="deprecated" restrict="~dev-games/ogre-1.12.6">
+        Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras.
     </flag>
-    <flag name="experimental">Build experimental BETA component 'HLMS'</flag>
     <flag name="freeimage">Support images via media-libs/freeimage</flag>
     <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
     <flag name="gles2" restrict="&gt;dev-games/ogre-1.10">
diff --git a/dev-games/ogre/ogre-1.12.4.ebuild b/dev-games/ogre/ogre-1.12.8.ebuild
index 5a8d78edfa97..d7a634ba0da9 100644
--- a/dev-games/ogre/ogre-1.12.4.ebuild
+++ b/dev-games/ogre/ogre-1.12.8.ebuild
@@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
 inherit cmake
 
 IMGUI_PN="imgui"
-IMGUI_PV="1.74"
+IMGUI_PV="1.76"
 IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
@@ -19,11 +19,24 @@ LICENSE="MIT public-domain"
 SLOT="0/1.12"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
-	gles2 json openexr +opengl pch profile resman-pedantic tools"
-
+IUSE="+cache cg debug deprecated doc double-precision egl examples +freeimage
+	json openexr +opengl pch profile resman-pedantic tools"
+
+# Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely
+#       on HLSL2GLSL (https://github.com/aras-p/hlsl2glslfork) unconditionally
+#       for GLES2. So unless we have an ebuild for that, gles2/3 are off the
+#       table.
+#       ~~sed 2020-04-26 (yamakuzure@gmx.net)
+#
+# Note: Without gles2 USE flag, the opengl USE flag is next to useless. But
+#       there are packages which enforce it, so it has to stay.
+#
+# USE="gles2"
+# REQUIRED_USE="
+# 	|| ( gles2 opengl )
+# "
 REQUIRED_USE="
-	|| ( gles2 opengl )
+	examples? ( opengl )
 "
 
 RESTRICT="test" #139905
@@ -40,7 +53,6 @@ RDEPEND="
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	egl? ( media-libs/mesa[egl] )
 	freeimage? ( media-libs/freeimage )
-	gles2? ( media-libs/mesa[gles2] )
 	json? ( dev-libs/rapidjson )
 	openexr? ( media-libs/openexr:= )
 	opengl? (
@@ -49,6 +61,7 @@ RDEPEND="
 	)
 	tools? ( dev-libs/tinyxml[stl] )
 "
+# 	gles2? ( media-libs/mesa[gles2] )
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
@@ -61,21 +74,21 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-media_path.patch
 	"${FILESDIR}"/${P}-resource_path.patch
-	"${FILESDIR}"/${P}-fix_sample_source_install.patch
+	"${FILESDIR}"/${P}-fix_Simple_demo.patch
+	"${FILESDIR}"/${P}-upgrade_imgui.patch
 	"${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
 )
 
 src_unpack() {
 	unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
 
-	# Ogre 1.12.3 includes imgui, but as a submodule, it is not included
-	# in the release.
-	cd "${S}"/Components/Overlay/src || die "Unpack incomplete"
+	# Ogre 1.12.8 includes imgui, but as a submodule, it is not included
+	# in the release. The build system tries to download it, that may
+	# a) fail and
+	# b) uses an old release 1.73
+	# So we are doing it ourselves.
+	cd "${S}" || die "Unpack incomplete"
 	unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
-
-	# Without this 'rm', mv puts imgui-1.73 *into* imgui/ instead of renaming.
-	rm -rf "${IMGUI_PN}" || die "Removing ${IMGUI_PN} failed"
-	mv "${IMGUI_P}" "${IMGUI_PN}" || die "Moving ${IMGUI_P} to ${IMGUI_PN} failed"
 }
 
 src_prepare() {
@@ -92,25 +105,11 @@ src_prepare() {
 	# In this series, the CMAKE_BUILD_TARGET is hard-wired to the
 	# installation. And only Debug, MinSizeRel and RelWithDebInfo
 	# are supported.
-	if use debug; then
-		sed -i \
-			-e 's/Debug/Gentoo/g' \
-			CMake/InstallResources.cmake \
-			|| die
-		sed -i \
-			-e 's/Debug/Gentoo/g' \
-			CMake/Utils/OgreConfigTargets.cmake \
-			|| die
-	else
-		sed -i \
-			-e 's/MinSizeRel/Gentoo/g' \
-			CMake/InstallResources.cmake \
-			|| die
-		sed -i \
-			-e 's/MinSizeRel/Gentoo/g' \
-			CMake/Utils/OgreConfigTargets.cmake \
-			|| die
-	fi
+	sed -i \
+		-e "s/$(usex debug Debug Release)/Gentoo/g" \
+		CMake/InstallResources.cmake \
+		CMake/Utils/OgreConfigTargets.cmake \
+		|| die
 
 	# Fix broken png files
 	einfo "Fixing broken png files."
@@ -131,7 +130,7 @@ src_configure() {
 		-DCMAKE_SKIP_INSTALL_RPATH=yes
 		-DOGRE_BUILD_COMPONENT_BITES=yes
 		-DOGRE_BUILD_COMPONENT_CSHARP=no
-		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
+		-DOGRE_BUILD_COMPONENT_HLMS=$(usex deprecated)
 		-DOGRE_BUILD_COMPONENT_JAVA=no
 		-DOGRE_BUILD_COMPONENT_OVERLAY=yes
 		-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
@@ -147,24 +146,27 @@ src_configure() {
 		-DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr)
 		-DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
 		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
-		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES2=no
 		-DOGRE_BUILD_SAMPLES=$(usex examples)
 		-DOGRE_BUILD_TESTS=no
 		-DOGRE_BUILD_TOOLS=$(usex tools)
 		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
 		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
-		-DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
-		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
+		-DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=no
+		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=no
 		-DOGRE_CONFIG_THREADS=3
 		-DOGRE_CONFIG_THREAD_PROVIDER=std
 		-DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
 		-DOGRE_INSTALL_DOCS=$(usex doc)
 		-DOGRE_INSTALL_SAMPLES=$(usex examples)
 		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_NODELESS_POSITIONING=$(usex deprecated)
 		-DOGRE_PROFILING=$(usex profile)
 		-DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
 	)
+#		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
+#		-DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
+#		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
 
 	cmake_src_configure
 }
@@ -193,8 +195,8 @@ src_install() {
 	# These are only for the sample browser
 	if use examples ; then
 		insinto "${SHAREDIR}"
-		doins "${BUILD_DIR}"/bin/quakemap.cfg
 		doins "${BUILD_DIR}"/bin/samples.cfg
+		doins "${BUILD_DIR}"/bin/tests.cfg
 	fi
 }
 
@@ -202,5 +204,5 @@ pkg_postinst() {
 	elog "If you experience crashes when starting /usr/bin/SampleBrowser,"
 	elog "remove the cache directory at:"
 	elog "  '~/.cache/OGRE Sample Browser'"
-	elog "first, before filling a bug report."
+	elog "first, before filing a bug report."
 }