commit:     07e7677694e74d5410824fa70febbff79d77d5bf
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 21:31:42 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 21:32:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e76776

app-emulation/fs-uae: Fix missing X11/Xatom.h include

I think this was breaking when SDL2 was built with USE=-X. I think it
needs USE=X but I have added the missing include anyway and sent the
patch upstream.

Closes: https://bugs.gentoo.org/689994
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../fs-uae/files/fs-uae-3.0.0-Xatom.h.patch        | 25 ++++++++++++++++++++++
 app-emulation/fs-uae/fs-uae-3.0.0.ebuild           |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..8fa5bd612c4
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch
@@ -0,0 +1,25 @@
+From c4c267a90d412bc6d072615d38ce891325282b6d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <ch...@gentoo.org>
+Date: Tue, 27 Aug 2019 22:22:57 +0100
+Subject: [PATCH] Add missing X11/Xatom.h include
+
+It is sometimes (but not always?) included by SDL2.
+---
+ libfsemu/src/ml/x11.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libfsemu/src/ml/x11.c b/libfsemu/src/ml/x11.c
+index c20073d3..4dc5487c 100644
+--- a/libfsemu/src/ml/x11.c
++++ b/libfsemu/src/ml/x11.c
+@@ -26,6 +26,7 @@ extern SDL_Window* g_fs_ml_window;
+ 
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
++#include <X11/Xatom.h>
+ #ifdef USE_X11_XTEST
+ #include <X11/extensions/XTest.h>
+ #endif
+-- 
+2.21.0
+

diff --git a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild 
b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
index 376c782ca59..f0492ee2c5a 100644
--- a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
@@ -16,7 +16,7 @@ IUSE="fmv glew"
 RDEPEND="
        dev-libs/glib:2
        media-libs/libpng:0=
-       media-libs/libsdl2[opengl]
+       media-libs/libsdl2[opengl,X]
        media-libs/openal
        virtual/opengl
        x11-libs/libdrm
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
+       "${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
 )
 
 src_prepare() {

Reply via email to