dev-games/ogre: Revert removal of the github based v2.1 ebuild.

3 files changed, 163 insertions, 16 deletions

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 aea1521..5e7ad27 100644
--- a/dev-games/ogre/files/ogre-2.1-media_path.patch
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch
@@ -1,18 +1,28 @@
---- a/CMake/InstallResources.cmake	2018-04-03 19:39:31.586129013 +0200
-+++ b/CMake/InstallResources.cmake	2018-04-03 19:40:28.169128923 +0200
-@@ -170,10 +170,11 @@
+--- 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 @@
  
  # CREATE CONFIG FILES - BUILD DIR VERSIONS
- if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
--  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
--  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
-+  # No, they are fine already
-+  # set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-+  # set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
-+  # set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-+  # set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+ if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-	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")
++# 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_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
+ 	# 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-samples.patch b/dev-games/ogre/files/ogre-2.1-samples.patch
index eec05cc..71cbea6 100644
--- a/dev-games/ogre/files/ogre-2.1-samples.patch
+++ b/dev-games/ogre/files/ogre-2.1-samples.patch
@@ -5,7 +5,7 @@
  
  # Setup samples
 -add_subdirectory(Samples)
-+if (OGRE_BUILD_SAMPLES)
++if (OGRE_BUILD_SAMPLES2)
 +    add_subdirectory(Samples)
 +endif ()
  
diff --git a/dev-games/ogre/ogre-2.1-r20180323.ebuild b/dev-games/ogre/ogre-2.1-r20180323.ebuild
new file mode 100644
index 0000000..07d71b3
--- /dev/null
+++ b/dev-games/ogre/ogre-2.1-r20180323.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils git-r3 cmake-utils vcs-snapshot
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+
+EGIT_MIN_CLONE_TYPE="shallow"
+EGIT_REPO_URI="https://github.com/OGRECave/ogre"
+EGIT_BRANCH="v2-1"
+EGIT_COMMIT="55327534fbc65808328ac0216ecad535052616c3"
+SRC_URI=""
+
+LICENSE="MIT public-domain"
+SLOT="0/2.1"
+KEYWORDS=""
+
+IUSE="doc examples +freeimage gl3plus gles2 gles3 json ois +opengl profile tools"
+
+# USE flags for features that do not work, yet
+# cg double-precision
+
+REQUIRED_USE="examples? ( ois )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-libs/zziplib
+	freeimage? ( media-libs/freeimage )
+	gl3plus? ( >=media-libs/mesa-9.2.5 )
+	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
+	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
+	json? ( dev-libs/rapidjson )
+	media-libs/freetype:2
+	ois? ( dev-games/ois )
+	tools? ( dev-libs/tinyxml[stl] )
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt"
+# Dependencies for USE flags that do not work, yet.
+#	cg? ( media-gfx/nvidia-cg-toolkit )
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto"
+PATCHES=(
+	"${FILESDIR}/${P}-samples.patch"
+	"${FILESDIR}/${P}-resource_path.patch"
+	"${FILESDIR}/${P}-media_path.patch"
+)
+
+src_fetch() {
+	git-r3_src_fetch
+}
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=NO
+		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=NO
+		-DOGRE_BUILD_SAMPLES2=$(usex examples)
+		-DOGRE_BUILD_TESTS=NO
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+		-DOGRE_CONFIG_THREADS=2
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_FULL_RPATH=NO
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
+		-DOGRE_USE_BOOST=NO
+	)
+	# USE flags for features that do not work, yet
+	#	-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+	#	-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+	# 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.
+	mycmakeargs+=(
+		-DOGRE_BUILD_COMPONENT_PAGING=NO
+		-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=YES
+		-DOGRE_BUILD_COMPONENT_PROPERTY=NO
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=NO
+		-DOGRE_BUILD_COMPONENT_TERRAIN=NO
+		-DOGRE_BUILD_COMPONENT_VOLUME=NO
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+	dosym "${CONFIGDIR}"/resources2.cfg "${SHAREDIR}"/resources2.cfg
+
+	# These are only for the sample browser
+	insinto "${SHAREDIR}"
+#	doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+}