openmw-0.28.0

5 files changed, 152 insertions, 14 deletions

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 499536f..d4ec2ff 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,18 +1,7 @@
-AUX 0001-fix-BINDIR.patch 1045 SHA256 bc9562d84c8416fe09891cb003294db465d89efef470e7ff6afb9c50e41738e7 SHA512 ddeb17d1f7270858b61cafa20fe9e51f967d0a4c6868e1f7fdb30043460c5ec0ac31b668a81e8b88e8ad4081953eb06db35be074f4331501a62ca41094453eab WHIRLPOOL 05d162a57e7e7234cb75bbc721f21de776064e9ff3478c6440a6b47aaf354c0e5a0c57592c340ca6490d1073eaea8c45ddc6ede5d60b8887149dd6fb0c1dc0ce
-AUX 0002-libc-fixes.patch 1980 SHA256 4d54203f5b3eff5dec6bc9dc27d04de8c482482b2658614740e3926bc1b7be18 SHA512 fb7d68b1ac0a837617ad6e38bdab5f3a4bdd0fb4cfa224bae45eeb5006b97671a836d5cc5cd0ae1131f57c4f145d575555bd1146dfb9eb489daebe414a961fdc WHIRLPOOL 55096b0e222b42ad52f5a87054f433214795b104d9060fcdded0ffee76ce773f82df552919545e35e3b961fb0620133ddaf922e00329d7a2a223829db1144842
-AUX openmw-0.24.0-0001-libc-fixes-avcodec-avformat-workaround.patch 1189 SHA256 7e7dac19da901a0a04e2f4c2f8581cc9ea22bb7dccf5e80281254428d279ad99 SHA512 40d4402e936034234359fec58bcfefe0855cfb8f512050d66e145c284d26d2ebe138daba8bb232d83b83de8a57d0e2927c31e1b16bb3e433e2a76f7e627c52c2 WHIRLPOOL 852309b59a57b88dd08df6a8a09ff1b0647b6d9ddbe14935f9e093142c19e464ff1c180b923ab7af5e60d29f9374bd32c5c9cdec63ff3f084b2db7759a02907e
-AUX openmw-0.24.0-0002-libc-fixes-don-t-rely-on-tr1.patch 2085 SHA256 95c5c243e1f086bda089516806d395d861dce137bdb5358209b357dd5b1cd828 SHA512 6831e66c45f58e96ddb70033a2fe409938c582cb3e1d61164c173f31571c2e2a9f3d299935d77c2c7979687bcddc0e748b5de2d21c180a643d947ccc975ed4a1 WHIRLPOOL 038ec6c5d8c524c62f09b5780c10ce3444ea3f8f66e9bfbb2a950782f65fe0a873f7ef001c86c2277592e11215324425335dad1ff5473b42b377f127a1330cf0
 DIST openmw-0.21.0.zip 2542370 SHA256 f34ff40a7ced5e294c01597fbdaf8860a108a104d1627f79d14cfe2f70f6882f SHA512 3404b8924315f244410baf2ed7abe246ae76e4a71a60f143d9a33131ad8f66ec80f1e2ad5d7cb9fd8b22c13e855635effeaca69e9d9b2e186c977c9d4cc741ec WHIRLPOOL f4e24384c0961013f5df76ace5fddb203b75f156b24c8b44838cbd4630911a39e8366b80b64dc7aba6a10d5c14691950dd82f0e5fef15376c7d9120b20f9151e
 DIST openmw-0.23.0.tar.gz 2426880 SHA256 681de5de62e7deec5a72fa91d2f7ab2d7a01aad020641f9704e5b4fc1620efbd SHA512 17899bff01cae182c76acc1b4b61255af2ffdc997776716bec8e4a2c652451e35d4a366c3386fc153a3b85500c4969947c597c3d223c6f08127d3fecb2841508 WHIRLPOOL 5c5f89a87127f501e616daf536b57bc835bc20c67083d91281258c435b9804a833fa668e84580694be7214193bd29dbb235dffc92fa583296e51138920022f50
 DIST openmw-0.24.0-source.tar.gz 2489635 SHA256 e932db80689991b1ac85be9c34de38c3df8f01ca591fefbd683e1fb004e0591d SHA512 c301777343535c7718b404edc53b90a6ab0d9c933afc6fe375fb6cf9d2625d7638275d8c6e17f166c45e4f9e32a8790c4a285caa5547c2ab381ca8e59091574d WHIRLPOOL 06d05571ec86b87fbb5aa3889ba21ea4a0be1ec9cf13e60b7db98cd5c64da86da168f4312bfc45226674b1649e204812a0e36b69fef146acd4a7adb99f978eb9
 DIST openmw-0.26.0-source.tar.gz 2862885 SHA256 5675c2922fc06775a456a0ddaf302d41f84cb286af4d35141aeaaa1aec59397a SHA512 6d9d2502e07ae5dc024894c73aa5bdd2467b4099f152ae3894f97d66e947ca96d08ec264a24494b6c860e47d49b45ffe22d0517c1cc4c70ddf1c52fc34457f16 WHIRLPOOL 5557a1c84879b52c8491222c402a0f12afb25c82477e827d1fe73b90763cb0f0df4b4804ba3f81d690357ec91b74231e78ab5aede0d252344f705e469f3be85c
 DIST openmw-0.27.0-source.tar.gz 3533777 SHA256 2c71d6fe0b8036f739ee79c359267fdcf573679fb3459a7d56443ca705e84d7a SHA512 30b8a8f523cbf94494327f902f0938d0a021d03acfb01c415d7969a520988ed685e5950d739e06918937d5d09a48c41dee38f42ad73f8ad8367671df1510a40a WHIRLPOOL 353e9a72e41476cdec90cef4725802bdb889ccf5b631e1848f3011ba5ef5a7d81e01d300d2a6b29054c556f35f688d943284e99bc512c26de3bc00d223e5f0af
+DIST openmw-0.28.0-source.tar.gz 3605814 SHA256 6db333f5a950eb53427a7c827bcce2fb7f5bdd989f4993b0411c4c9816dd41f4 SHA512 06bca0bf3cba639658e92e340031d2e0256b60ddba012f3ca58477ce625c161843863121c3c18615cb0bc9a9df5fcd9ca34d197cc0b89a7599ae35fb3d7ba9f3 WHIRLPOOL 2a410eccb9c936dfccfb3fb99b0ac531d344bcd5cbdc3b4f30359776d7d1c90f0dcb22d5cbf6d4fc421a58bb3af2ccbbcb4b06527c16870b61a5e79534f37580
 DIST openmw_0.20.0.orig.tar.bz2 1757358 SHA256 6fb88901920d6c28a974885065303639ee6227e9c21fd615334bcdc16d7909eb SHA512 e3180ed3efbc7fcb92339d88ea1dbc0987f81cc006f56926a7862ac1ee5ca4f2119cfa9baa286aa6c98f2d3a4ef0938ebdfecc842877f08e6a229ac66b913e2d WHIRLPOOL 2f5489f1108b8b3ce8aaa092f3c3effb382b859822e0ce2dd057e5552a2f5579ae304aa402a0dd798794a6ff7032b029bb993f37d76b5c32c30de2eb9eefc026
