[gentoo-commits] repo/gentoo:master commit in: games-emulation/sdlmame/files/, games-emulation/sdlmame/
commit: 984b9ebf358f20f8c0ae724bf62a321569164c57
Author: Michael Sterrett gentoo org>
AuthorDate: Wed Jun 15 03:07:53 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed Jun 15 03:11:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984b9ebf
games-emulation/sdlmame: version bump
Package-Manager: portage-2.2.28
games-emulation/sdlmame/Manifest | 1 +
.../sdlmame/files/sdlmame-0.174-cxx14.patch| 28 +++
.../sdlmame/files/sdlmame-0.174-qt.patch | 29 +++
games-emulation/sdlmame/sdlmame-0.174.ebuild | 235 +
4 files changed, 293 insertions(+)
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 95551bb..d42bcb3 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,2 +1,3 @@
DIST mame-0.168.zip 82770536 SHA256
f91e014c3d3bf3da790284a25437f231a84228a6adbf42db35ca34a57f8a3092 SHA512
14b0519682f8aeb2379cd29b9e0ad8f3c54866296ac158876435425b79c3bf19a2dc520df7a44fe301a8e8cbbc335185602f4998edf6e95324f527c50c72411e
WHIRLPOOL
41ddbe191423e3653a52f7734cc85088f1c663fd9aefdbd00ceefbe86f27bde190d14505be7fa69f76c7a39c6bbb5ab196685c2e001c8517cb90f4f7f27e8a51
DIST mame-0.173.zip 92387665 SHA256
45a31815838abfab10d4b0c13be013c24385f1ff07aaeafa8e86014b996376a5 SHA512
e4ca67cf313b23c49a30914299878270caddd24b5f26aefb6a5dc3ae0720847aff63e999237997edb01492afd60e3afd4be54ff885595e2f043ac4c0b647488b
WHIRLPOOL
d7065575ea842e63efd0494b1ba477524b4185b7ebd651bb7a60240b38b692245c53bf3a6044c251805bb80b7cd053f0f903259da36e9d109039579372255956
+DIST mame-0.174.zip 95944685 SHA256
b9b1a65e855b055b0b6b262a7644d2b9a57c73541c55ee9eb60158508348a6fd SHA512
9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
WHIRLPOOL
02a66870e5e27b4ea5cea8a53f3e2b629cdbf86090e0ba7c80fd4a0f1f7a866e67ff730e3cf14aa416560fab172dd65a9235013be97a9b61a451227649a551cc
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 000..bd88cb4
--- /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
+ #include
+
+-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
+-namespace std
+-{
++namespace std {
++namespace mame_cxx14_compat {
+ template
+ 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 000..f9c384d
--- /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 {
diff --git a/games-emulation/sdlmame/sdlmame-0.174.ebuild
b/games-emulation/sdlmame/sdlmame-0.174.ebuild
new file mode 100644
index 000..59d21f2
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.174.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-any-r1 toolchain-funcs qmake-utils games
+
+MY_PV="${PV/.}"
+
+DESCRIPTION="Multiple Arcade Machine Emulator + Multi
[gentoo-commits] repo/gentoo:master commit in: games-emulation/sdlmame/files/, games-emulation/sdlmame/
commit: e6f0576d0a5e1f59940c5e51b8480907d6667c0d
Author: Michael Sterrett gentoo org>
AuthorDate: Wed Jun 15 03:09:39 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed Jun 15 03:11:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f0576d
games-emulation/sdlmame: clean old
Package-Manager: portage-2.2.28
games-emulation/sdlmame/Manifest | 1 -
.../sdlmame/files/sdlmame-0.173-cxx14.patch| 28 ---
.../sdlmame/files/sdlmame-0.173-qt.patch | 29 ---
games-emulation/sdlmame/sdlmame-0.173.ebuild | 235 -
4 files changed, 293 deletions(-)
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index d42bcb3..4298e3e 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,3 +1,2 @@
DIST mame-0.168.zip 82770536 SHA256
f91e014c3d3bf3da790284a25437f231a84228a6adbf42db35ca34a57f8a3092 SHA512
14b0519682f8aeb2379cd29b9e0ad8f3c54866296ac158876435425b79c3bf19a2dc520df7a44fe301a8e8cbbc335185602f4998edf6e95324f527c50c72411e
WHIRLPOOL
41ddbe191423e3653a52f7734cc85088f1c663fd9aefdbd00ceefbe86f27bde190d14505be7fa69f76c7a39c6bbb5ab196685c2e001c8517cb90f4f7f27e8a51
-DIST mame-0.173.zip 92387665 SHA256
45a31815838abfab10d4b0c13be013c24385f1ff07aaeafa8e86014b996376a5 SHA512
e4ca67cf313b23c49a30914299878270caddd24b5f26aefb6a5dc3ae0720847aff63e999237997edb01492afd60e3afd4be54ff885595e2f043ac4c0b647488b
WHIRLPOOL
d7065575ea842e63efd0494b1ba477524b4185b7ebd651bb7a60240b38b692245c53bf3a6044c251805bb80b7cd053f0f903259da36e9d109039579372255956
DIST mame-0.174.zip 95944685 SHA256
b9b1a65e855b055b0b6b262a7644d2b9a57c73541c55ee9eb60158508348a6fd SHA512
9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
WHIRLPOOL
02a66870e5e27b4ea5cea8a53f3e2b629cdbf86090e0ba7c80fd4a0f1f7a866e67ff730e3cf14aa416560fab172dd65a9235013be97a9b61a451227649a551cc
diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch
b/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch
deleted file mode 100644
index bd88cb4..000
--- a/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
- #include
-
--#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
--namespace std
--{
-+namespace std {
-+namespace mame_cxx14_compat {
- template
- 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.173-qt.patch
b/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch
deleted file mode 100644
index f9c384d..000
--- a/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 {
diff --git a/games-emulation/sdlmame/sdlmame-0.173.ebuild
b/games-emulation/sdlmame/sdlmame-0.173.ebuild
deleted file mode 100644
index 0c3368e..000
--- a/games-emulation/sdlmame/sdlmame-0.173.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-any-r1 toolchain-funcs qmake-utils games
-
-MY_PV="${PV/.}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator +
