CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 16 13:25:28 UTC 2018

Modified Files:
        pkgsrc/emulators/libretro-mupen64plus: Makefile options.mk
        pkgsrc/emulators/libretro-pcsx-rearmed: Makefile
        pkgsrc/mk/defaults: options.description
Removed Files:
        pkgsrc/emulators/libretro-pcsx-rearmed: options.mk

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

Discussed with wiz.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/libretro-mupen64plus/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/libretro-mupen64plus/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/libretro-pcsx-rearmed/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/libretro-pcsx-rearmed/options.mk
cvs rdiff -u -r1.559 -r1.560 pkgsrc/mk/defaults/options.description

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/libretro-mupen64plus/Makefile
diff -u pkgsrc/emulators/libretro-mupen64plus/Makefile:1.11 pkgsrc/emulators/libretro-mupen64plus/Makefile:1.12
--- pkgsrc/emulators/libretro-mupen64plus/Makefile:1.11 Sat Aug 11 13:59:39 2018
+++ pkgsrc/emulators/libretro-mupen64plus/Makefile      Thu Aug 16 13:25:27 2018
@@ -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 @@ SUBST_SED.vc+=               -e 's;/opt/vc;${PREFIX};
 
 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

Index: pkgsrc/emulators/libretro-mupen64plus/options.mk
diff -u pkgsrc/emulators/libretro-mupen64plus/options.mk:1.7 pkgsrc/emulators/libretro-mupen64plus/options.mk:1.8
--- pkgsrc/emulators/libretro-mupen64plus/options.mk:1.7        Tue Aug 14 13:08:57 2018
+++ pkgsrc/emulators/libretro-mupen64plus/options.mk    Thu Aug 16 13:25:27 2018
@@ -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 @@ PKG_OPTIONS_GROUP.graphics=   opengl
 
 .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 @@ PKG_SUGGESTED_OPTIONS+=              opengl
 
 .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

Index: pkgsrc/emulators/libretro-pcsx-rearmed/Makefile
diff -u pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.6 pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.7
--- pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.6 Sat Mar  7 21:14:32 2015
+++ pkgsrc/emulators/libretro-pcsx-rearmed/Makefile     Thu Aug 16 13:25:28 2018
@@ -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 @@ PCSX_REARMED_PLATFORM=       unix
 
 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

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.559 pkgsrc/mk/defaults/options.description:1.560
--- pkgsrc/mk/defaults/options.description:1.559        Sat Aug 11 13:57:27 2018
+++ pkgsrc/mk/defaults/options.description      Thu Aug 16 13:25:27 2018
@@ -149,7 +149,6 @@ dvdcss                      Enable CSS support for DVDs.
 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.