libretro-nestopia: Switch to stable upstream release

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

Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Mon Aug 28 13:20:34 2017 +0100
Changeset:	ec42abd2805e570bfba6c64c4a4ea7775c9932cc

Modified Files:
	libretro-nestopia/Makefile
	libretro-nestopia/PLIST
	libretro-nestopia/distinfo
	libretro-nestopia/patches/patch-libretro_libretro.cpp
Removed Files:
	libretro-nestopia/patches/patch-libretro_Makefile

Log Message:
libretro-nestopia: Switch to stable upstream release

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

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

diffstat:
 libretro-nestopia/Makefile                          | 17 +++++++++--------
 libretro-nestopia/PLIST                             |  4 ++--
 libretro-nestopia/distinfo                          | 13 ++++++-------
 libretro-nestopia/patches/patch-libretro_Makefile   | 16 ----------------
 .../patches/patch-libretro_libretro.cpp             | 21 ++++++++++-----------
 5 files changed, 27 insertions(+), 44 deletions(-)

diffs:
diff --git a/libretro-nestopia/Makefile b/libretro-nestopia/Makefile
index 3350897e0f..9a9ce52d02 100644
--- a/libretro-nestopia/Makefile
+++ b/libretro-nestopia/Makefile
@@ -1,23 +1,24 @@
 # $NetBSD: Makefile,v 1.1 2015/04/10 03:16:17 snj Exp $
 
-DISTNAME=	752e6954d8ed2d779e42a9e0774457cfa4343aba
-PKGNAME=	libretro-nestopia-20170401
+DISTNAME=	libretro-nestopia-1.47
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/nestopia/archive/}
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rdanbrook/}
 
 MAINTAINER=	snj%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/libretro/nestopia
+HOMEPAGE=	http://0ldsk00l.ca/nestopia
 COMMENT=	Libretro core based on the Nestopia UE emulator
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/nestopia-${DISTNAME}
+GITHUB_PROJECT=	nestopia
+
 BUILD_DIRS=	libretro
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
-INSTALLATION_DIRS+=	share/libretro-nestopia
+INSTALLATION_DIRS+=	share/libretro/nestopia
 
 CFLAGS+=	-DPREFIX=\"${PREFIX}\"
 
@@ -25,6 +26,6 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/libretro/nestopia_libretro.so \
 	    ${DESTDIR}${PREFIX}/lib/libretro/nestopia_libretro.so
 	${INSTALL_DATA} ${WRKSRC}/NstDatabase.xml \
-	    ${DESTDIR}${PREFIX}/share/libretro-nestopia
+	    ${DESTDIR}${PREFIX}/share/libretro/nestopia
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-nestopia/PLIST b/libretro-nestopia/PLIST
index 894e7a73f4..b16ded9d93 100644
--- a/libretro-nestopia/PLIST
+++ b/libretro-nestopia/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/10 03:16:18 snj Exp $
+@comment $NetBSD$
 lib/libretro/nestopia_libretro.so
-share/libretro-nestopia/NstDatabase.xml
+share/libretro/nestopia/NstDatabase.xml
diff --git a/libretro-nestopia/distinfo b/libretro-nestopia/distinfo
index bd86fa31b8..8a500a532d 100644
--- a/libretro-nestopia/distinfo
+++ b/libretro-nestopia/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:30:59 agc Exp $
+$NetBSD$
 
