CVS commit: pkgsrc/emulators/retroarch

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 25 12:17:42 UTC 2020

Modified Files:
        pkgsrc/emulators/retroarch: options.mk

Log Message:
retroarch: Simplify OpenGL handling for Darwin.

Ensure options group isn't empty.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/retroarch/options.mk

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

Modified files:

Index: pkgsrc/emulators/retroarch/options.mk
diff -u pkgsrc/emulators/retroarch/options.mk:1.14 pkgsrc/emulators/retroarch/options.mk:1.15
--- pkgsrc/emulators/retroarch/options.mk:1.14  Sat May 30 14:26:52 2020
+++ pkgsrc/emulators/retroarch/options.mk       Thu Jun 25 12:17:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2020/05/30 14:26:52 nia Exp $
+# $NetBSD: options.mk,v 1.15 2020/06/25 12:17:42 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.retroarch
 
@@ -13,12 +13,8 @@ PKG_OPTIONS_OPTIONAL_GROUPS+=        gl
 PKG_OPTIONS_GROUP.gl+=         rpi
 .endif
 
-.if ${OPSYS} != "Darwin"
 PKG_OPTIONS_GROUP.gl+=         opengl
 PKG_SUGGESTED_OPTIONS=         freetype opengl
-.else
-PKG_SUGGESTED_OPTIONS=         freetype
-.endif
 
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa pulseaudio
 
@@ -42,7 +38,9 @@ CONFIGURE_ARGS+=      --disable-sixel
 # Use standard Mesa OpenGL
 .if !empty(PKG_OPTIONS:Mopengl)
 CONFIGURE_ARGS+=       --enable-opengl
-.include "../../graphics/MesaLib/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.endif
 
 # Enable use of the Raspberry Pi GPU driver
 .elif !empty(PKG_OPTIONS:Mrpi)
@@ -56,7 +54,7 @@ SUBST_SED.vc+=                -e 's;/opt/vc;${PREFIX};
 CONFIGURE_ARGS+=       --enable-opengles
 
 # Disable any graphics acceleration library
-.elif ${OPSYS} != "Darwin"
+.else
 CONFIGURE_ARGS+=       --disable-egl
 CONFIGURE_ARGS+=       --disable-opengl
 CONFIGURE_ARGS+=       --disable-opengl_core