libretro-pcsx-rearmed: Import libretro-pcsx-rearmed-0.22 from pkgsrc as wip/libretro-pcsx-rearmed

[Nia Alarie <nia.alarie%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Tue Jun 6 00:51:14 2017 +0100
Changeset:	9d07a82e64e35167386099d91448825e84ddd145

Added Files:
	libretro-pcsx-rearmed/DESCR
	libretro-pcsx-rearmed/Makefile
	libretro-pcsx-rearmed/PLIST
	libretro-pcsx-rearmed/distinfo
	libretro-pcsx-rearmed/options.mk
	libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c
	libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c
	libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c

Log Message:
libretro-pcsx-rearmed: Import libretro-pcsx-rearmed-0.22 from pkgsrc
as wip/libretro-pcsx-rearmed

Libretro is a simple but powerful development interface that allows for the
easy creation of emulators, games and multimedia applications that can plug
straight into any libretro-compatible frontend. This development interface is
open to others so that they can run these pluggable emulator and game cores
also in their own programs or devices.

PCSX ReARMed is a Sony PlayStation1 video game system emulator.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d07a82e64e35167386099d91448825e84ddd145

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libretro-pcsx-rearmed/DESCR                        |  7 ++++
 libretro-pcsx-rearmed/Makefile                     | 44 ++++++++++++++++++++++
 libretro-pcsx-rearmed/PLIST                        |  2 +
 libretro-pcsx-rearmed/distinfo                     |  9 +++++
 libretro-pcsx-rearmed/options.mk                   | 18 +++++++++
 .../patches/patch-libpcsxcore_cdriso.c             | 22 +++++++++++
 .../patch-libpcsxcore_new__dynarec_new__dynarec.c  | 15 ++++++++
 .../patches/patch-plugins_cdrcimg_cdrcimg.c        | 22 +++++++++++
 8 files changed, 139 insertions(+)

diffs:
diff --git a/libretro-pcsx-rearmed/DESCR b/libretro-pcsx-rearmed/DESCR
new file mode 100644
index 0000000000..85116938c6
--- /dev/null
+++ b/libretro-pcsx-rearmed/DESCR
@@ -0,0 +1,7 @@
+Libretro is a simple but powerful development interface that allows for the
+easy creation of emulators, games and multimedia applications that can plug
+straight into any libretro-compatible frontend. This development interface is
+open to others so that they can run these pluggable emulator and game cores
+also in their own programs or devices.
+
+PCSX ReARMed is a Sony PlayStation1 video game system emulator.
diff --git a/libretro-pcsx-rearmed/Makefile b/libretro-pcsx-rearmed/Makefile
new file mode 100644
index 0000000000..190f012478
--- /dev/null
+++ b/libretro-pcsx-rearmed/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.6 2015/03/07 21:14:32 tnn Exp $
+
+DISTNAME=	libretro-pcsx-rearmed-0.22
+CATEGORIES=	emulators
+MASTER_SITES=	${MASTER_SITE_GITHUB:=notaz/}
+GITHUB_PROJECT=	pcsx_rearmed
+GITHUB_TAG=	r22
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://notaz.gp2x.de/pcsx_rearmed.php
+COMMENT=	Libretro core based on the PCSX ReARMed emulator
+LICENSE=	gnu-gpl-v2
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake
+MAKE_FILE=	Makefile.libretro
+
+INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
+
+BUILDLINK_TRANSFORM+=	rm:-ldl
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_ARCH:M*arm*hf)
+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
+.include "options.mk"
+.endif
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/pcsx_rearmed_libretro.so \
+	    ${DESTDIR}${PREFIX}/lib/libretro/pcsx_rearmed_libretro.so
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libretro-pcsx-rearmed/PLIST b/libretro-pcsx-rearmed/PLIST
new file mode 100644
index 0000000000..5792c73e75
--- /dev/null
+++ b/libretro-pcsx-rearmed/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/02/04 23:04:17 jmcneill Exp $
+lib/libretro/pcsx_rearmed_libretro.so
diff --git a/libretro-pcsx-rearmed/distinfo b/libretro-pcsx-rearmed/distinfo
new file mode 100644
index 0000000000..2f4b43a512
--- /dev/null
+++ b/libretro-pcsx-rearmed/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.5 2017/02/17 17:02:01 joerg Exp $
+
+SHA1 (libretro-pcsx-rearmed-0.22.tar.gz) = bdd2e38aa53c13e557ddc0ccac2bdcea909f9f9d
+RMD160 (libretro-pcsx-rearmed-0.22.tar.gz) = ea7328498d32d12ee3e4b3504ed1685effecb9a1
+SHA512 (libretro-pcsx-rearmed-0.22.tar.gz) = e193e3a8061595a0ffe13d2755b446560687f776e72ffd51db9ba982267353ecf5a4ce82a060806da2d3389e4c6adaa99cddd3b58d29d30f196d9a828bb72d29
+Size (libretro-pcsx-rearmed-0.22.tar.gz) = 1153355 bytes
+SHA1 (patch-libpcsxcore_cdriso.c) = 31339ba2ea5a812c1172630bfb7ea64bd20ec9ec
+SHA1 (patch-libpcsxcore_new__dynarec_new__dynarec.c) = 82ec36e064ae4f725379ca889eefe1f60038adc0
+SHA1 (patch-plugins_cdrcimg_cdrcimg.c) = ecaca7dc5dd4ee8ecc19085947795be2112ed8d0
diff --git a/libretro-pcsx-rearmed/options.mk b/libretro-pcsx-rearmed/options.mk
new file mode 100644
index 0000000000..263f82100c
--- /dev/null
+++ b/libretro-pcsx-rearmed/options.mk
@@ -0,0 +1,18 @@
+# $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
diff --git a/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c b/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c
new file mode 100644
index 0000000000..d458a88e3e
--- /dev/null
+++ b/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-libpcsxcore_cdriso.c,v 1.1 2017/02/17 17:02:01 joerg Exp $
+
+--- libpcsxcore/cdriso.c.orig	2017-02-17 14:01:16.071768567 +0000
++++ libpcsxcore/cdriso.c
+@@ -1082,7 +1082,7 @@ static int cdread_sub_mixed(FILE *f, uns
+ 	return ret;
+ }
+ 
+-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int my_uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+ 	int ret = 0;
+@@ -1161,7 +1161,7 @@ static int cdread_compressed(FILE *f, un
+ 	if (is_compressed) {
+ 		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+ 		cdbuffer_size = cdbuffer_size_expect;
+-		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
++		ret = my_uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+ 		if (ret != 0) {
+ 			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+ 					ret, block, sector);
diff --git a/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c b/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c
new file mode 100644
index 0000000000..ed5be202a3
--- /dev/null
+++ b/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;
diff --git a/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c b/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c
new file mode 100644
index 0000000000..69067492b9
--- /dev/null
+++ b/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-plugins_cdrcimg_cdrcimg.c,v 1.1 2017/02/17 17:02:01 joerg Exp $
+
+--- plugins/cdrcimg/cdrcimg.c.orig	2017-02-17 14:01:41.343339778 +0000
++++ plugins/cdrcimg/cdrcimg.c
+@@ -98,7 +98,7 @@ static long CDRgetTD(unsigned char track
+ 	return 0;
+ }
+ 
+-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int my_uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+ 	int ret = 0;
+@@ -199,7 +199,7 @@ static long CDRreadTrack(unsigned char *
+ 		ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+ 		break;
+ 	case CDRC_ZLIB2:
+-		ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
++		ret = my_uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+ 		break;
+ 	case CDRC_BZ:
+ 		ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,