public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2015-08-09 13:28 Julian Ospald
  0 siblings, 0 replies; 8+ messages in thread
From: Julian Ospald @ 2015-08-09 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d246f01c58998166cee1e1de5d466d73c0876125
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 13:27:49 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 13:28:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d246f01c

games-engines/openmw: rm old

 games-engines/openmw/Manifest                      |   1 -
 games-engines/openmw/files/openmw-0.33.0-cfg.patch |  14 ---
 .../openmw/files/openmw-0.33.0-opencs.patch        |  13 ---
 games-engines/openmw/metadata.xml                  |   2 -
 games-engines/openmw/openmw-0.33.0-r2.ebuild       | 106 ---------------------
 5 files changed, 136 deletions(-)

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index a52b98a..3568e8a 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,2 +1 @@
-DIST openmw-0.33.0.tar.gz 3524287 SHA256 62baa03eb206bea760c6b2b0260ae1a942eac34e7439a114398d2101154f4a83 SHA512 96525ee794277284f39a18bbbd01361422273ef073917b5e51ec7951bb15e59e0d0dd39ba70311588d4b18adccffac5c4fed4d9bf9e37ca0e865869277e795f9 WHIRLPOOL ab9df256ff107fcd361a6308c6bcb49aeb5a40289a224173d6d9f883042491c09a1f90af982be257c2e425d8dd1ec44a04025622d41c21c23c9683db182dfd30
 DIST openmw-0.36.1.tar.gz 4186134 SHA256 c83fddf3302dd8040330e2d41a9656bb66b1fc8224b24d685d8792b15f74af22 SHA512 9cbd9db876bacc736ab071a6074d92c44b1497780a2a6f4dbff5f109107173baae5490af92c1092985863897d63e063336fe1a8093269fd7b3ce48dee550425d WHIRLPOOL 305a87faea65413629b0e639280dba1462ade723b130e82bab823d86658066656fe250e81a26e1415b81ebed39a790e278f443fa2c92657422eb9ac9ba681faf

diff --git a/games-engines/openmw/files/openmw-0.33.0-cfg.patch b/games-engines/openmw/files/openmw-0.33.0-cfg.patch
deleted file mode 100644
index 42125cb..0000000
--- a/games-engines/openmw/files/openmw-0.33.0-cfg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jun 16 00:27:52 UTC 2012
-
-use cmake variable for data location
-
---- files/openmw.cfg
-+++ files/openmw.cfg
-@@ -1,5 +1,6 @@
- data="?global?data"
- data="?mw?Data Files"
-+data=${MORROWIND_DATA_FILES}
- data-local="?userdata?data"
- resources=${OPENMW_RESOURCE_FILES}
- script-blacklist=Museum

diff --git a/games-engines/openmw/files/openmw-0.33.0-opencs.patch b/games-engines/openmw/files/openmw-0.33.0-opencs.patch
deleted file mode 100644
index 5abd7da..0000000
--- a/games-engines/openmw/files/openmw-0.33.0-opencs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.openmw.org/issues/2108
-
-diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
-index e63e095..67117bf 100644
---- a/apps/opencs/view/render/cell.hpp
-+++ b/apps/opencs/view/render/cell.hpp
-@@ -3,6 +3,7 @@
-
- #include <string>
- #include <map>
-+#include <memory>
-
- #include <OgreVector3.h>

diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index bd371bf..1c8c5f7 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -9,8 +9,6 @@
 	<use>
 		<flag name="devtools">Install development tools like
 			bsatool, esmtool and opencs.</flag>
-		<flag name="launcher">Install the launcher for configuring
-			OpenMW.</flag>
 	</use>
 	<upstream>
 		<changelog>https://github.com/OpenMW/openmw/releases</changelog>

diff --git a/games-engines/openmw/openmw-0.33.0-r2.ebuild b/games-engines/openmw/openmw-0.33.0-r2.ebuild
deleted file mode 100644
index cdd0b7b..0000000
--- a/games-engines/openmw/openmw-0.33.0-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils cmake-utils games
-
-DESCRIPTION="An open source reimplementation of TES III: Morrowind"
-HOMEPAGE="http://openmw.org/"
-SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 MIT BitstreamVera OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc devtools +launcher"
-
-# XXX static build
-RDEPEND=">=dev-games/mygui-3.2.1
-	>=dev-games/ogre-1.9.0[freeimage,ois,opengl,zip]
-	>=dev-libs/boost-1.46.0
-	dev-libs/tinyxml
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	media-libs/freetype:2
-	media-libs/libsdl2[X,video]
-	media-libs/openal
-	>=sci-physics/bullet-2.80
-	virtual/ffmpeg
-	devtools? ( dev-qt/qtxmlpatterns:4 )
-	launcher? ( app-arch/unshield )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen media-gfx/graphviz )"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cfg.patch \
-		"${FILESDIR}"/${P}-opencs.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		$(cmake-utils_use_build devtools BSATOOL)
-		$(cmake-utils_use_build devtools ESMTOOL)
-		$(cmake-utils_use_build launcher LAUNCHER)
-		-DMWINIIMPORTER=ON
-		-DBUILD_MYGUI_PLUGIN=ON
-		$(cmake-utils_use_build devtools OPENCS)
-		-DUNITTESTS=OFF
-		-DDATADIR="${GAMES_DATADIR}"/${PN}
-		-DICONDIR=/usr/share/icons/hicolor/256x256/apps
-		-DLIBDIR="$(games_get_libdir)"
-		-DMORROWIND_DATA_FILES="${GAMES_DATADIR}"/morrowind-data
-		-DOPENMW_RESOURCE_FILES="${GAMES_DATADIR}"/${PN}/resources
-		-DGLOBAL_CONFIG_PATH="${GAMES_SYSCONFDIR}"
-		-DUSE_SYSTEM_TINYXML=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		emake -C "${CMAKE_BUILD_DIR}" doc
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc readme.txt
-
-	# about 46835 files, dodoc seems to have trouble
-	if use doc ; then
-		dodir "/usr/share/doc/${PF}"
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-			-name '*.md5' -type f -delete
-		mv "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-			"${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "You need the original Morrowind Data files. If you haven't"
-	elog "installed them yet, you can install them straight via the"
-	elog "game launcher (launcher USE flag) which is the officially"
-	elog "supported method."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2018-04-17 21:16 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     43971ee69afc4c3a4a508334e624fdc35a73c653
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 21:15:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 21:16:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43971ee6

games-engines/openmw: Fix build with Qt 5.11_beta3

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 .../openmw/files/openmw-0.43.0-qt-5.11b3.patch     | 81 ++++++++++++++++++++++
 games-engines/openmw/openmw-0.43.0-r1.ebuild       |  2 +
 2 files changed, 83 insertions(+)

diff --git a/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch b/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
new file mode 100644
index 00000000000..85b290e660b
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
@@ -0,0 +1,81 @@
+From 2c9d46a60bd8d35f132cb106e5255d590b13640b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 23:03:56 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ apps/launcher/CMakeLists.txt | 2 +-
+ apps/opencs/CMakeLists.txt   | 2 +-
+ apps/wizard/CMakeLists.txt   | 2 +-
+ components/CMakeLists.txt    | 2 +-
+ extern/osgQt/CMakeLists.txt  | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
+index aec8c2533..99e7b4daa 100644
+--- a/apps/launcher/CMakeLists.txt
++++ b/apps/launcher/CMakeLists.txt
+@@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
+         target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
+     endif(WIN32)
+ else()
+-    qt5_use_modules(openmw-launcher Widgets Core)
++    target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
+ endif()
+ 
+ if (BUILD_WITH_CODE_COVERAGE)
+diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
+index b9279bf91..f07b518a9 100644
+--- a/apps/opencs/CMakeLists.txt
++++ b/apps/opencs/CMakeLists.txt
+@@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
+         target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
+     endif()
+ else()
+-    qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
++    target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
+ endif()
+ 
+ if (WIN32)
+diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
+index 5f7338e52..8d97bbcbf 100644
+--- a/apps/wizard/CMakeLists.txt
++++ b/apps/wizard/CMakeLists.txt
+@@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
+         target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
+     endif()
+ else()
+-    qt5_use_modules(openmw-wizard Widgets Core)
++    target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
+ endif()
+ 
+ if (OPENMW_USE_UNSHIELD)
+diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
+index 8256f1443..ecb844a9b 100644
+--- a/components/CMakeLists.txt
++++ b/components/CMakeLists.txt
+@@ -216,7 +216,7 @@ if (USE_QT)
+         ${QT_QTCORE_LIBRARY}
+         ${QT_QTGUI_LIBRARY})
+     else()
+-        qt5_use_modules(components Widgets Core)
++        target_link_libraries(components Qt5::Widgets Qt5::Core)
+     endif()
+ endif()
+ 
+diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
+index 3bd08a390..78a4e6034 100644
+--- a/extern/osgQt/CMakeLists.txt
++++ b/extern/osgQt/CMakeLists.txt
+@@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
+     include(${QT_USE_FILE})
+     target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
+ else()
+-    qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
++    target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
+ endif()
+ 
+ link_directories(${CMAKE_CURRENT_BINARY_DIR})
+-- 
+2.17.0
+

