[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/

[James Le Cuirot]

commit:     05f6da0ae504cd86e358b848bf1d3f6c57d8b326
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Aug  9 21:34:14 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 21:49:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f6da0a

games-engines/openmw: drop old 0.45.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17064
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-engines/openmw/Manifest                      |   1 -
 .../openmw/files/openmw-0.45.0-osg-3.6.5-1.patch   |  51 --------
 .../openmw/files/openmw-0.45.0-osg-3.6.5-2.patch   |  21 ----
 games-engines/openmw/openmw-0.45.0.ebuild          | 131 ---------------------
 4 files changed, 204 deletions(-)

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 6f88c3b39a9..08b631916bc 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,2 @@
-DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B 85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e2222833129d64954cdcdb3af4eb4b84dc3 SHA512 b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486

diff --git a/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-1.patch b/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-1.patch
deleted file mode 100644
index b47fab28d12..00000000000
--- a/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 807f550386a1eac6f7306589a4e4a01e783e65df Mon Sep 17 00:00:00 2001
-From: Alexander Olofsson <ace@×××××××.com>
-Date: Thu, 13 Feb 2020 19:15:33 +0100
-Subject: [PATCH] Fix building mwrender/sky with OSG 3.6.5
-
-OSG commit aff574b completely replaces the method of doing user-defined
-query geometry, removing support for modifying the default geometry.
----
- apps/openmw/mwrender/sky.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
-index 3996f472c2..e13f5a7b65 100644
---- a/apps/openmw/mwrender/sky.cpp
-+++ b/apps/openmw/mwrender/sky.cpp
-@@ -558,16 +558,22 @@ class Sun : public CelestialBody
-         osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
-         oqn->setQueriesEnabled(true);
- 
-+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
-+        // With OSG 3.6.5, the method of providing user defined query geometry has been completely replaced
-+        osg::ref_ptr<osg::QueryGeometry> queryGeom = new osg::QueryGeometry(oqn->getName());
-+#else
-+        auto* queryGeom = oqn->getQueryGeometry();
-+#endif
-+
-         // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
-         // so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
-         // is only called once.
-         // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
--        oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
-+        queryGeom->setDataVariance(osg::Object::STATIC);
- 
-         // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
-         // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
-         // circumvent this.
--        osg::Geometry* queryGeom = oqn->getQueryGeometry();
-         queryGeom->setVertexArray(mGeom->getVertexArray());
-         queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
-         queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
-@@ -578,6 +584,10 @@ class Sun : public CelestialBody
-         // Still need a proper bounding sphere.
-         oqn->setInitialBound(queryGeom->getBound());
- 
-+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
-+        oqn->setQueryGeometry(queryGeom.release());
-+#endif
-+
-         osg::StateSet* queryStateSet = new osg::StateSet;
-         if (queryVisible)
-         {

diff --git a/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-2.patch b/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-2.patch
deleted file mode 100644
index 6b13291911c..00000000000
--- a/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7db58a893a1448b7229de5464696b3cc6eb7663c Mon Sep 17 00:00:00 2001
-From: Alexander Olofsson <ace@×××××××.com>
-Date: Thu, 13 Feb 2020 19:32:17 +0100
-Subject: [PATCH] Ensure osg/Version is included
-
----
- apps/openmw/mwrender/sky.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
-index e13f5a7b65..7cf2af88d0 100644
---- a/apps/openmw/mwrender/sky.cpp
-+++ b/apps/openmw/mwrender/sky.cpp
-@@ -16,6 +16,7 @@
- #include <osg/BlendFunc>
- #include <osg/AlphaFunc>
- #include <osg/PolygonOffset>
-+#include <osg/Version>
- #include <osg/observer_ptr>
- 
- #include <osgParticle/BoxPlacer>

diff --git a/games-engines/openmw/openmw-0.45.0.ebuild b/games-engines/openmw/openmw-0.45.0.ebuild
deleted file mode 100644
index 60c87d4697f..00000000000
--- a/games-engines/openmw/openmw-0.45.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils readme.gentoo-r1
-
-DESCRIPTION="Open source reimplementation of TES III: Morrowind"
-HOMEPAGE="https://openmw.org/"
-SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 MIT BitstreamVera ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc devtools +qt5"
-
-# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
-# used when BUILD_OPENCS flag is enabled. See bug #676266.
-
-RDEPEND="
-	dev-games/mygui
-	>=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib]
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml[stl]
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/openal
-	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=
-	virtual/opengl
-	qt5? (
-		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[doc]
-		dev-python/sphinx
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-osg-3.6.5-{1,2}.patch ) # bug #709878
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# We don't install license files
-	sed -i '/LICDIR/d' CMakeLists.txt || die
-
-	# Use the system tinyxml headers
-	rm -v extern/oics/tiny{str,xml}* || die
-}
-
-src_configure() {
-	use devtools && ! use qt5 && \
-		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
-
-	local mycmakeargs=(
-		-DBUILD_BSATOOL=$(usex devtools)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_ESMTOOL=$(usex devtools)
-		-DBUILD_LAUNCHER=$(usex qt5)
-		-DBUILD_NIFTEST=$(usex devtools)
-		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
-		-DBUILD_WIZARD=$(usex qt5)
-		-DBUILD_UNITTESTS=OFF
-		-DGLOBAL_DATA_PATH=/usr/share
-		-DICONDIR="/usr/share/icons/hicolor/256x256/apps"
-		-DMORROWIND_DATA_FILES="/usr/share/morrowind-data"
-		-DUSE_SYSTEM_TINYXML=ON
-		-DDESIRED_QT_VERSION=5
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_src_compile doc
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	local DOC_CONTENTS="
-	You need the original Morrowind data files. If you haven't
-	installed them yet, you can install them straight via the
-	installation wizard which is the officially supported method
-	(either by using the launcher or by calling 'openmw-wizard'
-	directly).\n"
-
-	if ! use qt5; then
-		local DOC_CONTENTS+="\n\n
-		USE flag 'qt5' is disabled, 'openmw-launcher' and
-		'openmw-wizard' are not available. You are on your own for
-		making the Morrowind data files available and pointing
-		openmw at them.\n\n
-		Additionally; you must import the Morrowind.ini file before
-		running openmw with the Morrowind data files for the first
-		time. Typically this can be done like so:\n\n
-		\t mkdir -p ~/.config/openmw\n
-		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}