kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Discussed with wiz.
This commit is contained in:
nia 2018-08-16 13:25:27 +00:00
parent 525b601669
commit e58b44c7d0
5 changed files with 18 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
emulators/libretro-mupen64plus/Makefile
View file

@ -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};g'
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

27
emulators/libretro-mupen64plus/options.mk
View file

@ -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

8
emulators/libretro-pcsx-rearmed/Makefile
View file

@ -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

18
emulators/libretro-pcsx-rearmed/options.mk
View file

@ -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

1
mk/defaults/options.description
View file

@ -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.