commit: 9cd74b65b74cc8dade5eedb5f4cbc6a1385eb752
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 17:58:21 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue May 3 17:58:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd74b65
games-emulation/sdlmame: fix compile when qt5 isn't installed (bug #581972)
Package-Manager: portage-2.2.26
.../sdlmame/files/sdlmame-0.173-qt.patch | 29 ++++++++++++++++++++++
games-emulation/sdlmame/sdlmame-0.173.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch
b/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch
new file mode 100644
index 0000000..f9c384d
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.173-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.173.ebuild
b/games-emulation/sdlmame/sdlmame-0.173.ebuild
index adc1cb7..7fa0a7c 100644
--- a/games-emulation/sdlmame/sdlmame-0.173.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.173.ebuild
@@ -73,6 +73,7 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-qt.patch
# Disable using bundled libraries
enable_feature USE_SYSTEM_LIB_EXPAT
enable_feature USE_SYSTEM_LIB_FLAC