diff --git a/games-engines/openmw/openmw-0.43.0-r1.ebuild b/games-engines/openmw/openmw-0.43.0-r1.ebuild
index b514d755704..0efb2c19676 100644
--- a/games-engines/openmw/openmw-0.43.0-r1.ebuild
+++ b/games-engines/openmw/openmw-0.43.0-r1.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${P}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
+
 src_prepare() {
 	cmake-utils_src_prepare
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2018-12-23 22:48 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-12-23 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0bdb6a2953739b67f8b4360efe8ea95462684183
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 21:58:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 22:47:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdb6a29

games-engines/openmw: Drop 0.43.0-r2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-engines/openmw/Manifest                      |   1 -
 .../openmw/files/openmw-0.43.0-qt-5.11b3.patch     |  81 -------------
 games-engines/openmw/openmw-0.43.0-r2.ebuild       | 127 ---------------------
 3 files changed, 209 deletions(-)

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 6db67c29ed0..664a8f7a5c7 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,2 +1 @@
-DIST openmw-0.43.0.tar.gz 5023421 BLAKE2B c99e3a23b22b642dea9e8f2d9414e00aa6a05c4331a9715882465781caca60cd857675d87079bafc3596783e257213bec9d6f1f4e78a3d795e973fb1d895811e SHA512 e902dd2274c05838bb1171f07d7a673fc7b85d1290a9e01c8ab89f1c279bd236332ecdc0f2b7944ec7209a0e6022ff472639b5724bf26904e3a2d338c7be401a
 DIST openmw-0.44.0.tar.gz 4976422 BLAKE2B 9dec8412aa68ac35ba51926c7e5c5a64ce717ea6677162e0b35439a59c482375b7729bd462fa6e8da2e9b463c1121cdca0a5b42f553095da82a83cefb11986ce SHA512 1b178891274361b7821ac1d3d66976ed5d443545531499d98f7ed30823f3891172cc5dcb3f7382ba0f561774a92b9ad8805e0c9582b78d2f010e4ed661219017

diff --git a/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch b/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
deleted file mode 100644
index 85b290e660b..00000000000
--- a/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 2c9d46a60bd8d35f132cb106e5255d590b13640b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 23:03:56 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- apps/launcher/CMakeLists.txt | 2 +-
- apps/opencs/CMakeLists.txt   | 2 +-
- apps/wizard/CMakeLists.txt   | 2 +-
- components/CMakeLists.txt    | 2 +-
- extern/osgQt/CMakeLists.txt  | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
-index aec8c2533..99e7b4daa 100644
---- a/apps/launcher/CMakeLists.txt
-+++ b/apps/launcher/CMakeLists.txt
-@@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
-     endif(WIN32)
- else()
--    qt5_use_modules(openmw-launcher Widgets Core)
-+    target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
- endif()
- 
- if (BUILD_WITH_CODE_COVERAGE)
-diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
-index b9279bf91..f07b518a9 100644
---- a/apps/opencs/CMakeLists.txt
-+++ b/apps/opencs/CMakeLists.txt
-@@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
-     endif()
- else()
--    qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
-+    target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
- endif()
- 
- if (WIN32)
-diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
-index 5f7338e52..8d97bbcbf 100644
---- a/apps/wizard/CMakeLists.txt
-+++ b/apps/wizard/CMakeLists.txt
-@@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
-     endif()
- else()
--    qt5_use_modules(openmw-wizard Widgets Core)
-+    target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
- endif()
- 
- if (OPENMW_USE_UNSHIELD)
-diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
-index 8256f1443..ecb844a9b 100644
---- a/components/CMakeLists.txt
-+++ b/components/CMakeLists.txt
-@@ -216,7 +216,7 @@ if (USE_QT)
-         ${QT_QTCORE_LIBRARY}
-         ${QT_QTGUI_LIBRARY})
-     else()
--        qt5_use_modules(components Widgets Core)
-+        target_link_libraries(components Qt5::Widgets Qt5::Core)
-     endif()
- endif()
- 
-diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
-index 3bd08a390..78a4e6034 100644
---- a/extern/osgQt/CMakeLists.txt
-+++ b/extern/osgQt/CMakeLists.txt
-@@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-     include(${QT_USE_FILE})
-     target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
- else()
--    qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
-+    target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
- endif()
- 
- link_directories(${CMAKE_CURRENT_BINARY_DIR})
--- 
-2.17.0
-