-EBUILD openmw-0.20.0.ebuild 1625 SHA256 9d7f87bb4b0ca560c12f8675b809a491bcd882ae11c659651eb93a8584a088a8 SHA512 116ce2eb55705a7eb0b9f403b2548c30e1010dad5308d2d91e1bc9e3fcf0f89063161a2f095da570f7b3febdb0067eca17823265ed37e376c241f1303f31b0b5 WHIRLPOOL 4a620f47965ab00754b61ade748ea68818d3bd93512554344791d8481983cb2cfd59ce63abc82d175cb210365c132ee77b9bd50beee443d046f2b864b53c2345
-EBUILD openmw-0.21.0.ebuild 1636 SHA256 cc6ce30804a55794041b0d0460fc1d0d60b1f43f0b21c2ebe3e23fa6e4d8d578 SHA512 a4594120ff820ae7b1e583caa9b5bdaaf6e71d5b15f9cb71c38a61337d67e03e823a5f70378c0f4bf2bfe4684d8fde92aa652f43c73978e30f5850c81d263018 WHIRLPOOL 99df5c25c4700d057d55d0004fa2c410cf0b7fb08575f12a46e2c7b61485868a176d202f56aa2e1523726803855d0b42b651d6de4d509bc2f94ff3ba922f5e5c
-EBUILD openmw-0.23.0.ebuild 1598 SHA256 85a0e719d3d6fd84c51b8849d3ea5dd4885119da66b4f6263d9f7f5e520422cd SHA512 f030f181567e8408524d88df1b371eda20877f308cbcbc220656a8e4cd3af8c0a4a040bd4b0903229ca2431647fab800c34cdc47d8a999d50155594e9685b314 WHIRLPOOL 674b5a96af4fcf0354458cdc92bd34559529f3e72cf848bd8c25c5845de1f8ab6d0bb00c4c60d7f580675439af27ac92173f0980738e368f8579776d11f518c9
-EBUILD openmw-0.24.0.ebuild 2015 SHA256 7f38b6e2d659069c8842c968cb45d61564366182d56baefd3f0acc6060e045b2 SHA512 c17d0b5c83845d2752d7a01f7ad0a7a4f29e8469d3ab330bbfc483645326f5b14b9002518cfc6b27d62ee1a6caf1ce627a4c45065df9d86d94d167c36271118c WHIRLPOOL 1138405948d839951d0dd6d3e1b05feb708d6e20cbd1e54936fc7486187ebca7a01b214aea30b27e50ff9ddf8ec4d04a2173879b3067012b28e1c6b258517d4d
-EBUILD openmw-0.26.0.ebuild 2273 SHA256 040cb2ae217086decfeea766fc3bb10a1f223aaed3735335b2e8a4d6f46eed27 SHA512 22d84f0050aebcf80f5eb88b8951343083e69b26ef485e010691918753cd844683e14c44985cd9580bc76f66c14e74aa3b3f6f4177e9ffe811f78225ac630cf4 WHIRLPOOL 92d19bbe4ff1c02f791eabbaff5b69cb681a85826caf6caf75351dbbf2268bbcce71e42792b34c95c4c481b6a9f9df3ff16462acb89f403dec5e4efff4029178
-EBUILD openmw-0.27.0-r1.ebuild 2853 SHA256 853283ce3ca5cab961838100fb7736527a7c7764fbf7d43f96a8603039530058 SHA512 5e35d9ffc49fbf2db6036b3087854c11f99d55363402f01dfee5198f55c0a1bf92bca2c7bc6c96d4f6a7fc840bea2563a01e612b69c417a4350bf5b91ad120fe WHIRLPOOL ace17c2e99ca55369bb625fc360d84ffc63c81f0e437409cc1107691dc1261add67865565fde51af89b64198905b745a0077ee510811d666742ebfbb47a0a565
-EBUILD openmw-9999.ebuild 2665 SHA256 05533ccbeab9619cf7738238c76808b452884eecb81f80e549d11d68b996c56a SHA512 db0f29238e96050311acffe54d36cee5b034ff9dc0526b91d3b3c00b608e2a615ec9bc0cf80553107fc73541ec6fac3cacec0ee0c8872b33afc89bcc9718feba WHIRLPOOL 00d15624c7d86ea69d63622e98eac9da0718a161595504046b900eabcbc776967f277af96b504b4885bf26b7620bdad09bacf871e667523d32e3862d63fb4032
-MISC metadata.xml 694 SHA256 f4ef03678530f848dbfefcc5e14497d9fd97fd24c94f6eeaffb96be71ab394c2 SHA512 ddb13722bd86a42deaf94f6bae5d0dbae5028eb2bb6c9f0c9a46fd49c33ad3e8ca1d8bfeeb36c7bd9563a5e728572f1fc4264c9472fb6428fb4413a8781875a3 WHIRLPOOL 06436a403fde85cebf57b1feecb83f1138992241f0e3b076312d506f8e4eab0e9305641e78020209436a3de0c11ad8956b78dc9caece3fe83d6d7dd0cd853db7
diff --git a/games-engines/openmw/files/openmw-0.28.0-Update-opencs.desktop.patch b/games-engines/openmw/files/openmw-0.28.0-Update-opencs.desktop.patch
new file mode 100644
index 0000000..42784d9
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.28.0-Update-opencs.desktop.patch
@@ -0,0 +1,21 @@
+commit 278876d6fb9df8ae1d48063647af508b87d06213
+Author: nobrakal <nobrakal@gmail.com>
+Date:   Thu Jan 16 08:41:29 2014 +0100
+
+    Update opencs.desktop
+    
+    Fix bad output of desktop-file-validate for opencs.dektop
+
+diff --git a/files/opencs.desktop b/files/opencs.desktop
+index 80afa26..638de6e 100644
+--- a/files/opencs.desktop
++++ b/files/opencs.desktop
+@@ -3,7 +3,7 @@ Type=Application
+ Name=OpenMW Content Editor
+ GenericName=Content Editor
+ Comment=A replacement for the Morrowind Construction Set.
+-Keywords=Morrowind;Construction Set;Creation Kit Editor;Set;Kit
++Keywords=Morrowind;Construction Set;Creation Kit Editor;Set;Kit;
+ TryExec=opencs
+ Exec=opencs
+ Icon=opencs
diff --git a/games-engines/openmw/files/openmw-0.28.0-Update-openmw.desktop.patch b/games-engines/openmw/files/openmw-0.28.0-Update-openmw.desktop.patch
new file mode 100644
index 0000000..af9f620
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.28.0-Update-openmw.desktop.patch
@@ -0,0 +1,21 @@
+commit e638b8b8cbeb5bdbc57cb01ba8526f426d3ef70b
+Author: nobrakal <nobrakal@gmail.com>
+Date:   Thu Jan 16 08:44:56 2014 +0100
+
+    Update openmw.desktop
+    
+    Fix bad output of desktop-file-validate for openmw.dektop
+
+diff --git a/files/openmw.desktop b/files/openmw.desktop
+index 3e26018..4a3a76f 100644
+--- a/files/openmw.desktop
++++ b/files/openmw.desktop
+@@ -3,7 +3,7 @@ Type=Application
+ Name=OpenMW Launcher
+ GenericName=Role Playing Game
+ Comment=An engine replacement for The Elder Scrolls III: Morrowind
+-Keywords=Morrowind;Reimplementation Mods;esm;bsa
++Keywords=Morrowind;Reimplementation Mods;esm;bsa;
+ TryExec=omwlauncher
+ Exec=omwlauncher
+ Icon=openmw
diff --git a/games-engines/openmw/openmw-0.28.0.ebuild b/games-engines/openmw/openmw-0.28.0.ebuild
new file mode 100644
index 0000000..f6e7ae0
--- /dev/null
+++ b/games-engines/openmw/openmw-0.28.0.ebuild
@@ -0,0 +1,105 @@
+# By Eroen, 2013
+# Distributed under the terms of the ISC license
+# $Header: $
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator games cmake-utils
+[[ $(get_version_component_range $(get_version_component_count)) == *999? ]] && inherit git-r3
+
+DESCRIPTION="Unofficial open source engine reimplementation of the game Morrowind"
+HOMEPAGE="https://openmw.org/"
+LICENSE="GPL-3 MIT BitstreamVera OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+launcher minimal +opencs profile test +tr1"
+
+if [[ $(get_version_component_range $(get_version_component_count)) == *999? ]]; then
+	EGIT_REPO_URI="git://github.com/zinnschlag/openmw.git"
+	if [[ $(get_version_component_count) -ge 4 ]]; then
+		EGIT_BRANCH=openmw$(get_version_component_range 2)
+	fi
+else
+	SRC_URI="https://${PN}.googlecode.com/files/${P}-source.tar.gz"
+	S="${WORKDIR}"/${PN}-${P}
+fi
+
+OPENMW_LIBS="dev-games/mygui
+	dev-libs/tinyxml
+	media-libs/openal
+	virtual/ffmpeg
+	sci-physics/bullet"
+LAUNCHER_LIBS="app-arch/unshield
+	dev-qt/qtcore
+	dev-qt/qtgui"
+OPENCS_LIBS="dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtxmlpatterns"
+
+HDEPEND=""
+# boost[threads]: can't test https://bugs.gentoo.org/458404
+# libsdl2[-directfb]: https://bugs.gentoo.org/503130
+LIBDEPEND="${OPENMW_LIBS}
+	launcher? ( ${LAUNCHER_LIBS} )
+	opencs? ( ${OPENCS_LIBS} )
+	dev-games/ogre[boost,cg,freeimage,opengl,threads,zip]
+	dev-libs/boost:=[threads]
+	media-libs/libsdl2[-directfb]"
+DEPEND="${LIBDEPEND}
+	test? ( dev-cpp/gmock[tr1=]
+	    dev-cpp/gtest[tr1=] )"
+[[ ${EAPI} == *-hdepend ]] || DEPEND+=" ${HDEPEND}"
+RDEPEND="${LIBDEPEND}"
+
+pkg_setup() {
+	if use test && ! use tr1; then
+		append-cflags -DGTEST_USE_OWN_TR1_TUPLE=1
+		append-cxxflags -DGTEST_USE_OWN_TR1_TUPLE=1
+	fi
+}
+
+src_unpack() {
+	mkdir "${S}" && cd "${S}" || die
+	default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Update-opencs.desktop.patch
+	epatch "${FILESDIR}"/${P}-Update-openmw.desktop.patch
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DDATAROOTDIR="${GAMES_DATADIR_BASE}"
+		-DDATADIR="${GAMES_DATADIR}/${PN}"
+		-DSYSCONFDIR="${GAMES_SYSCONFDIR}"/${PN}
+		$(cmake-utils_use_build launcher LAUNCHER)
+		$(cmake-utils_use_build opencs OPENCS)
+		$(cmake-utils_use_build !minimal BSATOOL)
+		$(cmake-utils_use_build !minimal ESMTOOL)
+		$(cmake-utils_use_build !minimal MWINIIMPORTER)
+		$(cmake-utils_use_with profile CODE_COVERAGE)
+		-DUSE_SYSTEM_TINYXML=ON
+		$(cmake-utils_use_build test UNITTESTS)
+		)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null
+	./openmw_test_suite || die
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${D}"/usr/share/licenses
+	sed -e "s:resources=resources:resources=${GAMES_DATADIR}/${PN}/resources:" \
+		-i "${D}/${GAMES_SYSCONFDIR}"/${PN}/openmw.cfg || die
+	prepgamesdirs
+	# /etc/openmw/ is hardcoded, but we set SYSCONFDIR for games.eclass
+	mv -t "${D}"/etc "${D}/${GAMES_SYSCONFDIR}"/${PN} || die
+	rmdir "${D}/${GAMES_SYSCONFDIR}" || die
+}
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index ffdbfbb..7b6e19e 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -20,7 +20,7 @@ if [[ $(get_version_component_range $(get_version_component_count)) == *999? ]];
 		EGIT_BRANCH=openmw$(get_version_component_range 2)
 	fi
 else
-	SRC_URI="https://github.com/zinnschlag/${PN}/archive/${P}.tar.gz"
+	SRC_URI="https://${PN}.googlecode.com/files/${P}-source.tar.gz"
 	S="${WORKDIR}"/${PN}-${P}
 fi
 
@@ -37,12 +37,14 @@ OPENCS_LIBS="dev-qt/qtcore
 	dev-qt/qtxmlpatterns"
 
 HDEPEND=""
+# boost[threads]: can't test https://bugs.gentoo.org/458404
+# libsdl2[-directfb]: https://bugs.gentoo.org/503130
 LIBDEPEND="${OPENMW_LIBS}
 	launcher? ( ${LAUNCHER_LIBS} )
 	opencs? ( ${OPENCS_LIBS} )
 	dev-games/ogre[boost,cg,freeimage,opengl,threads,zip]
 	dev-libs/boost:=[threads]
-	media-libs/libsdl2"
+	media-libs/libsdl2[-directfb]"
 DEPEND="${LIBDEPEND}
 	test? ( dev-cpp/gmock[tr1=]
 	    dev-cpp/gtest[tr1=] )"