gentoo resync : 23.06.2018

6 files changed, 200 insertions, 0 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index d5761ad8d225..98a96b37a7da 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,7 +1,13 @@
+AUX ogre-1.10.11-fix_double_precision-88f0d5b.patch 1525 BLAKE2B fbb01668cc0d67f8417a1c244b9cab2ee839e97b89a479c93ae01d61befac735c6a57ae62eeac47b7647d01f2db99ff1527ad5bcb0b92288f7f8f9f0bd253ee9 SHA512 f9b6daa26032f77bd93a76734282b74883870ebc79b3bcbe5f6e8ae65f5e938ff473d9c7152488ee36bced43fd0d7245e39e660e835c214602d1f722e39ea302
+AUX ogre-1.10.11-media_path.patch 922 BLAKE2B c39dfa7eec840d5952dfb0b854396268e418d79fcb2de71886e276cc6984c2fd30180bc3b003bac47aa41b02dc0b3125f130325f1d0143ddfd29f5b42814a5e6 SHA512 5d9e8cc0dbd263a6e8044ea908399e5538aad1002af8a61e4c056fcd3ab5f5573caf5082dc428f4be91d6379298c42ee5b478aab5eac4ae1c2261504627368e3
+AUX ogre-1.10.11-resource_path.patch 782 BLAKE2B 9f4647d38880ac9cf29513159113cf2dc4b173846737ae5e0be74e71be0a02c42790260c86b5ed0382e04e43a75ed931702232421e589dc4011f69584ee949d5 SHA512 61e6f341377f0025ba1bcc4a3edcd6600e811e5bef83dad0f7bcbb8ec1f5d8bbcc2c238eee4cc556523eb4f36be833b6ab3d910da9a4d35186377a75fb6bcf89
+AUX ogre-1.10.11-samples.patch 225 BLAKE2B 52965ede36ed80a72f4cee7fb9800146ab95787e8f3bacf5d69d6fe35a29349f674cc5819b576def33bd0f8e4ead8160cb50822100fbd6bb39aaf9f39f53caa4 SHA512 08d94b7b381debcb2f40b7f4bebad76ea4ed8823fc5809a2a01ada75e36ad870c290aada1495f766c7c9cc446b24fcfdaddf7f518411da90edea827c76814528
 AUX ogre-1.9.0-gcc52.patch 2392 BLAKE2B 3d41e4a6726dabd2f4861774c962a0b5e38cdc5403f3bd457b2ec4b003de6d3c59511a6b9590baee376b543520a00acd3df0839e5d045966d6aac8ba49c6a3dc SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7
 AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 BLAKE2B 162ca81d22dfa100f624f3c62095bb3cd8bfff884e0754991904fbbe37ab60177d920872ea4955d4c8e3fd95a81f6488ed6ba6894dd1b0c7fe0b376ac62d9105 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d
 AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 BLAKE2B ef6aedfe4ee2bc1e17106164fec1d82a7fe927d5240e90c1db8a579dbf4fedc11e6b3cacb5138172fa198bf5681df09309412b6a48079353bd14568b667d5db4 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9
 AUX ogre-1.9.0-samples.patch 226 BLAKE2B d6bf78992d23d50d5f913238eeefed1e4e301eee3989dd759d2709db6c43e16826906f2f7492a29f3d4f15d14bcef35a1771b3edada39b5070691c42a2f6c951 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a
+DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
+EBUILD ogre-1.10.11.ebuild 3168 BLAKE2B ee7bf2ae427c66f32d19c8d7924e7f45d75e265fa582ea57a7ca281f884957c0b24354840463d612a533a8663ddb0b2abac8f50f076e2b649ee599ff2a623045 SHA512 924da46b4bd78df10edfc2f8b7f40f556f93f38562e9f68c87eba79ffa7283290fd9cd961e6c2cbb56e1c28288d028eb72e10ef68a23501803cc2380d6cabe76
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
 MISC metadata.xml 5223 BLAKE2B 20cd8b976d6a46dd1bc9cc9a8a075c5638e45cdc5d4ae043837e21baf9a7191f2b60230c426e7ee4e66e7a153af44ccf9b323c2422462aa1cf78d486f29a4a63 SHA512 0dc362c5fda467f45c1910baaa4bf51dc48dc01bcb7ae9230008d868d5556227b77c030a0d2110646bcbff8318d4c0c1c2a3a7b112b3f63c0132bcb1adaa61fe
diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
new file mode 100644
index 000000000000..53d7a0925d51
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User niparx <koliap@gmail.com>
+# Date 1515160111 -7200
+# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159
+# Parent  bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c
+[OGRE-592] RTShaderSystem compile error when using double precision (#622)
+
+RTShaderSystem: compile error when using double precision
+
+https://ogre3d.atlassian.net/browse/OGRE-592
+
+diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
+--- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
++++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
+@@ -654,8 +654,12 @@
+             curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN);
+         }
+         else
+-        {               
+-            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN);
++        {
++            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r,
++                                                                                      (Real)colourValue.g,
++                                                                                      (Real)colourValue.b,
++                                                                                      (Real)colourValue.a)),
++                                           Operand::OPS_IN);
+         }
+         
+         curFuncInvocation->pushOperand(arg, Operand::OPS_OUT);
diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch
new file mode 100644
index 000000000000..4d2547ab75a4
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-media_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2014-10-29 12:43:49.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:46:10.017611431 +0100
+@@ -165,10 +165,11 @@
+ 
+ # 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 were 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")
+ 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.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
new file mode 100644
index 000000000000..9c39dfc0762a
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2013-12-01 18:28:12.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:38:29.963602465 +0100
+@@ -189,10 +189,11 @@
+   set(OGRE_SAMPLES_DIR_REL "")
+   set(OGRE_SAMPLES_DIR_DBG "")
+ elseif (UNIX)
+-  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")
++# 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 (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch
new file mode 100644
index 000000000000..80b989e980c4
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-samples.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -536,7 +536,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
++if (OGRE_BUILD_SAMPLES)
++    add_subdirectory(Samples)
++endif ()
+ 
+ #Add android JNI binding
+ if(ANDROID)
diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild
new file mode 100644
index 000000000000..3094851d1f67
--- /dev/null
+++ b/dev-games/ogre/ogre-1.10.11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT public-domain"
+SLOT="0/1.10.0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools"
+
+REQUIRED_USE="examples? ( ois )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/zziplib
+	media-libs/freetype:2
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	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] )
+	ois? ( dev-games/ois )
+	tools? ( dev-libs/tinyxml[stl] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-samples.patch"
+	"${FILESDIR}/${P}-resource_path.patch"
+	"${FILESDIR}/${P}-media_path.patch"
+	"${FILESDIR}/${P}-fix_double_precision-88f0d5b.patch"
+)
+
+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
+
+	# make sure we're not using the included tinyxml
+	# Update for 1.10.11: Unfortunately the build system does not
+	#   search for a system wide tinyxml at this moment. However,
+	#   TinyXML is meant to be built into and not linked to a using
+	#   project anyway.
+	# rm -f Tools/XMLConverter/{include,src}/tiny*.*
+
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_BUILD_COMPONENT_JAVA=NO
+		-DOGRE_BUILD_COMPONENT_PYTHON=NO
+		-DOGRE_BUILD_DEPENDENCIES=NO
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_BUILD_SAMPLES=$(usex examples)
+		-DOGRE_BUILD_TESTS=FALSE
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+		-DOGRE_CONFIG_THREADS=3
+		-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_NODE_STORAGE_LEGACY=NO
+		-DOGRE_PROFILING=$(usex profile)
+		-DOGRE_RESOURCEMANAGER_STRICT=strict
+		-DOGRE_USE_STD11=YES
+	)
+
+	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/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# These are only for the sample browser
+	insinto "${SHAREDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+}