Sat Jun 13 10:45:19 2020 UTC ()
libretro-ppsspp: Don't assume ARM is rpi, bringing in line with other cores.


(nia)
diff -r1.1 -r1.2 pkgsrc/emulators/libretro-ppsspp/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/emulators/libretro-ppsspp/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-ppsspp/options.mk 2018/08/14 12:55:41 1.1
+++ pkgsrc/emulators/libretro-ppsspp/options.mk 2020/06/13 10:45:19 1.2
@@ -1,41 +1,33 @@ @@ -1,41 +1,33 @@
1# $NetBSD: options.mk,v 1.1 2018/08/14 12:55:41 nia Exp $ 1# $NetBSD: options.mk,v 1.2 2020/06/13 10:45:19 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-ppsspp 3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-ppsspp
4PKG_OPTIONS_REQUIRED_GROUPS= graphics 4PKG_OPTIONS_REQUIRED_GROUPS= gl
5PKG_OPTIONS_GROUP.graphics= opengl 5PKG_OPTIONS_GROUP.gl= opengl
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if !empty(MACHINE_ARCH:Mearm*) 
10PKG_OPTIONS_GROUP.graphics+= rpi 
11.endif 
12 
13.if !empty(MACHINE_ARCH:Mearm*) && ${OPSYS} == "NetBSD" 9.if !empty(MACHINE_ARCH:Mearm*) && ${OPSYS} == "NetBSD"
14PKG_SUGGESTED_OPTIONS+= rpi 10PKG_OPTIONS_GROUP.gl+= rpi
15.else 
16PKG_SUGGESTED_OPTIONS+= opengl 
17.endif 11.endif
18 12
19.if ${MACHINE_ARCH} == "earmv7hf" || ${MACHINE_ARCH} == "earmv7hfeb" 13PKG_SUGGESTED_OPTIONS+= opengl
20PKG_SUPPORTED_OPTIONS+= simd 14
21PKG_SUGGESTED_OPTIONS+= simd 15.if ${MACHINE_ARCH} == "earmv7hf"
 16PKG_SUPPORTED_OPTIONS+= simd
 17PKG_SUGGESTED_OPTIONS+= simd
22.endif 18.endif
23 19
24.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
25 21
26.if !empty(PKG_OPTIONS:Msimd) 22.if !empty(PKG_OPTIONS:Msimd)
27CFLAGS+= -mfpu=neon -D__NEON_OPT 23CFLAGS+= -mfpu=neon -D__NEON_OPT
28MAKE_FLAGS+= HAVE_NEON=1 24MAKE_FLAGS+= HAVE_NEON=1
29.endif 25.endif
30 26
31.if !empty(PKG_OPTIONS:Mrpi) 27.if !empty(PKG_OPTIONS:Mrpi)
32BUILD_MAKE_FLAGS+= platform=rpi 28MAKE_FLAGS+= GLES=1
33SUBST_CLASSES+= vc 29MAKE_FLAGS+= GL_LIB="-lbrcmGLESv2"
34SUBST_STAGE.vc= pre-configure 
35SUBST_MESSAGE.vc= Fixing path to VideoCore libraries. 
36SUBST_FILES.vc= libretro/Makefile 
37SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g' 
38.include "../../misc/raspberrypi-userland/buildlink3.mk" 30.include "../../misc/raspberrypi-userland/buildlink3.mk"
39.elif !empty(PKG_OPTIONS:Mopengl) 31.elif !empty(PKG_OPTIONS:Mopengl)
40.include "../../graphics/MesaLib/buildlink3.mk" 32.include "../../graphics/MesaLib/buildlink3.mk"
41.endif 33.endif