diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-14 23:07:53 -0400 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-14 23:11:49 -0400 |
| commit | 984b9ebf358f20f8c0ae724bf62a321569164c57 (patch) | |
| tree | e90be7298937f6422205109b3c3ca2ee3b057a1f /games-emulation/sdlmame/files | |
| parent | media-gfx/mcomix: Remove old. (diff) | |
| download | gentoo-984b9ebf358f20f8c0ae724bf62a321569164c57.tar.gz gentoo-984b9ebf358f20f8c0ae724bf62a321569164c57.tar.bz2 gentoo-984b9ebf358f20f8c0ae724bf62a321569164c57.zip | |
games-emulation/sdlmame: version bump
Package-Manager: portage-2.2.28
Diffstat (limited to 'games-emulation/sdlmame/files')
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch | 28 | ||||
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.174-qt.patch | 29 |
2 files changed, 57 insertions, 0 deletions
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch new file mode 100644 index 000000000000..bd88cb476e8a --- /dev/null +++ b/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch @@ -0,0 +1,28 @@ +# work around gcc-4.9.3's implementation of cxx14 +# bug 582576 with patch from Alexander Miller +# https://bugs.gentoo.org/show_bug.cgi?id=582576 + +--- a/src/lib/util/strformat.h ++++ b/src/lib/util/strformat.h +@@ -185,9 +185,8 @@ + #include <type_traits>
+ #include <utility>
+
+-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
+-namespace std
+-{
++namespace std {
++namespace mame_cxx14_compat {
+ template<class _Container>
+ inline constexpr auto
+ cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))
+@@ -198,7 +197,8 @@ + cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))
+ { return std::end(__cont); }
+ }
+-#endif
++using namespace mame_cxx14_compat;
++}
+
+ namespace util {
+ namespace detail {
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch new file mode 100644 index 000000000000..f9c384d91cf8 --- /dev/null +++ b/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch @@ -0,0 +1,29 @@ +No point in adding qt-related things to the compile line unless the qt debugger is wanted + +--- scripts/src/osd/sdl_cfg.lua.orig ++++ scripts/src/osd/sdl_cfg.lua +@@ -115,14 +115,16 @@ + configuration { }
+
+ elseif _OPTIONS["targetos"]=="linux" then
+- if _OPTIONS["QT_HOME"]~=nil then
+- buildoptions {
+- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
+- }
+- else
+- buildoptions {
+- backtick("pkg-config --cflags Qt5Widgets"),
+- }
++ if _OPTIONS["USE_QTDEBUG"]=="1" then
++ if _OPTIONS["QT_HOME"]~=nil then
++ buildoptions {
++ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
++ }
++ else
++ buildoptions {
++ backtick("pkg-config --cflags Qt5Widgets"),
++ }
++ end
+ end
+ elseif _OPTIONS["targetos"]=="macosx" then
+ defines {
|