openmw-9999: Updated patches.

6 files changed, 100 insertions, 2 deletions

diff --git a/games-engines/openmw/.swp b/games-engines/openmw/.swp
deleted file mode 100644
index 19ef3b8..0000000
--- a/games-engines/openmw/.swp
+++ /dev/null
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index edc4d12..92b0f3b 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,10 +1,13 @@
 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/01-libc-fixes-avcodec-avformat.patch 1050 SHA256 f3bfffce17469fa771847545f5c3dfe64bbafdfa28076582a8e384105772bda2 SHA512 9892c349a21185715f753e007612f7dd931f105b2d3f012cc6c0c522959dade9779f719cf223a024f2f35558e6ed7c480e723056131435461ddea784c0698774 WHIRLPOOL e2b25ad2bbbf05cc30724702384759d6304f206fb92ee3262e7612ccb81d549d292bd6d3c732ef4331c76b7dc8ca0169492cedc905e8fab5478fdfcbdb0540e7
+AUX openmw-0.24.0/02-libc-fixes-don-t-rely-on-tr1.patch 1949 SHA256 3dce8b2aa47eaaa746028a71a2aa3e6c0da520d6945ce1190daa4f05bce462ef SHA512 73fc57eb317fb2d4edc233be12664e7989cb755e06897c55c8787f9f0fad11c055d1996b81578c17e09b4aaa5d1f273b008a8aefe2fa62fc362d0849c5e645c8 WHIRLPOOL 8043b05da47f31e60bd5e6e52d71176142c2254d3d1a5349d64c56146e0bf543fa3fcee8446b2e7a46e412efd1df44050932b88c20bccd67fa964fdae90cf886
+AUX openmw-0.24.0/series 152 SHA256 6496710f43f4ca5cb0960b458ad1959ca26e87b6024e467e312e3dc1a5785aad SHA512 1cb8e24b4c23ef6720b3b0f34a009ab2c35f342c6ec99672d24ee0a7fdf766fc6d4c77f06d9c0a152bb7f2307bd8a75ef3b499811aefa96d33d8dd1aefaa02f7 WHIRLPOOL c2425fd637626b57da565f78ecae2712cb23e208ae6813627ecea56c069cbc38b607bd52d0142b456ae73f170668df6cacf6f6f6b1c37a69f7eb4bf2da5cc4e5
 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.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-9999.ebuild 1656 SHA256 ba1703d8d293c6c0e8fd5c7f9576b08638e270bfe92fb82daee4b80139ad7888 SHA512 99b13f94eaeb24f2f8eb61faa303c8d8662549d3356f3c799ed8476bb23434e732a2e9de0c02e17e10e33ddf337ddf4d0b9835967fae3b27b13b11a698cc0bbc WHIRLPOOL e098179f8826abb45444e650027036194eb550971030c8dc6ef559363a863e2dbc6e9cdc3f6bc41a30e950d9610e879f6acd0ffb31e56c3f62e145234b3af696
+EBUILD openmw-9999.ebuild 1757 SHA256 8ea85679283acf0c038a672f9259ef475c23c851d0b214d2cd2468fcb4bc4ee9 SHA512 dabac771105d434d8f88797a8ac1624daf93b1377263058eb3f53e25b82603362d54418ec83f4de8c4d9b634d87ab173d76e9526e0799ed7863da55c2bc0c9a8 WHIRLPOOL c43e7e7c628ced2dc2d9648520bc445b1c1c56f7e7975323e207acc80861f0c85734fe4a656b3fd3f0d15152a23235c290221b15c8abaa15e8190b39dd769568
 MISC metadata.xml 378 SHA256 cf1d0adba9aded901ebdac00befbdaa6665e37c8a4f43bce402ddfbcfdb58ff1 SHA512 3a8bc1effedb29ee006beee99f63d0b3a8f70ec4f67a0524456c685f46cee0c8f60e29c6facc613a4484744a119a7529defa515856eb85e6df8023058e9ea3b6 WHIRLPOOL 73215f7b1130b50b3c4876c1e0a6c293f7c7ca215e71686c1dfb0895168051162c5d4e78b83a12dada163b4b6124efddbee4282aa4d7d8fe633ebdd709c5aa1d
diff --git a/games-engines/openmw/files/openmw-0.24.0/01-libc-fixes-avcodec-avformat.patch b/games-engines/openmw/files/openmw-0.24.0/01-libc-fixes-avcodec-avformat.patch
new file mode 100644
index 0000000..d3cbd2c
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.24.0/01-libc-fixes-avcodec-avformat.patch
@@ -0,0 +1,35 @@
+libc++ fixes: avcodec/avformat workaround
+
+From: eroen <eroen@occam.eroen.eu>
+
+With libc++, string includes stdint.h, which breaks the fragile avformat.h
+workaround, which depends on __STDC_CONSTANT_MACROS being defined before
+stdint.h is included.
+
+Moving the string inclusion after that eyesore shouldn't break anything.
+---
+ apps/openmw/mwsound/ffmpeg_decoder.hpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
+index 32b2797..a5e5b50 100644
+--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
++++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
+@@ -1,8 +1,6 @@
+ #ifndef GAME_SOUND_FFMPEG_DECODER_H
+ #define GAME_SOUND_FFMPEG_DECODER_H
+ 
+-#include <string>
+-
+ // FIXME: This can't be right? The headers refuse to build without UINT64_C,
+ // which only gets defined in stdint.h in either C99 mode or with this macro
+ // defined...
+@@ -14,6 +12,8 @@ extern "C"
+ #include <libavformat/avformat.h>
+ }
+ 
++#include <string>
++
+ #include "sound_decoder.hpp"
+ 
+ 
diff --git a/games-engines/openmw/files/openmw-0.24.0/02-libc-fixes-don-t-rely-on-tr1.patch b/games-engines/openmw/files/openmw-0.24.0/02-libc-fixes-don-t-rely-on-tr1.patch
new file mode 100644
index 0000000..1ccaf75
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.24.0/02-libc-fixes-don-t-rely-on-tr1.patch
@@ -0,0 +1,56 @@
+libc++ fixes: don't rely on tr1
+
+From: eroen <eroen@occam.eroen.eu>
+
+libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.
+
+Since this is the only tr1 header used in openmw, add a check for c++11
+unordered_map and fallback to tr1 unordered_map if it's not found.
+---
+ CMakeLists.txt                            |    6 ++++++
+ components/files/configurationmanager.hpp |    8 +++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b989297..43415c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,6 +181,12 @@ if (UNIX AND NOT APPLE)
+     find_package (Threads)
+ endif()
+ 
++include (CheckIncludeFileCXX)
++check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP)
++if (HAVE_UNORDERED_MAP)
++    add_definitions(-DHAVE_UNORDERED_MAP)
++endif ()
++
+ 
+ set(BOOST_COMPONENTS system filesystem program_options thread date_time wave)
+ 
+diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
+index 9056e79..765f1ce 100644
+--- a/components/files/configurationmanager.hpp
++++ b/components/files/configurationmanager.hpp
+@@ -3,6 +3,8 @@
+ 
+ #ifdef _WIN32
+ #include <boost/tr1/tr1/unordered_map>
++#elif defined HAVE_UNORDERED_MAP
++#include <unordered_map>
+ #else
+ #include <tr1/unordered_map>
+ #endif
+@@ -48,7 +50,11 @@ struct ConfigurationManager
+         typedef Files::FixedPath<> FixedPathType;
+ 
+         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
+-        typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
++	#if defined HAVE_UNORDERED_MAP
++            typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
++	#else
++            typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
++	#endif
+ 
+         void loadConfig(const boost::filesystem::path& path,
+             boost::program_options::variables_map& variables,
diff --git a/games-engines/openmw/files/openmw-0.24.0/series b/games-engines/openmw/files/openmw-0.24.0/series
new file mode 100644
index 0000000..c802207
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.24.0/series
@@ -0,0 +1,3 @@
+# This series applies on GIT commit 5fac75845c573e7e6224330f31ce9f949ae6ca02
+01-libc-fixes-avcodec-avformat.patch
+02-libc-fixes-don-t-rely-on-tr1.patch
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 4c391fa..7cdb7fe 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -39,7 +39,8 @@ DEPEND="${LIBDEPEND}
 RDEPEND="${LIBDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/0002-libc-fixes.patch
+	epatch "${FILESDIR}"/${PN}-0.24.0/01-libc-fixes-avcodec-avformat.patch
+	epatch "${FILESDIR}"/${PN}-0.24.0/02-libc-fixes-don-t-rely-on-tr1.patch
 	epatch_user
 }