retroarch: Clean up options and add sunxi-g2d

[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 Jun 25 14:21:42 2017 +0100
Changeset:	469996f8ec3ec9d1b472ce3ad06a440fbd623437

Modified Files:
	retroarch/options.mk

Log Message:
retroarch: Clean up options and add sunxi-g2d

No binary blobs are required for sunxi-g2d. This solution is FOSS-only,
versus the GLES solution that requires binary blobs.

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

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

diffstat:
 retroarch/options.mk | 49 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 10 deletions(-)

diffs:
diff --git a/retroarch/options.mk b/retroarch/options.mk
index fa3ebeb4ca..07ba941f63 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -3,27 +3,53 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.retroarch
-PKG_SUPPORTED_OPTIONS+=	sdl2 alsa ffmpeg freetype libxml2
+PKG_SUPPORTED_OPTIONS+=	sdl2 alsa ffmpeg freetype libxml2 udev
 PKG_SUGGESTED_OPTIONS+=	sdl2 ffmpeg freetype
+PKG_OPTIONS_OPTIONAL_GROUPS+=	gl
+PKG_OPTIONS_GROUP.gl+=		opengl
 
 .if !empty(MACHINE_ARCH:M*arm*)
-PKG_OPTIONS_OPTIONAL_GROUPS+=	gles
-PKG_OPTIONS_GROUP.gles+=	rpi
+CONFIGURE_ARGS+=		--enable-floathard
+PKG_OPTIONS_GROUP.gl+=		rpi
+PKG_SUPPORTED_OPTIONS+=		simd
 .endif
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
-PKG_OPTIONS_GROUP.gles+=	sunxi-mali-fb
+.if !empty(MACHINE_ARCH:M*armv7*)
+PKG_SUGGESTED_OPTIONS+=		simd
+.endif
+
+.if !empty(MACHINE_PLATFORM:MLinux-*-*armv7*)
+CONFIGURE_ARGS+=		--enable-neon
+PKG_OPTIONS_GROUP.gl+=		sunxi-mali-fb
+PKG_SUPPORTED_OPTIONS+=		sunxi-g2d
+PKG_SUGGESTED_OPTIONS+=		sunxi-g2d
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*)
 PKG_SUGGESTED_OPTIONS+=		rpi
+.else
+PKG_SUGGESTED_OPTIONS+=		opengl
 .endif
 
-PKG_SUPPORTED_OPTIONS.Linux+=	udev
 PKG_SUGGESTED_OPTIONS.Linux+=	alsa udev
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(MACHINE_ARCH:M*arm*)
+.if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+=	--enable-neon
+.else
+CONFIGURE_ARGS+=	--disable-neon
+.endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+CONFIGURE_ARGS+=	--enable-opengl
+.include "../../graphics/MesaLib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-opengl
+.endif
+
 .if !empty(PKG_OPTIONS:Mrpi)
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
 SUBST_CLASSES+=		vc
@@ -32,7 +58,13 @@ SUBST_MESSAGE.vc=	Fixing path to VideoCore libraries.
 SUBST_FILES.vc=		qb/config.libs.sh
 SUBST_SED.vc+=		-e 's;/opt/vc;${PREFIX};g'
 CONFIGURE_ARGS+=	--enable-opengles
-CONFIGURE_ARGS+=	--disable-opengl
+.endif
+
+#
+# Enable use of the blobless unaccelerated Linux sunxi g2d driver
+#
+.if !empty(PKG_OPTIONS:Msunxi-g2d)
+CONFIGURE_ARGS+=	--enable-sunxi
 .endif
 
 #
@@ -40,11 +72,8 @@ CONFIGURE_ARGS+=	--disable-opengl
 #
 .if !empty(PKG_OPTIONS:Msunxi-mali-fb)
 .include "../../wip/sunxi-mali-fb/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-floathard
-CONFIGURE_ARGS+=	--enable-neon
 CONFIGURE_ARGS+=	--enable-opengles
 CONFIGURE_ARGS+=	--enable-mali_fbdev
-CONFIGURE_ARGS+=	--disable-opengl
 .endif
 
 .if !empty(PKG_OPTIONS:Mudev)