-SHA1 (752e6954d8ed2d779e42a9e0774457cfa4343aba.zip) = e007d63fff3d9caf7de84acee87a5a201be45222
-RMD160 (752e6954d8ed2d779e42a9e0774457cfa4343aba.zip) = 040170d6b048bce9b98c14a03f47f9b56140e87f
-SHA512 (752e6954d8ed2d779e42a9e0774457cfa4343aba.zip) = 5d2ef1ebe32ccf2bfd5b7253c0452e4d9f1b1134dc7c113ff6040477c3056d0b621fc2c96bcdb3cfeef2eee09892ea3bc8d75646c1b9a1b1ba2e559a5e313d9e
-Size (752e6954d8ed2d779e42a9e0774457cfa4343aba.zip) = 2155067 bytes
-SHA1 (patch-libretro_Makefile) = 8cfbec7af79a57ad10796d07a58bd621ca0089b3
-SHA1 (patch-libretro_libretro.cpp) = 4255cd85bf414422eb7c0bd7a628943c0f07e27d
+SHA1 (libretro-nestopia-1.47.tar.gz) = 1ef4aacf21ae96843276a346d05e7e389c3feb58
+RMD160 (libretro-nestopia-1.47.tar.gz) = 3b4d174f7b5f99ee672414931ed92f28b79debd5
+SHA512 (libretro-nestopia-1.47.tar.gz) = 6a0a099eaa65c36e4ed49f09e41870440c4f2f3d95db63d76fd10c418b9c1ba50173e56d47c23bc5734298b9e47ac81bbea5e56eecbf615192b36c481c1daca7
+Size (libretro-nestopia-1.47.tar.gz) = 1271675 bytes
+SHA1 (patch-libretro_libretro.cpp) = 0ff3fffed20aa36affbeac44dd84429627744eb3
diff --git a/libretro-nestopia/patches/patch-libretro_Makefile b/libretro-nestopia/patches/patch-libretro_Makefile
deleted file mode 100644
index 5f95e9d4e6..0000000000
--- a/libretro-nestopia/patches/patch-libretro_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-libretro_Makefile,v 1.1 2015/04/10 03:16:18 snj Exp $
-
-Don't pass -O3 unconditionally.
-
---- libretro/Makefile.orig	2017-04-01 02:50:44.000000000 +0000
-+++ libretro/Makefile
-@@ -258,9 +258,6 @@ ifeq ($(DEBUG), 1)
- else ifeq ($(platform), ps3)
- 	CFLAGS += -O2
- 	CXXFLAGS += -O2
--else
--	CFLAGS += -O3
--	CXXFLAGS += -O3
- endif
- 
- CORE_DIR = ..
diff --git a/libretro-nestopia/patches/patch-libretro_libretro.cpp b/libretro-nestopia/patches/patch-libretro_libretro.cpp
index 4f69dac09d..b7d1b0e892 100644
--- a/libretro-nestopia/patches/patch-libretro_libretro.cpp
+++ b/libretro-nestopia/patches/patch-libretro_libretro.cpp
@@ -1,18 +1,17 @@
-$NetBSD: patch-libretro_libretro.cpp,v 1.1 2015/04/10 03:16:18 snj Exp $
+$NetBSD$
 
-retroarch normally expects to find the NstDatabase.xml file in
-~/.config/retroarch/bios, but there's no real reason to be editing it.
-Rather than have users manually copy the file into place, we install it
-system-wide and look for it there instead.
+This file is installed globally for pkgsrc users rather than making
+them install it manually in their home dir. There's no reason to be
+editing it.
 
---- libretro/libretro.cpp.orig	2017-04-01 02:50:44.000000000 +0000
+--- libretro/libretro.cpp.orig	2016-01-09 23:34:38.000000000 +0000
 +++ libretro/libretro.cpp
-@@ -957,7 +957,7 @@ bool retro_load_game(const struct retro_
-    }
-    delete custompalette;
-    
+@@ -720,7 +720,7 @@ bool retro_load_game(const struct retro_
+    if (!environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) || !dir)
+       return false;
+ 
 -   snprintf(db_path, sizeof(db_path), "%s%cNstDatabase.xml", dir, slash);
-+   snprintf(db_path, sizeof(db_path), "%s/share/libretro-nestopia/NstDatabase.xml", PREFIX);
++   snprintf(db_path, sizeof(db_path), "%s/share/libretro/nestopia/NstDatabase.xml", PREFIX);
  
     if (log_cb)
        log_cb(RETRO_LOG_INFO, "NstDatabase.xml path: %s\n", db_path);