| 1 |
commit: 9cd74b65b74cc8dade5eedb5f4cbc6a1385eb752 |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 17:58:21 2016 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 17:58:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd74b65 |
| 7 |
|
| 8 |
games-emulation/sdlmame: fix compile when qt5 isn't installed (bug #581972) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../sdlmame/files/sdlmame-0.173-qt.patch | 29 ++++++++++++++++++++++ |
| 13 |
games-emulation/sdlmame/sdlmame-0.173.ebuild | 1 + |
| 14 |
2 files changed, 30 insertions(+) |
| 15 |
|
| 16 |
diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..f9c384d |
| 19 |
--- /dev/null |
| 20 |
+++ b/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch |
| 21 |
@@ -0,0 +1,29 @@ |
| 22 |
+No point in adding qt-related things to the compile line unless the qt debugger is wanted |
| 23 |
+ |
| 24 |
+--- scripts/src/osd/sdl_cfg.lua.orig |
| 25 |
++++ scripts/src/osd/sdl_cfg.lua |
| 26 |
+@@ -115,14 +115,16 @@ |
| 27 |
+ configuration { } |
| 28 |
+ |
| 29 |
+ elseif _OPTIONS["targetos"]=="linux" then |
| 30 |
+- if _OPTIONS["QT_HOME"]~=nil then |
| 31 |
+- buildoptions { |
| 32 |
+- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), |
| 33 |
+- } |
| 34 |
+- else |
| 35 |
+- buildoptions { |
| 36 |
+- backtick("pkg-config --cflags Qt5Widgets"), |
| 37 |
+- } |
| 38 |
++ if _OPTIONS["USE_QTDEBUG"]=="1" then |
| 39 |
++ if _OPTIONS["QT_HOME"]~=nil then |
| 40 |
++ buildoptions { |
| 41 |
++ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), |
| 42 |
++ } |
| 43 |
++ else |
| 44 |
++ buildoptions { |
| 45 |
++ backtick("pkg-config --cflags Qt5Widgets"), |
| 46 |
++ } |
| 47 |
++ end |
| 48 |
+ end |
| 49 |
+ elseif _OPTIONS["targetos"]=="macosx" then |
| 50 |
+ defines { |
| 51 |
|
| 52 |
diff --git a/games-emulation/sdlmame/sdlmame-0.173.ebuild b/games-emulation/sdlmame/sdlmame-0.173.ebuild |
| 53 |
index adc1cb7..7fa0a7c 100644 |
| 54 |
--- a/games-emulation/sdlmame/sdlmame-0.173.ebuild |
| 55 |
+++ b/games-emulation/sdlmame/sdlmame-0.173.ebuild |
| 56 |
@@ -73,6 +73,7 @@ src_unpack() { |
| 57 |
} |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
+ epatch "${FILESDIR}"/${P}-qt.patch |
| 61 |
# Disable using bundled libraries |
| 62 |
enable_feature USE_SYSTEM_LIB_EXPAT |
| 63 |
enable_feature USE_SYSTEM_LIB_FLAC |
Archives