libretro-pcsx-rearmed: Update to 20170901

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libretro-pcsx-rearmed: Update to 20170901
From: Nia Alarie <nia.alarie%gmail.com@localhost>
Date: Thu, 14 Sep 2017 10:49:39 +0000
Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Thu Sep 14 11:49:39 2017 +0100
Changeset:	11167bf0b0bd381ed2f568b298138b04d97b6bd4

Modified Files:
	libretro-pcsx-rearmed/DESCR
	libretro-pcsx-rearmed/Makefile
	libretro-pcsx-rearmed/distinfo
Removed Files:
	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: Update to 20170901

MASTER_SITES is changed, since notaz's repo is semi-dead. The
patches can be removed.

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

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

diffstat:
 libretro-pcsx-rearmed/DESCR                        | 17 ++++++++++++-----
 libretro-pcsx-rearmed/Makefile                     | 20 +++++++++++++-------
 libretro-pcsx-rearmed/distinfo                     | 11 ++++-------
 .../patches/patch-libpcsxcore_cdriso.c             | 22 ----------------------
 .../patch-libpcsxcore_new__dynarec_new__dynarec.c  | 15 ---------------
 .../patches/patch-plugins_cdrcimg_cdrcimg.c        | 22 ----------------------
 6 files changed, 29 insertions(+), 78 deletions(-)

diffs:
diff --git a/libretro-pcsx-rearmed/DESCR b/libretro-pcsx-rearmed/DESCR
index 85116938c6..71224bee13 100644
--- a/libretro-pcsx-rearmed/DESCR
+++ b/libretro-pcsx-rearmed/DESCR
@@ -1,7 +1,14 @@
-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.
+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.
+
+PCSX ReARMed is a fork of PCSX Reloaded. It differs from the latter
+in that it has special optimizations for systems that have an ARM
+architecture-based CPU. It also has a dedicated graphics plugin,
+'Exophase NEON GPU'. It is a surprisingly accurate graphics rasterizer
+that also has the ability of rendering internally in high resolution at
+playable framerates on ARM hardware.
diff --git a/libretro-pcsx-rearmed/Makefile b/libretro-pcsx-rearmed/Makefile
index 0cfde9634a..fac3f22fd8 100644
--- a/libretro-pcsx-rearmed/Makefile
+++ b/libretro-pcsx-rearmed/Makefile
@@ -1,13 +1,14 @@
 # $NetBSD: Makefile,v 1.6 2015/03/07 21:14:32 tnn Exp $
 
-DISTNAME=	libretro-pcsx-rearmed-0.22
+DISTNAME=	libretro-pcsx-rearmed-20170901
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GITHUB:=notaz/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+
 GITHUB_PROJECT=	pcsx_rearmed
-GITHUB_TAG=	r22
+GITHUB_TAG=	09d454e73bc251b44848abba4026efcd452df752
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://notaz.gp2x.de/pcsx_rearmed.php
+HOMEPAGE=	https://wiki.libretro.com/index.php?title=PCSX_ReARMed
 COMMENT=	Libretro core based on the PCSX ReARMed emulator
 LICENSE=	gnu-gpl-v2
 
@@ -15,15 +16,19 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 MAKE_FILE=	Makefile.libretro
 
-INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
+MAKE_FLAGS+=	LIBPTHREAD="${BUILDLINK_LIBS.pthread}"
+
+.include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} != "Linux"
 BUILDLINK_TRANSFORM+=	rm:-ldl
+.endif
 
-.include "../../mk/bsd.prefs.mk"
+INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 .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
+# insists on having at least one option, so only pull it in for ARM
 .include "options.mk"
 CFLAGS+=		-marm
 BUILD_MAKE_FLAGS+=	ARCH=arm
@@ -34,4 +39,5 @@ do-install:
 	    ${DESTDIR}${PREFIX}/lib/libretro/pcsx_rearmed_libretro.so
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-pcsx-rearmed/distinfo b/libretro-pcsx-rearmed/distinfo
index 2f4b43a512..5d89ff657f 100644
--- a/libretro-pcsx-rearmed/distinfo
+++ b/libretro-pcsx-rearmed/distinfo
@@ -1,9 +1,6 @@
 $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
+SHA1 (libretro-pcsx-rearmed-20170901-09d454e73bc251b44848abba4026efcd452df752.tar.gz) = 0a5eb683d712aa7bbc68d57d220939a7d3b0691f
+RMD160 (libretro-pcsx-rearmed-20170901-09d454e73bc251b44848abba4026efcd452df752.tar.gz) = a4287b63b88f519a68d579092762540747587665
+SHA512 (libretro-pcsx-rearmed-20170901-09d454e73bc251b44848abba4026efcd452df752.tar.gz) = dafa91ad8d7bca755ea4e8d3d3c50908c4de703d8f76745c68ad83bf9b4970f681c06eebd3fee5051a8c59954ed27a5abc779abe6c6dbe88cdbf00c9c8851e2c
+Size (libretro-pcsx-rearmed-20170901-09d454e73bc251b44848abba4026efcd452df752.tar.gz) = 877749 bytes
diff --git a/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c b/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c
deleted file mode 100644
index d458a88e3e..0000000000
--- a/libretro-pcsx-rearmed/patches/patch-libpcsxcore_cdriso.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index ed5be202a3..0000000000
--- a/libretro-pcsx-rearmed/patches/patch-libpcsxcore_new__dynarec_new__dynarec.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 69067492b9..0000000000
--- a/libretro-pcsx-rearmed/patches/patch-plugins_cdrcimg_cdrcimg.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$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,
Prev by Date: libretro-parallel-n64: Update to 20170907
Next by Date: libretro-pcsx-rearmed: Fix build on BSDs, possibly others
Previous by Thread: libretro-parallel-n64: Update to 20170907
Next by Thread: libretro-pcsx-rearmed: Fix build on BSDs, possibly others
Indexes:
Home | Main Index | Thread Index | Old Index