[pkgsrc/trunk]: pkgsrc Remove 'dynarec' option and enable it by default instead.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1414362948a2
branches:  trunk
changeset: 311717:1414362948a2
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 16 13:25:27 2018 +0000

description:
Remove 'dynarec' option and enable it by default instead.

Discussed with wiz.

diffstat:

 emulators/libretro-mupen64plus/Makefile    |  12 +++++++++++-
 emulators/libretro-mupen64plus/options.mk  |  27 ++++++---------------------
 emulators/libretro-pcsx-rearmed/Makefile   |   8 +-------
 emulators/libretro-pcsx-rearmed/options.mk |  18 ------------------
 mk/defaults/options.description            |   1 -
 5 files changed, 18 insertions(+), 48 deletions(-)

diffs (129 lines):

diff -r ee30173adf38 -r 1414362948a2 emulators/libretro-mupen64plus/Makefile
--- a/emulators/libretro-mupen64plus/Makefile   Thu Aug 16 13:20:41 2018 +0000
+++ b/emulators/libretro-mupen64plus/Makefile   Thu Aug 16 13:25:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/08/11 13:59:39 nia Exp $
+# $NetBSD: Makefile,v 1.12 2018/08/16 13:25:27 nia Exp $
 
 DISTNAME=      libretro-mupen64plus-20180628
 CATEGORIES=    emulators
@@ -23,6 +23,16 @@
 
 MAKE_FLAGS+=           GIT_VERSION="-pkgsrc"
 
+.if !empty(MACHINE_ARCH:M*arm*)
+MAKE_FLAGS+=   WITH_DYNAREC=arm
+.elif ${MACHINE_ARCH} == "i386"
+MAKE_FLAGS+=   WITH_DYNAREC=x86
+.elif ${MACHINE_ARCH} == "x86_64"
+MAKE_FLAGS+=   WITH_DYNAREC=x86_64
+.else
+MAKE_FLAGS+=   WITH_DYNAREC=
+.endif
+
 INSTALLATION_DIRS+=    ${PREFIX}/lib/libretro
 
 CFLAGS.NetBSD+=                -DHAVE_POSIX_MEMALIGN=1
diff -r ee30173adf38 -r 1414362948a2 emulators/libretro-mupen64plus/options.mk
--- a/emulators/libretro-mupen64plus/options.mk Thu Aug 16 13:20:41 2018 +0000
+++ b/emulators/libretro-mupen64plus/options.mk Thu Aug 16 13:25:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2018/08/14 13:08:57 nia Exp $
+# $NetBSD: options.mk,v 1.8 2018/08/16 13:25:27 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libretro-mupen64plus
 PKG_OPTIONS_REQUIRED_GROUPS=   graphics
@@ -8,17 +8,10 @@
 
 .if !empty(MACHINE_ARCH:M*arm*)
 PKG_OPTIONS_GROUP.graphics+=   rpi
-PKG_SUPPORTED_OPTIONS+=                dynarec
-PKG_SUGGESTED_OPTIONS+=                rpi dynarec
-MUPEN64_DYNAREC_ARCH=          arm
-.elif ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+=                dynarec
-PKG_SUGGESTED_OPTIONS+=                dynarec opengl
-MUPEN64_DYNAREC_ARCH=          x86
-.elif ${MACHINE_ARCH} == "x86_64"
-PKG_SUPPORTED_OPTIONS+=                dynarec
-PKG_SUGGESTED_OPTIONS+=                dynarec opengl
-MUPEN64_DYNAREC_ARCH=          x86_64
+.endif
+
+.if !empty(MACHINE_ARCH:Mearm*) && ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=                rpi
 .else
 PKG_SUGGESTED_OPTIONS+=                opengl
 .endif
@@ -27,15 +20,7 @@
 
 .if !empty(PKG_OPTIONS:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mrpi)
+.elif !empty(PKG_OPTIONS:Mrpi)
 MAKE_ENV+=     platform=rpi
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mdynarec)
-MAKE_ENV+=     WITH_DYNAREC=${MUPEN64_DYNAREC_ARCH}
-.else
-MAKE_ENV+=     WITH_DYNAREC=
-.endif
diff -r ee30173adf38 -r 1414362948a2 emulators/libretro-pcsx-rearmed/Makefile
--- a/emulators/libretro-pcsx-rearmed/Makefile  Thu Aug 16 13:20:41 2018 +0000
+++ b/emulators/libretro-pcsx-rearmed/Makefile  Thu Aug 16 13:25:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/03/07 21:14:32 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2018/08/16 13:25:28 nia Exp $
 
 DISTNAME=      libretro-pcsx-rearmed-0.22
 CATEGORIES=    emulators
@@ -29,12 +29,6 @@
 
 MAKE_ENV+=     platform="${PCSX_REARMED_PLATFORM}"
 
-.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
-.include "options.mk"
-.endif
-
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/pcsx_rearmed_libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/pcsx_rearmed_libretro.so
diff -r ee30173adf38 -r 1414362948a2 emulators/libretro-pcsx-rearmed/options.mk
--- a/emulators/libretro-pcsx-rearmed/options.mk        Thu Aug 16 13:20:41 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2015/02/05 16:57:36 wiz Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libretro-pcsx-rearmed
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if !empty(MACHINE_ARCH:M*arm*)
-PKG_SUPPORTED_OPTIONS+=        dynarec
-PKG_SUGGESTED_OPTIONS+=        dynarec
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdynarec)
-# enabled by default
-.else
-CONFIGURE_ARGS+=       --disable-dynarec
-.endif
diff -r ee30173adf38 -r 1414362948a2 mk/defaults/options.description
--- a/mk/defaults/options.description   Thu Aug 16 13:20:41 2018 +0000
+++ b/mk/defaults/options.description   Thu Aug 16 13:25:27 2018 +0000
@@ -149,7 +149,6 @@
 dvdnav                 Enable libdvdnav support to navigate DVDs.
 dvdread                        Enable reproduction of DVDs.
 dvi                    Enable device independent file format (mostly TeX) support.
-dynarec                        Enable dynamic recompilation.
 eaccelerator-disassembler      Include disassembler.
 eaccelerator-doc-comment-inclusion     Retain doc-comments in internal php structures.
 eai                    Enable EAI (Email Address Internationalization) support.