diff options
3 files changed, 34 insertions, 17 deletions
diff --git a/emulators/libretro-pcsx-rearmed/Makefile b/emulators/libretro-pcsx-rearmed/Makefile index 709643ce6dd..015debbddc3 100644 --- a/emulators/libretro-pcsx-rearmed/Makefile +++ b/emulators/libretro-pcsx-rearmed/Makefile @@ -1,22 +1,20 @@ -# $NetBSD: Makefile,v 1.3 2015/02/05 17:17:11 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2015/02/10 17:51:37 jmcneill Exp $ -DISTNAME= pcsx-rearmed-libretro-20150204 -PKGNAME= libretro-pcsx-rearmed-20150204 +DISTNAME= r22 +DIST_SUBDIR= pcsx_rearmed +PKGNAME= libretro-pcsx-rearmed-0.22 CATEGORIES= emulators -MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/ -EXTRACT_SUFX= .zip +MASTER_SITES= https://github.com/notaz/pcsx_rearmed/archive/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/libretro/pcsx_rearmed +HOMEPAGE= http://notaz.gp2x.de/pcsx_rearmed.php COMMENT= Libretro core based on the PCSX ReARMed emulator LICENSE= gnu-gpl-v2 -WRKSRC= ${WRKDIR}/pcsx_rearmed-master -HAS_CONFIGURE= yes +WRKSRC= ${WRKDIR}/pcsx_rearmed-${DISTNAME} USE_LANGUAGES= c c++ USE_TOOLS+= gmake - -CONFIGURE_ARGS+=--platform=libretro +MAKE_FILE= Makefile.libretro INSTALLATION_DIRS+= ${PREFIX}/lib/libretro @@ -25,10 +23,13 @@ BUILDLINK_TRANSFORM+= rm:-ldl .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_ARCH:M*arm*hf) -CFLAGS+= -mfloat-abi=hard -ASFLAGS+= -mfloat-abi=hard +PCSX_REARMED_PLATFORM= ${MACHINE_ARCH}-hardfloat +.else +PCSX_REARMED_PLATFORM= unix .endif +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 @@ -36,7 +37,7 @@ ASFLAGS+= -mfloat-abi=hard .endif do-install: - ${INSTALL_LIB} ${WRKSRC}/libretro.so \ + ${INSTALL_LIB} ${WRKSRC}/pcsx_rearmed_libretro.so \ ${DESTDIR}${PREFIX}/lib/libretro/pcsx_rearmed_libretro.so .include "../../devel/zlib/buildlink3.mk" diff --git a/emulators/libretro-pcsx-rearmed/distinfo b/emulators/libretro-pcsx-rearmed/distinfo index 61c9e46729f..b41f4173bde 100644 --- a/emulators/libretro-pcsx-rearmed/distinfo +++ b/emulators/libretro-pcsx-rearmed/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/02/04 23:04:17 jmcneill Exp $ +$NetBSD: distinfo,v 1.2 2015/02/10 17:51:37 jmcneill Exp $ -SHA1 (pcsx-rearmed-libretro-20150204.zip) = ffaa73f8f83ed251a0796c48d4108e152aa2e2cd -RMD160 (pcsx-rearmed-libretro-20150204.zip) = d2ef1fdb82e7bd6ba4f55a4495efd39584d0f8e0 -Size (pcsx-rearmed-libretro-20150204.zip) = 1259484 bytes +SHA1 (pcsx_rearmed/r22.tar.gz) = bdd2e38aa53c13e557ddc0ccac2bdcea909f9f9d +RMD160 (pcsx_rearmed/r22.tar.gz) = ea7328498d32d12ee3e4b3504ed1685effecb9a1 +Size (pcsx_rearmed/r22.tar.gz) = 1153355 bytes +SHA1 (patch-libpcsxcore_new__dynarec_new__dynarec.c) = 82ec36e064ae4f725379ca889eefe1f60038adc0 diff --git a/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c b/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c new file mode 100644 index 00000000000..ed5be202a35 --- /dev/null +++ b/emulators/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libpcsxcore_new__dynarec_new__dynarec.c,v 1.1 2015/02/10 17:51:37 jmcneill Exp $ + +"link_addr" is a symbol in NetBSD libc. + +--- libpcsxcore/new_dynarec/new_dynarec.c.orig 2015-02-05 00:56:05.000000000 +0000 ++++ libpcsxcore/new_dynarec/new_dynarec.c +@@ -131,7 +131,7 @@ struct ll_entry + int ccadj[MAXBLOCK]; + int slen; + u_int instr_addr[MAXBLOCK]; +- u_int link_addr[MAXBLOCK][3]; ++static u_int link_addr[MAXBLOCK][3]; + int linkcount; + u_int stubs[MAXBLOCK*3][8]; + int stubcount; |