diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-05 21:02:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-05 21:02:37 +0000 |
| commit | 64387cb10043605ade2b9cc0f888035d6c8d1325 (patch) | |
| tree | b9c74a76e5e6c846f541741f33b27c775ddca3ec | |
| parent | dc70a53f0f0de37aaf4c0227dee981c740e495f9 (diff) | |
| download | pkgsrc-64387cb10043605ade2b9cc0f888035d6c8d1325.tar.gz | |
It's either rpi or MesaLib. Try to express this using pkgsrc options.
Based on a comment by jmcneill.
| -rw-r--r-- | emulators/libretro-mupen64plus/Makefile | 9 | ||||
| -rw-r--r-- | emulators/libretro-mupen64plus/options.mk | 17 |
2 files changed, 14 insertions, 12 deletions
diff --git a/emulators/libretro-mupen64plus/Makefile b/emulators/libretro-mupen64plus/Makefile index 2b610022839..a92371d3549 100644 --- a/emulators/libretro-mupen64plus/Makefile +++ b/emulators/libretro-mupen64plus/Makefile @@ -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 @@ INSTALLATION_DIRS+= ${PREFIX}/lib/libretro 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 --git a/emulators/libretro-mupen64plus/options.mk b/emulators/libretro-mupen64plus/options.mk index db6e377dcdb..5f0efaf38a6 100644 --- a/emulators/libretro-mupen64plus/options.mk +++ b/emulators/libretro-mupen64plus/options.mk @@ -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" |