Thu Feb 5 17:33:12 2015 UTC ()
Use MesaLib only on non-arm.
Support dynarec option on i386 and x86_64 too.


(wiz)
diff -r1.4 -r1.5 pkgsrc/emulators/libretro-mupen64plus/Makefile
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-mupen64plus/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/emulators/libretro-mupen64plus/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-mupen64plus/Attic/Makefile 2015/02/05 17:22:26 1.4
+++ pkgsrc/emulators/libretro-mupen64plus/Attic/Makefile 2015/02/05 17:33:12 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2015/02/05 17:22:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2015/02/05 17:33:12 wiz Exp $
2 2
3DISTNAME= mupen64plus-libretro-20150204 3DISTNAME= mupen64plus-libretro-20150204
4PKGNAME= libretro-mupen64plus-20150204 4PKGNAME= libretro-mupen64plus-20150204
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/ 6MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/libretro/mupen64plus-libretro 10HOMEPAGE= https://github.com/libretro/mupen64plus-libretro
11COMMENT= Libretro core based on the Mupen64 Plus emulator 11COMMENT= Libretro core based on the Mupen64 Plus emulator
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14WRKSRC= ${WRKDIR}/mupen64plus-libretro-master 14WRKSRC= ${WRKDIR}/mupen64plus-libretro-master
@@ -19,25 +19,27 @@ SUBST_CLASSES+= vc @@ -19,25 +19,27 @@ SUBST_CLASSES+= vc
19SUBST_STAGE.vc= pre-configure 19SUBST_STAGE.vc= pre-configure
20SUBST_MESSAGE.vc= Fixing path to VideoCore libraries. 20SUBST_MESSAGE.vc= Fixing path to VideoCore libraries.
21SUBST_FILES.vc= Makefile 21SUBST_FILES.vc= Makefile
22SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g' 22SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g'
23 23
24INSTALLATION_DIRS+= ${PREFIX}/lib/libretro 24INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "NetBSD" 28.if ${OPSYS} == "NetBSD"
29CFLAGS+= -DHAVE_POSIX_MEMALIGN=1 29CFLAGS+= -DHAVE_POSIX_MEMALIGN=1
30.endif 30.endif
31 31
32.if !empty(MACHINE_ARCH:M*arm*) 32.if !empty(MACHINE_ARCH:M*arm*) || !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
33# only ARM-specific options for now, and options framework 33# only ARM-, i386-, and x86_64-specific options for now, and options framework
34#insists on having at least one option, so only pull it in for ARM 34#insists on having at least one option, so only pull it in for them
35.include "options.mk" 35.include "options.mk"
36.endif 36.endif
37 37
38do-install: 38do-install:
39 ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \ 39 ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \
40 ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so 40 ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so
41 41
 42.if empty(MACHINE_ARCH:M*arm*)
42.include "../../graphics/MesaLib/buildlink3.mk" 43.include "../../graphics/MesaLib/buildlink3.mk"
 44.endif
43.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk 2015/02/05 16:57:36 1.2
+++ pkgsrc/emulators/libretro-mupen64plus/Attic/options.mk 2015/02/05 17:33:12 1.3
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: options.mk,v 1.2 2015/02/05 16:57:36 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2015/02/05 17:33:12 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus 3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus
4 4
5.include "../../mk/bsd.fast.prefs.mk" 5.include "../../mk/bsd.fast.prefs.mk"
6 6
7.if !empty(MACHINE_ARCH:M*arm*) 7.if !empty(MACHINE_ARCH:M*arm*)
8PKG_SUPPORTED_OPTIONS+= rpi dynarec 8PKG_SUPPORTED_OPTIONS+= rpi dynarec
9PKG_SUGGESTED_OPTIONS+= rpi dynarec 9PKG_SUGGESTED_OPTIONS+= rpi dynarec
10MUPEN64_DYNAREC_ARCH= arm 10MUPEN64_DYNAREC_ARCH= arm
 11.elif !empty(MACHINE_ARCH:Mi386)
 12PKG_SUPPORTED_OPTIONS+= dynarec
 13PKG_SUGGESTED_OPTIONS+= dynarec
 14MUPEN64_DYNAREC_ARCH= x86
 15.elif !empty(MACHINE_ARCH:Mx86_64)
 16PKG_SUPPORTED_OPTIONS+= dynarec
 17PKG_SUGGESTED_OPTIONS+= dynarec
 18MUPEN64_DYNAREC_ARCH= x86_64
11.endif 19.endif
12 20
13.include "../../mk/bsd.options.mk" 21.include "../../mk/bsd.options.mk"
14 22
15.if !empty(PKG_OPTIONS:Mrpi) 23.if !empty(PKG_OPTIONS:Mrpi)
16MAKE_ENV+= platform=rpi 24MAKE_ENV+= platform=rpi
17.include "../../misc/raspberrypi-userland/buildlink3.mk" 25.include "../../misc/raspberrypi-userland/buildlink3.mk"
18.endif 26.endif
19 27
20.if !empty(PKG_OPTIONS:Mdynarec) 28.if !empty(PKG_OPTIONS:Mdynarec)
21MAKE_ENV+= WITH_DYNAREC=${MUPEN64_DYNAREC_ARCH} 29MAKE_ENV+= WITH_DYNAREC=${MUPEN64_DYNAREC_ARCH}
22.endif 30.endif