dev-games/ogre: New ebuild for latest stable release 1.12.4

Also moved to github.

In this release we have to also fetch the current release of imlib, as the tree
has it as a submodule which is not included in the ogre release zip.

And finally I have put myself into metadata.xml, as I am proxy-
maintaining ogre.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Bug: https://bugs.gentoo.org/699770
Closes: https://bugs.gentoo.org/699770
Signed-off-by: Sven Eden <sven.eden@gmx.de>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

9 files changed, 265 insertions, 9 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 1b26aeec6818..aa4b1ac188e1 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,4 +1,6 @@
+DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832
 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
 DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2
+DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
 DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04
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
new file mode 100644
index 000000000000..616a5e33680b
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
@@ -0,0 +1,15 @@
+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.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.4-media_path.patch
new file mode 100644
index 000000000000..3030cc5b9fad
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-media_path.patch
@@ -0,0 +1,14 @@
+Media paths are fine already, the removed lines would screw them up.
+
+--- a/CMake/InstallResources.cmake	2019-11-06 08:09:15.185821495 +0100
++++ b/CMake/InstallResources.cmake	2019-11-06 08:10:41.169819050 +0100
+@@ -145,9 +145,6 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-  set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media")
+-  set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media")
+ else ()
+   # iOS needs to use relative paths in the config files
+   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
new file mode 100644
index 000000000000..cf35e2f99e8e
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
@@ -0,0 +1,13 @@
+These was already configured above, the BINARY paths are wrong!
+
+--- a/CMake/InstallResources.cmake	2019-11-06 08:12:01.271816772 +0100
++++ b/CMake/InstallResources.cmake	2019-11-06 08:13:15.623814658 +0100
+@@ -163,8 +163,6 @@
+   set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/")
+   set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
+ elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 841aaefd7dc8..4c31c236ea08 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>yamakuzure@gmx.net</email>
+    <name>Sven Eden</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
@@ -109,7 +117,7 @@ Exporters
         sensitive lookup. Some demos might not work with this setting.
         (default: case-insensitive + sensitive lookup in all groups)
     </flag>
-    <flag name="resman-strict">
+    <flag name="resman-strict" restrict="&lt;dev-games/ogre-1.12">
         Resource Manager STRICT : search in default group if not specified otherwise.
         Case sensitive lookup. Some demos might not work with this setting.
         (default: case-insensitive + sensitive lookup in all groups)
@@ -119,5 +127,7 @@ Exporters
   </use>
   <upstream>
     <remote-id type="bitbucket">sinbad/ogre</remote-id>
+    <remote-id type="github">OGRECave/ogre</remote-id>
+    <remote-id type="github">OGRECave/ogre-next</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.10.12.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
index 34a0952245b9..91e3b9f49d57 100644
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ b/dev-games/ogre/ogre-1.10.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
index e3f452d99e9b..0de0b6eb4878 100644
--- a/dev-games/ogre/ogre-1.11.2.ebuild
+++ b/dev-games/ogre/ogre-1.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="MIT public-domain"
 SLOT="0/1.11"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
 	gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
diff --git a/dev-games/ogre/ogre-1.12.4.ebuild b/dev-games/ogre/ogre-1.12.4.ebuild
new file mode 100644
index 000000000000..7d8c48cadd83
--- /dev/null
+++ b/dev-games/ogre/ogre-1.12.4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
+inherit cmake
+
+IMGUI_PN="imgui"
+IMGUI_PV="1.74"
+IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz"
+
+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"
+
+REQUIRED_USE="
+	|| ( gles2 opengl )
+"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-games/ois
+	dev-libs/pugixml
+	dev-libs/zziplib
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	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? (
+		virtual/glu
+		virtual/opengl
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-media_path.patch
+	"${FILESDIR}"/${P}-resource_path.patch
+	"${FILESDIR}"/${P}-fix_sample_source_install.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"
+	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() {
+	local broken_png=(
+		Icon@2x-72.png
+		Default-Portrait~ipad.png
+		Default-Portrait@2x~ipad.png
+		Default-Landscape@2x~ipad.png
+	)
+
+	sed -i \
+		-e "s:share/doc/OGRE:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# 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
+
+	# Fix broken png files
+	einfo "Fixing broken png files."
+	pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1
+	for png in "${broken_png[@]}"; do
+		pngfix -q --out=out.png ${png}
+		mv -f out.png "${png}" || die
+	done
+	popd 1>/dev/null 2>&1
+	einfo "done ..."
+
+	# Fix some path issues
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=yes
+		-DOGRE_BUILD_COMPONENT_BITES=yes
+		-DOGRE_BUILD_COMPONENT_CSHARP=no
+		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
+		-DOGRE_BUILD_COMPONENT_JAVA=no
+		-DOGRE_BUILD_COMPONENT_OVERLAY=yes
+		-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
+		-DOGRE_BUILD_COMPONENT_PAGING=yes
+		-DOGRE_BUILD_COMPONENT_PROPERTY=yes
+		-DOGRE_BUILD_COMPONENT_PYTHON=no
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes
+		-DOGRE_BUILD_COMPONENT_TERRAIN=yes
+		-DOGRE_BUILD_COMPONENT_VOLUME=yes
+		-DOGRE_BUILD_DEPENDENCIES=no
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage)
+		-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_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_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_PROFILING=$(usex profile)
+		-DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		eninja -C "${BUILD_DIR}" OgreDoc
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${BUILD_DIR}"/bin/plugins.cfg
+	doins "${BUILD_DIR}"/bin/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# 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
+	fi
+}
+
+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."
+}
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
index 9249788cc201..f7805764e6e9 100644
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.
 
 LICENSE="MIT public-domain"
 SLOT="0/2.1"
-KEYWORDS=""
+KEYWORDS="~amd64"
 
 IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
 	mobile +opengl profile tools"