Tue Aug 14 13:08:57 2018 UTC ()
Use "${MACHINE_ARCH} ==" for x86_64 and i386 instead of the :M pattern.


(nia)
diff -r1.1 -r1.2 pkgsrc/emulators/libretro-desmume/Makefile
diff -r1.6 -r1.7 pkgsrc/emulators/libretro-mupen64plus/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/emulators/libretro-desmume/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-desmume/Makefile 2018/08/11 12:57:23 1.1
+++ pkgsrc/emulators/libretro-desmume/Makefile 2018/08/14 13:08:57 1.2
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.1 2018/08/11 12:57:23 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2018/08/14 13:08:57 nia Exp $
2 2
3DISTNAME= libretro-desmume-20180807 3DISTNAME= libretro-desmume-20180807
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/}
6GITHUB_PROJECT= desmume 6GITHUB_PROJECT= desmume
7GITHUB_TAG= f546d2dd15c8c8c44907e4332339c36d9f8319d5 7GITHUB_TAG= f546d2dd15c8c8c44907e4332339c36d9f8319d5
8 8
9MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
10HOMEPAGE= https://docs.libretro.com/library/desmume/ 10HOMEPAGE= https://docs.libretro.com/library/desmume/
11COMMENT= Libretro core based on the Desmume Nintendo DS emulator 11COMMENT= Libretro core based on the Desmume Nintendo DS emulator
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
15BUILD_DIRS= desmume/src/frontend/libretro 15BUILD_DIRS= desmume/src/frontend/libretro
16MAKE_FILE= Makefile.libretro 16MAKE_FILE= Makefile.libretro
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if !empty(MACHINE_ARCH:M*arm*) 22.if !empty(MACHINE_ARCH:M*arm*)
23CXXFLAGS+= -marm 23CXXFLAGS+= -marm
24CXXFLAGS+= -DUSE_POSIX_MEMALIGN -D__RETRO_ARM__ 24CXXFLAGS+= -DUSE_POSIX_MEMALIGN -D__RETRO_ARM__
25CXXFLAGS+= -DARM 25CXXFLAGS+= -DARM
26MAKE_FLAGS+= DESMUME_JIT=0 26MAKE_FLAGS+= DESMUME_JIT=0
27MAKE_FLAGS+= DESMUME_JIT_ARM=1 27MAKE_FLAGS+= DESMUME_JIT_ARM=1
28.elif !empty(MACHINE_ARCH:M*x86_64*) || !empty(MACHINE_ARCH:M*i386*) 28.elif ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
29MAKE_FLAGS+= DESMUME_JIT=1 29MAKE_FLAGS+= DESMUME_JIT=1
30.else 30.else
31MAKE_FLAGS+= DESMUME_JIT=0 31MAKE_FLAGS+= DESMUME_JIT=0
32.endif 32.endif
33 33
34MAKE_FLAGS+= GIT_VERSION="-pkgsrc" 34MAKE_FLAGS+= GIT_VERSION="-pkgsrc"
35INSTALLATION_DIRS+= ${PREFIX}/lib/libretro 35INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
36 36
37do-install: 37do-install:
38 ${INSTALL_LIB} \ 38 ${INSTALL_LIB} \
39 ${WRKSRC}/desmume/src/frontend/libretro/desmume_libretro.so \ 39 ${WRKSRC}/desmume/src/frontend/libretro/desmume_libretro.so \
40 ${DESTDIR}${PREFIX}/lib/libretro/desmume_libretro.so 40 ${DESTDIR}${PREFIX}/lib/libretro/desmume_libretro.so
41 41
cvs diff -r1.6 -r1.7 pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk 2018/08/11 21:03:17 1.6
+++ pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk 2018/08/14 13:08:57 1.7
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: options.mk,v 1.6 2018/08/11 21:03:17 nia Exp $ 1# $NetBSD: options.mk,v 1.7 2018/08/14 13:08:57 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus 3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus
4PKG_OPTIONS_REQUIRED_GROUPS= graphics 4PKG_OPTIONS_REQUIRED_GROUPS= graphics
5PKG_OPTIONS_GROUP.graphics= opengl 5PKG_OPTIONS_GROUP.graphics= opengl
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if !empty(MACHINE_ARCH:M*arm*) 9.if !empty(MACHINE_ARCH:M*arm*)
10PKG_OPTIONS_GROUP.graphics+= rpi 10PKG_OPTIONS_GROUP.graphics+= rpi
11PKG_SUPPORTED_OPTIONS+= dynarec 11PKG_SUPPORTED_OPTIONS+= dynarec
12PKG_SUGGESTED_OPTIONS+= rpi dynarec 12PKG_SUGGESTED_OPTIONS+= rpi dynarec
13MUPEN64_DYNAREC_ARCH= arm 13MUPEN64_DYNAREC_ARCH= arm
14.elif !empty(MACHINE_ARCH:Mi386) 14.elif ${MACHINE_ARCH} == "i386"
15PKG_SUPPORTED_OPTIONS+= dynarec 15PKG_SUPPORTED_OPTIONS+= dynarec
16PKG_SUGGESTED_OPTIONS+= dynarec opengl 16PKG_SUGGESTED_OPTIONS+= dynarec opengl
17MUPEN64_DYNAREC_ARCH= x86 17MUPEN64_DYNAREC_ARCH= x86
18.elif !empty(MACHINE_ARCH:Mx86_64) 18.elif ${MACHINE_ARCH} == "x86_64"
19PKG_SUPPORTED_OPTIONS+= dynarec 19PKG_SUPPORTED_OPTIONS+= dynarec
20PKG_SUGGESTED_OPTIONS+= dynarec opengl 20PKG_SUGGESTED_OPTIONS+= dynarec opengl
21MUPEN64_DYNAREC_ARCH= x86_64 21MUPEN64_DYNAREC_ARCH= x86_64
22.else 22.else
23PKG_SUGGESTED_OPTIONS+= opengl 23PKG_SUGGESTED_OPTIONS+= opengl
24.endif 24.endif
25 25
26.include "../../mk/bsd.options.mk" 26.include "../../mk/bsd.options.mk"
27 27
28.if !empty(PKG_OPTIONS:Mopengl) 28.if !empty(PKG_OPTIONS:Mopengl)
29.include "../../graphics/MesaLib/buildlink3.mk" 29.include "../../graphics/MesaLib/buildlink3.mk"
30.endif 30.endif
31 31