diff --git a/games-engines/openmw/openmw-0.43.0-r2.ebuild b/games-engines/openmw/openmw-0.43.0-r2.ebuild
deleted file mode 100644
index 38c7e010246..00000000000
--- a/games-engines/openmw/openmw-0.43.0-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-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"
-
-RDEPEND="
-	dev-games/mygui
-	>=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib]
-	dev-games/openscenegraph-qt
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml[stl]
-	media-libs/libsdl2[joystick,opengl,video,X]
-	media-libs/openal
-	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86
-	virtual/opengl
-	qt5? (
-		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[doc] dev-python/sphinx )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# We don't install license files
-	sed -e '/LICDIR/d' \
-		-i CMakeLists.txt || die
-	# Use the system tinyxml headers
-	sed -e 's/"tinyxml.h"/<tinyxml.h>/g' \
-		-e 's/"tinystr.h"/<tinystr.h>/g' \
-		-i extern/oics/ICSPrerequisites.h || 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-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_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-utils_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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2020-03-14 17:59 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-03-14 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     5b8613a622a069d4d32332617a354c55dcc4f3c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 17:36:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 17:58:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8613a6

games-engines/openmw: Fix build w/ >=dev-games/openscenegraph-3.6.5

Bug: https://bugs.gentoo.org/709878
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../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          |  2 +
 3 files changed, 74 insertions(+)

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
new file mode 100644
index 00000000000..b47fab28d12
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-1.patch
@@ -0,0 +1,51 @@
+From 807f550386a1eac6f7306589a4e4a01e783e65df Mon Sep 17 00:00:00 2001
+From: Alexander Olofsson <ace@haxalot.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
new file mode 100644
index 00000000000..6b13291911c
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.45.0-osg-3.6.5-2.patch
@@ -0,0 +1,21 @@
+From 7db58a893a1448b7229de5464696b3cc6eb7663c Mon Sep 17 00:00:00 2001
+From: Alexander Olofsson <ace@haxalot.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
index 54e986e845b..755240fa113 100644
--- a/games-engines/openmw/openmw-0.45.0.ebuild
+++ b/games-engines/openmw/openmw-0.45.0.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-osg-3.6.5-{1,2}.patch ) # bug #709878
+
 S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2020-08-17 21:54 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-08-17 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     6c386a1cb194c96808364c924e8bd3db703384b0
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Aug  9 21:33:24 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 21:49:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c386a1c

games-engines/openmw: update the patch for 9999

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../openmw/files/openmw-0.47.0-mygui-license.patch       | 16 ++++++++++++++++
 games-engines/openmw/openmw-9999.ebuild                  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
new file mode 100644
index 00000000000..d0da8a2563b
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
@@ -0,0 +1,16 @@
+We don't install license files
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d69352c94..5f97c86e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -470,9 +470,6 @@ IF(NOT WIN32 AND NOT APPLE)
+     #    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Plugin_MyGUI_OpenMW_Resources.so" DESTINATION "${LIBDIR}" )
+     #ENDIF(BUILD_MYGUI_PLUGIN)
+ 
+-    # Install licenses
+-    INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
+-
+     # Install icon and desktop file
+     INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
+     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")

diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index df9cc73b585..1183e5459a1 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/openmw-0.46.0-mygui-license.patch
+	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
 	"${FILESDIR}"/openmw-0.46.0-recastnavigation.patch
 )
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2020-08-17 21:54 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-08-17 21:54 UTC (permalink / raw
  To: gentoo-commits

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@haxalot.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@haxalot.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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2021-08-17 16:51 Ionen Wolkens
  0 siblings, 0 replies; 8+ messages in thread
From: Ionen Wolkens @ 2021-08-17 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9a4572ec66f7909c9439cfd230d451e2ec06ca7b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 16:49:51 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 16:50:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4572ec

games-engines/openmw: fix build with boost-1.77.0

Closes: https://bugs.gentoo.org/808763
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch | 10 ++++++++++
 games-engines/openmw/openmw-0.46.0-r2.ebuild              |  1 +
 2 files changed, 11 insertions(+)

diff --git a/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch b/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
new file mode 100644
index 00000000000..708fd9e9f52
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/808763
+
+--- a/components/vfs/filesystemarchive.cpp
++++ b/components/vfs/filesystemarchive.cpp
+@@ -1,4 +1,5 @@
+ #include "filesystemarchive.hpp"
+ 
++#include <algorithm>
+ #include <boost/filesystem.hpp>
+ 

diff --git a/games-engines/openmw/openmw-0.46.0-r2.ebuild b/games-engines/openmw/openmw-0.46.0-r2.ebuild
index c8fd9a2b1b7..24532e11f3d 100644
--- a/games-engines/openmw/openmw-0.46.0-r2.ebuild
+++ b/games-engines/openmw/openmw-0.46.0-r2.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${DISTDIR}"/openmw-0.46.0-floattest.patch
 	"${FILESDIR}"/openmw-0.46.0-floattest2.patch
 	"${FILESDIR}"/openmw-0.46.0-gcc11.patch
+	"${FILESDIR}"/openmw-0.46.0-boost-1.77.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/
@ 2021-11-20 12:48 Stefan Strogin
  0 siblings, 0 replies; 8+ messages in thread
From: Stefan Strogin @ 2021-11-20 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     3fd2d18f2c2c65b3b4e98b09c1ef73c3f93cc366
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 12:45:01 2021 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 12:46:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd2d18f

games-engines/openmw: add patch for glibc-2.34

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 .../openmw/files/openmw-0.47.0-sigstksz.patch      | 42 ++++++++++++++++++++++
 ...penmw-0.47.0.ebuild => openmw-0.47.0-r1.ebuild} |  1 +
 2 files changed, 43 insertions(+)

diff --git a/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch b/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch
new file mode 100644
index 000000000000..588d6d639726
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch
@@ -0,0 +1,42 @@
+From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+Date: Fri, 24 Sep 2021 19:40:29 +0200
+Subject: [PATCH] Assume SIGSTKSZ is not a constant
+
+SIGSTKSZ is not defined as constant since glibc 2.34:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53
+
+Upstream-Status: Submitted
+[https://gitlab.com/OpenMW/openmw/-/merge_requests/1239]
+---
+ components/crashcatcher/crashcatcher.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
+index 86571e1e3a..c828e1ca81 100644
+--- a/components/crashcatcher/crashcatcher.cpp
++++ b/components/crashcatcher/crashcatcher.cpp
+@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n";
+ 
+ static char argv0[PATH_MAX];
+ 
+-static char altstack[SIGSTKSZ];
+-
+ 
+ static struct {
+     int signum;
+@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
+ 
+     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
+      * still run */
++    static char* altstack = new char [SIGSTKSZ];
+     altss.ss_sp = altstack;
+     altss.ss_flags = 0;
+-    altss.ss_size = sizeof(altstack);
++    altss.ss_size = SIGSTKSZ;
+     sigaltstack(&altss, nullptr);
+ 
+     memset(&sa, 0, sizeof(sa));
+-- 
+GitLab
+

diff --git a/games-engines/openmw/openmw-0.47.0.ebuild b/games-engines/openmw/openmw-0.47.0-r1.ebuild
similarity index 98%
rename from games-engines/openmw/openmw-0.47.0.ebuild
rename to games-engines/openmw/openmw-0.47.0-r1.ebuild
index 2ee105fb1152..50a651650fba 100644
--- a/games-engines/openmw/openmw-0.47.0.ebuild
+++ b/games-engines/openmw/openmw-0.47.0-r1.ebuild
@@ -63,6 +63,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
+	"${FILESDIR}"/openmw-0.47.0-sigstksz.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-20 12:48 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-17 21:16 [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/files/, games-engines/openmw/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2021-11-20 12:48 Stefan Strogin
2021-08-17 16:51 Ionen Wolkens
2020-08-17 21:54 James Le Cuirot
2020-08-17 21:54 James Le Cuirot
2020-03-14 17:59 Andreas Sturmlechner
2018-12-23 22:48 Andreas Sturmlechner
2015-08-09 13:28 Julian Ospald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox