[pkgsrc/trunk]: pkgsrc/emulators/libretro-mupen64plus Use MesaLib only on non...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b02f6822748d
branches:  trunk
changeset: 646235:b02f6822748d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 05 17:33:12 2015 +0000

description:
Use MesaLib only on non-arm.
Support dynarec option on i386 and x86_64 too.

diffstat:

 emulators/libretro-mupen64plus/Makefile   |  10 ++++++----
 emulators/libretro-mupen64plus/options.mk |  10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r e42b8b7194f6 -r b02f6822748d emulators/libretro-mupen64plus/Makefile
--- a/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 17:32:20 2015 +0000
+++ b/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 17:33:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/02/05 17:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/05 17:33:12 wiz Exp $
 
 DISTNAME=      mupen64plus-libretro-20150204
 PKGNAME=       libretro-mupen64plus-20150204
@@ -29,9 +29,9 @@
 CFLAGS+=       -DHAVE_POSIX_MEMALIGN=1
 .endif
 
-.if !empty(MACHINE_ARCH:M*arm*)
-# only ARM-specific options for now, and options framework
-#insists on having at least one option, so only pull it in for ARM
+.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
 
@@ -39,5 +39,7 @@
        ${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 e42b8b7194f6 -r b02f6822748d emulators/libretro-mupen64plus/options.mk
--- a/emulators/libretro-mupen64plus/options.mk Thu Feb 05 17:32:20 2015 +0000
+++ b/emulators/libretro-mupen64plus/options.mk Thu Feb 05 17:33:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/02/05 16:57:36 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2015/02/05 17:33:12 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libretro-mupen64plus
 
@@ -8,6 +8,14 @@
 PKG_SUPPORTED_OPTIONS+=        rpi dynarec
 PKG_SUGGESTED_OPTIONS+=        rpi dynarec
 MUPEN64_DYNAREC_ARCH=  arm
+.elif !empty(MACHINE_ARCH:Mi386)
+PKG_SUPPORTED_OPTIONS+=        dynarec
+PKG_SUGGESTED_OPTIONS+=        dynarec
+MUPEN64_DYNAREC_ARCH=  x86
+.elif !empty(MACHINE_ARCH:Mx86_64)
+PKG_SUPPORTED_OPTIONS+=        dynarec
+PKG_SUGGESTED_OPTIONS+=        dynarec
+MUPEN64_DYNAREC_ARCH=  x86_64
 .endif
 
 .include "../../mk/bsd.options.mk"