retroarch: Make assets an optional dependency when OpenGL/GLES is disabled.

[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 May 6 16:57:42 2018 +0100
Changeset:	e1172ad5ed05ae9c8590ac7f447f487463ac2780

Modified Files:
	retroarch/Makefile
	retroarch/options.mk

Log Message:
retroarch: Make assets an optional dependency when OpenGL/GLES
is disabled.

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

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

diffstat:
 retroarch/Makefile   |  6 ++----
 retroarch/options.mk | 51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diffs:
diff --git a/retroarch/Makefile b/retroarch/Makefile
index f68fa5f14c..090f116d14 100644
--- a/retroarch/Makefile
+++ b/retroarch/Makefile
@@ -26,10 +26,8 @@ USE_TOOLS+=	pkg-config gmake
 
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
-DEPENDS+=	libretro-database>0:../../wip/libretro-database
-DEPENDS+=	libretro-core-info>0:../../wip/libretro-core-info
-DEPENDS+=	libretro-glsl-shaders>0:../../wip/libretro-glsl-shaders
-DEPENDS+=	retroarch-assets>0:../../wip/retroarch-assets
+DEPENDS+=	libretro-database>=${PKGVERSION_NOREV}:../../wip/libretro-database
+DEPENDS+=	libretro-core-info>=${PKGVERSION_NOREV}:../../wip/libretro-core-info
 
 CPPFLAGS+=	-DPREFIX=\"${PREFIX}\"
 
diff --git a/retroarch/options.mk b/retroarch/options.mk
index d06e55b981..ab9f1d8a3a 100644
--- a/retroarch/options.mk
+++ b/retroarch/options.mk
@@ -62,13 +62,6 @@ CONFIGURE_ARGS+=	--enable-libusb
 CONFIGURE_ARGS+=	--disable-libusb
 .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:Mx11)
 CONFIGURE_ARGS+=	--enable-x11
 .include "../../x11/libX11/buildlink3.mk"
@@ -88,7 +81,18 @@ CONFIGURE_ARGS+=	--enable-caca
 CONFIGURE_ARGS+=	--disable-caca
 .endif
 
-.if !empty(PKG_OPTIONS:Mrpi)
+#
+# Graphics acceleration options
+#
+
+# Use standard Mesa OpenGL
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/MesaLib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-opengl
+USE_RETROARCH_GL=	yes
+
+# Enable use of the Raspberry Pi GPU driver
+.elif !empty(PKG_OPTIONS:Mrpi)
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
 SUBST_CLASSES+=		vc
 SUBST_STAGE.vc=		pre-configure
@@ -97,6 +101,28 @@ SUBST_FILES.vc=		qb/config.libs.sh
 SUBST_SED.vc+=		-e 's;/opt/vc;${PREFIX};g'
 
 CONFIGURE_ARGS+=	--enable-opengles
+USE_RETROARCH_GL=	yes
+
+# Enable use of the Linux binary Mali GPU driver (framebuffer version)
+.elif !empty(PKG_OPTIONS:Msunxi-mali-fb)
+.include "../../wip/sunxi-mali-fb/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-opengles
+CONFIGURE_ARGS+=	--enable-mali_fbdev
+USE_RETROARCH_GL=	yes
+
+# Disable any graphics acceleration library
+.else
+CONFIGURE_ARGS+=	--disable-egl
+CONFIGURE_ARGS+=	--disable-opengl
+CONFIGURE_ARGS+=	--disable-vulkan
+CONFIGURE_ARGS+=	--disable-vulkan_display
+CONFIGURE_ARGS+=	--disable-wayland
+USE_RETROARCH_GL=	no
+.endif
+
+.if ${USE_RETROARCH_GL} == "yes"
+DEPENDS+=	retroarch-assets>=${PKGVERSION_NOREV}:../../wip/retroarch-assets
+DEPENDS+=	libretro-glsl-shaders>0:../../wip/libretro-glsl-shaders
 .endif
 
 #
@@ -106,15 +132,6 @@ CONFIGURE_ARGS+=	--enable-opengles
 CONFIGURE_ARGS+=	--enable-sunxi
 .endif
 
-#
-# Enable use of the Linux binary Mali GPU driver (framebuffer version)
-#
-.if !empty(PKG_OPTIONS:Msunxi-mali-fb)
-.include "../../wip/sunxi-mali-fb/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-opengles
-CONFIGURE_ARGS+=	--enable-mali_fbdev
-.endif
-
 .if !empty(PKG_OPTIONS:Mudev)
 # To support keyboard callback interface in udev, the libxkbcommon package
 # (version 0.3 and up) is required. It is used to translate raw evdev events