Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/retroarch retroarch: Simplify OpenGL handlin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/80aad1e53688
branches:  trunk
changeset: 434883:80aad1e53688
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jun 25 12:17:42 2020 +0000

description:
retroarch: Simplify OpenGL handling for Darwin.

Ensure options group isn't empty.

diffstat:

 emulators/retroarch/options.mk |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r fc51e481dbf9 -r 80aad1e53688 emulators/retroarch/options.mk
--- a/emulators/retroarch/options.mk    Thu Jun 25 11:29:52 2020 +0000
+++ b/emulators/retroarch/options.mk    Thu Jun 25 12:17:42 2020 +0000
@@ -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_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 @@
 # 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 @@
 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



Home | Main Index | Thread Index | Old Index