dev-games/ogre: Bump 2.1 to pre20191212 and move to GitHub

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

4 files changed, 49 insertions, 40 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index aa4b1ac188e1..0c2635641c11 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -3,4 +3,3 @@ DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308
 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-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch
index 5e7ad276ac09..a51d0576c983 100644
--- a/dev-games/ogre/files/ogre-2.1-media_path.patch
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch
@@ -1,6 +1,8 @@
+Media paths are fine already, the removed lines would screw them up.
+
 --- a/CMake/InstallResources.cmake	2018-03-23 10:49:24.620486243 +0100
 +++ b/CMake/InstallResources.cmake	2018-03-23 10:50:52.089485597 +0100
-@@ -186,15 +186,16 @@
+@@ -186,15 +186,6 @@
  
  # CREATE CONFIG FILES - BUILD DIR VERSIONS
  if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
@@ -13,16 +15,6 @@
 -	endif()
 -	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
 -	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
-+# No, they were fine already
-+#	if( NOT APPLE )
-+#		set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-+#		set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
-+#	else()
-+#		set(OGRE_MEDIA_DIR_REL "Contents/Resources")
-+#		set(OGRE_MEDIA_DIR_DBG "Contents/Resources")
-+#	endif()
-+#	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-+#	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
  else ()
  	# iOS needs to use relative paths in the config files
  	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch
index 32cfef0d8d14..32cbc94e7d01 100644
--- a/dev-games/ogre/files/ogre-2.1-resource_path.patch
+++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch
@@ -1,6 +1,8 @@
+These was already configured above, the BINARY paths are wrong!
+
 --- a/CMake/InstallResources.cmake	2018-03-23 10:48:44.371486540 +0100
 +++ b/CMake/InstallResources.cmake	2018-03-23 10:49:08.333486363 +0100
-@@ -226,10 +226,11 @@
+@@ -226,10 +226,6 @@
    set(OGRE_SAMPLES_DIR_REL "")
    set(OGRE_SAMPLES_DIR_DBG "")
  elseif (UNIX)
@@ -8,11 +10,6 @@
 -  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
 -  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
 -  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+# No, this was already configured above, the BINARY paths are wrong!
-+#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
  endif ()
  
  if (WINDOWS_STORE OR WINDOWS_PHONE)
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
index f7805764e6e9..4973a50d793b 100644
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
 
-MY_COMMIT="35b083cba64a"
-MY_P="sinbad-${PN}-${MY_COMMIT}"
+inherit cmake flag-o-matic git-r3
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_BRANCH="v2-1"
+EGIT_COMMIT="5b682fb90c9e8e660e2fbf92bbf7797a9246700d"
+EGIT_REPO_URI="https://github.com/OGRECave/ogre-next.git"
+EGIT_SUBMODULES=()
 
 LICENSE="MIT public-domain"
 SLOT="0/2.1"
 KEYWORDS="~amd64"
 
-IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
-	mobile +opengl profile tools"
+IUSE="+cache debug doc egl examples +freeimage gles2 json
+	legacy-animations mobile +opengl profile tools"
 
 # USE flags that do not work, as their options aren't ported, yet.
-#	cg
-#	double-precision
+#      cg
+#      double-precision
 
 REQUIRED_USE="
 	|| ( gles2 opengl )
@@ -51,6 +52,7 @@ RDEPEND="
 "
 # Dependencies for USE flags that do not work, yet.
 #	cg? ( media-gfx/nvidia-cg-toolkit )
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
@@ -63,8 +65,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch"
 )
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	sed -i \
 		-e "s:share/OGRE/docs:share/doc/${PF}:" \
@@ -75,7 +75,7 @@ src_prepare() {
 		CMake/Utils/OgreConfigTargets.cmake || die
 
 	# Fix some path issues
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -86,18 +86,22 @@ src_configure() {
 		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile)
 		-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes
 		-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes
+		-DOGRE_BUILD_PLATFORM_NACL=no
 		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
 		-DOGRE_BUILD_RENDERSYSTEM_GLES=no
 		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
 		-DOGRE_BUILD_SAMPLES2=$(usex examples)
 		-DOGRE_BUILD_TESTS=no
 		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_ALLOCATOR=$(usex debug 5 1)
+		-DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=yes
 		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
 		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
 		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\
 			usex gles2 $(\
 			usex mobile no yes) no)
 		-DOGRE_CONFIG_ENABLE_JSON=$(usex json)
+		-DOGRE_CONFIG_MEMTRACK_DEBUG=$(usex debug)
 		-DOGRE_CONFIG_THREADS=2
 		-DOGRE_CONFIG_THREAD_PROVIDER=std
 		-DOGRE_FULL_RPATH=no
@@ -108,10 +112,16 @@ src_configure() {
 		-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
 		-DOGRE_USE_BOOST=no
 	)
-	# Options that aren't ported, yet:
-	#	-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+
+	# The double-precision mode can not be enabled, yet.
 	#	-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
 
+	# The CgFxScriptLoader doesn't seem to be completely ported, yet.
+	# USE flag disabled.
+	mycmakeargs+=(
+		-DOGRE_BUILD_PLUGIN_CG=no
+	)
+
 	# These components are off by default, as they might not be ported, yet.
 	# When advancing to a newer commit, try whether any of the disabled
 	# components can be activated now.
@@ -125,21 +135,32 @@ src_configure() {
 		-DOGRE_BUILD_COMPONENT_VOLUME=no
 	)
 
-	cmake-utils_src_configure
+	# Take out the warning about deprecated copy, as Ogre emits thousands of
+	# those. But using a deprecated way of doing things isn't an error and
+	# mainly of interest for developers.
+	# (The warning is part of -Wextra and only effects C++ compilation.)
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-copy)
+
+	# The same with the old ways of using memset(0...) on objects. It is
+	# no longer assumed to be a good idea, but a warning about it isn't
+	# of any value to the user. (And it happens many times in Ogre.)
+	append-cxxflags $(test-flags-CXX -Wno-class-memaccess)
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	CONFIGDIR=/etc/OGRE
 	SHAREDIR=/usr/share/OGRE
 
 	# plugins and resources are the main configuration
 	insinto "${CONFIGDIR}"
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins_tools.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources2.cfg
+	doins "${BUILD_DIR}"/bin/plugins.cfg
+	doins "${BUILD_DIR}"/bin/plugins_tools.cfg
+	doins "${BUILD_DIR}"/bin/resources.cfg
+	doins "${BUILD_DIR}"/bin/resources2.cfg
 	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
 	dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg
 	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
@@ -148,6 +169,6 @@ src_install() {
 	# These are only for the Samples
 	if use examples ; then
 		insinto "${SHAREDIR}"
-		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+		doins "${BUILD_DIR}"/bin/samples.cfg
 	fi
 }