| 1 |
commit: 07e7677694e74d5410824fa70febbff79d77d5bf |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 27 21:31:42 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 27 21:32:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e76776 |
| 7 |
|
| 8 |
app-emulation/fs-uae: Fix missing X11/Xatom.h include |
| 9 |
|
| 10 |
I think this was breaking when SDL2 was built with USE=-X. I think it |
| 11 |
needs USE=X but I have added the missing include anyway and sent the |
| 12 |
patch upstream. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/689994 |
| 15 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 16 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 17 |
|
| 18 |
.../fs-uae/files/fs-uae-3.0.0-Xatom.h.patch | 25 ++++++++++++++++++++++ |
| 19 |
app-emulation/fs-uae/fs-uae-3.0.0.ebuild | 3 ++- |
| 20 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch b/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..8fa5bd612c4 |
| 25 |
--- /dev/null |
| 26 |
+++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch |
| 27 |
@@ -0,0 +1,25 @@ |
| 28 |
+From c4c267a90d412bc6d072615d38ce891325282b6d Mon Sep 17 00:00:00 2001 |
| 29 |
+From: James Le Cuirot <chewi@g.o> |
| 30 |
+Date: Tue, 27 Aug 2019 22:22:57 +0100 |
| 31 |
+Subject: [PATCH] Add missing X11/Xatom.h include |
| 32 |
+ |
| 33 |
+It is sometimes (but not always?) included by SDL2. |
| 34 |
+--- |
| 35 |
+ libfsemu/src/ml/x11.c | 1 + |
| 36 |
+ 1 file changed, 1 insertion(+) |
| 37 |
+ |
| 38 |
+diff --git a/libfsemu/src/ml/x11.c b/libfsemu/src/ml/x11.c |
| 39 |
+index c20073d3..4dc5487c 100644 |
| 40 |
+--- a/libfsemu/src/ml/x11.c |
| 41 |
++++ b/libfsemu/src/ml/x11.c |
| 42 |
+@@ -26,6 +26,7 @@ extern SDL_Window* g_fs_ml_window; |
| 43 |
+ |
| 44 |
+ #include <X11/Xlib.h> |
| 45 |
+ #include <X11/keysym.h> |
| 46 |
++#include <X11/Xatom.h> |
| 47 |
+ #ifdef USE_X11_XTEST |
| 48 |
+ #include <X11/extensions/XTest.h> |
| 49 |
+ #endif |
| 50 |
+-- |
| 51 |
+2.21.0 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild |
| 55 |
index 376c782ca59..f0492ee2c5a 100644 |
| 56 |
--- a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild |
| 57 |
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild |
| 58 |
@@ -16,7 +16,7 @@ IUSE="fmv glew" |
| 59 |
RDEPEND=" |
| 60 |
dev-libs/glib:2 |
| 61 |
media-libs/libpng:0= |
| 62 |
- media-libs/libsdl2[opengl] |
| 63 |
+ media-libs/libsdl2[opengl,X] |
| 64 |
media-libs/openal |
| 65 |
virtual/opengl |
| 66 |
x11-libs/libdrm |
| 67 |
@@ -37,6 +37,7 @@ BDEPEND=" |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch |
| 71 |
+ "${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch |
| 72 |
) |
| 73 |
|
| 74 |
src_prepare() { |
Archives