[pkgsrc/trunk]: pkgsrc/emulators/libretro-mupen64plus It's either rpi or Mesa...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecc237de0a8a
branches:  trunk
changeset: 646244:ecc237de0a8a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 05 21:02:37 2015 +0000

description:
It's either rpi or MesaLib. Try to express this using pkgsrc options.
Based on a comment by jmcneill.

diffstat:

 emulators/libretro-mupen64plus/Makefile   |   9 +--------
 emulators/libretro-mupen64plus/options.mk |  17 +++++++++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r 7935d09c15bc -r ecc237de0a8a emulators/libretro-mupen64plus/Makefile
--- a/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 20:25:56 2015 +0000
+++ b/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 21:02:37 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/02/05 17:33:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/05 21:02:37 wiz Exp $
 
 DISTNAME=      mupen64plus-libretro-20150204
 PKGNAME=       libretro-mupen64plus-20150204
@@ -29,17 +29,10 @@
 CFLAGS+=       -DHAVE_POSIX_MEMALIGN=1
 .endif
 
-.if !empty(MACHINE_ARCH:M*arm*) || !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
-# only ARM-, i386-, and x86_64-specific options for now, and options framework
-#insists on having at least one option, so only pull it in for them
 .include "options.mk"
-.endif
 
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so
 
-.if empty(MACHINE_ARCH:M*arm*)
-.include "../../graphics/MesaLib/buildlink3.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff -r 7935d09c15bc -r ecc237de0a8a emulators/libretro-mupen64plus/options.mk
--- a/emulators/libretro-mupen64plus/options.mk Thu Feb 05 20:25:56 2015 +0000
+++ b/emulators/libretro-mupen64plus/options.mk Thu Feb 05 21:02:37 2015 +0000
@@ -1,25 +1,34 @@
-# $NetBSD: options.mk,v 1.3 2015/02/05 17:33:12 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2015/02/05 21:02:37 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libretro-mupen64plus
+PKG_OPTIONS_REQUIRED_GROUPS=   graphics
+PKG_OPTIONS_GROUP.graphics=    opengl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(MACHINE_ARCH:M*arm*)
-PKG_SUPPORTED_OPTIONS+=        rpi dynarec
+PKG_OPTIONS_GROUP.graphics+=   rpi
+PKG_SUPPORTED_OPTIONS+=        dynarec
 PKG_SUGGESTED_OPTIONS+=        rpi dynarec
 MUPEN64_DYNAREC_ARCH=  arm
 .elif !empty(MACHINE_ARCH:Mi386)
 PKG_SUPPORTED_OPTIONS+=        dynarec
-PKG_SUGGESTED_OPTIONS+=        dynarec
+PKG_SUGGESTED_OPTIONS+=        dynarec opengl
 MUPEN64_DYNAREC_ARCH=  x86
 .elif !empty(MACHINE_ARCH:Mx86_64)
 PKG_SUPPORTED_OPTIONS+=        dynarec
-PKG_SUGGESTED_OPTIONS+=        dynarec
+PKG_SUGGESTED_OPTIONS+=        dynarec opengl
 MUPEN64_DYNAREC_ARCH=  x86_64
+.else
+PKG_SUGGESTED_OPTIONS+=        opengl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/MesaLib/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mrpi)
 MAKE_ENV+=     platform=rpi
 .include "../../misc/raspberrypi-userland/buildlink3.mk"