retroarch: Add back support for X11 -SDL, it's useful when EGL is supported

[Nia Alarie <nia.alarie%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Sun Sep 10 13:36:31 2017 +0100
Changeset:	4d0b4b116a4608b5f5564e233b11c7ad5237877e

Modified Files:
	retroarch/Makefile
	retroarch/options.mk

Log Message:
retroarch: Add back support for X11 -SDL, it's useful when EGL is supported

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d0b4b116a4608b5f5564e233b11c7ad5237877e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 retroarch/Makefile   |  1 -
 retroarch/options.mk | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs:
diff --git a/retroarch/Makefile b/retroarch/Makefile
index 06311dd19b..a2d2ea344a 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -16,7 +16,6 @@ HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--disable-builtinminiupnpc
 CONFIGURE_ARGS+=--disable-builtinzlib
-CONFIGURE_ARGS+=--disable-x11	# broken, SDL2 works
 
 CONFIGURE_ENV+=	BIN_DIR=${PREFIX}/bin
 CONFIGURE_ENV+=	MAN_DIR=${PREFIX}/${PKGMANDIR}
diff --git a/retroarch/options.mk b/retroarch/options.mk
index af059160fa..cea0985d16 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -3,8 +3,8 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.retroarch
-PKG_SUPPORTED_OPTIONS+=	sdl2 ffmpeg freetype alsa caca pulseaudio udev
-PKG_SUGGESTED_OPTIONS+=	sdl2 ffmpeg freetype
+PKG_SUPPORTED_OPTIONS+=	sdl2 ffmpeg freetype x11 alsa caca pulseaudio udev
+PKG_SUGGESTED_OPTIONS+=	sdl2 ffmpeg freetype x11
 PKG_SUGGESTED_OPTIONS.Linux+=	alsa udev
 PKG_OPTIONS_OPTIONAL_GROUPS+=	gl
 PKG_OPTIONS_GROUP.gl+=		opengl
@@ -48,6 +48,18 @@ CONFIGURE_ARGS+=	--enable-opengl
 CONFIGURE_ARGS+=	--disable-opengl
 .endif
 
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--enable-x11
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-x11
+.endif
+
 .if !empty(PKG_OPTIONS:Mcaca)
 CONFIGURE_ARGS+=	--enable-caca
 .include "../../graphics/libcaca/buildlink3.mk"