libretro-nestopia: update to 1.49.

Changes:

----------------------------------------------------------------
1.49
----------------------------------------------------------------
libretro:

 Additions:
  - Add support for multiline cheats and raw cheats (iLag)
  - Add adapter autoselect using NstDatabase.xml (hunterk)
  - Famicom Mic support
  - Cheevos ram access support (meepingsnesroms)
  - Add .wav sample loading

 Fixes:
  - Fixed heap corruption bug with crosshair (Arto Vainiolehto)
  - Fixed black screen when non-existent custom palette is selected
  - Fixed crosshair and overscan with blargg filter

Core:

 Additions:
  - Added support for overclocking (meepingsnesroms)

 Fixes:
  - Fixed NSF and FDS in Dendy mode (Eugene.S)
  - Fixed coding mistake in PPU (zeromus)
  - Modified submappers for VRC2/VRC4 games (GeneralFailer)
  - Fixed compilation error in SetRamPowerState (Arto Vainiolehto)
  - Fix for McAcc games (joepogo)

----------------------------------------------------------------
1.48
----------------------------------------------------------------
libretro:

 Additions:
  - Added ability to load custom palettes
  - Added many palettes (Monroe88)
  - Added monochrome blargg NTSC filter (dalter)
  - Added Turbo A/B buttons

Core:

 Additions:
  - RAM Power-on State setting
  - Support for mapper 23.10

 Fixes:
  - VRC2 Mirroring bug (koitsu, lidnariq)
  - Dendy timing and audio fixes (FHorse, Eugene.S)
  - Removed unused code in APU
  - Properly initialize RAM - fixes F-1 Race (koitsu)
  - Silenced many build warnings (orbea)

----------------------------------------------------------------
1.47
----------------------------------------------------------------
libretro:

 Additions:
  - Game Genie Sound Distortion option
  - Region selection core option

 Changes:
  - Default to "consumer" palette
  - Vertical and Horizontal overscan options separated

 Fixes:
  - Fixed FDS save path

Core:

 Additions:
  - Added support for MC-ACC (perilsensitive)
  - Added NstDatabase.xml entries (clobber)
  - Added support for NES 2.0 submappers
  - Added support for mapper 4.1
  - Added support for mapper 4.3
  - Added support for mapper 23.15
  - Added support for mapper 25.15
  - Added support for mapper 32.1
  - Added support for mapper 68.1
  - Added support for mapper 71.1
  - Added support for mapper 78.1
  - Added support for mapper 78.3

 Fixes:
  - Reverted fix for Mapper 79
  - Fixed Burai Fighter status area (perilsensitive)
  - FME-7 IRQ Fix (lidnariq)
  - Disabled buggy audio sync

"fine with me" snj

5 files changed, 30 insertions, 40 deletions

diff --git a/emulators/libretro-nestopia/DESCR b/emulators/libretro-nestopia/DESCR
index 886413ab949..fc78afae854 100644
--- a/emulators/libretro-nestopia/DESCR
+++ b/emulators/libretro-nestopia/DESCR
@@ -4,5 +4,11 @@ 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.
 
-This core is based on the Nestopia UE (Undead Edition) Nintendo Entertainment
-System emulator.
+Nestopia is a portable and cycle-accurate NES (Nintendo Entertainment System)
+and Famicom emulator written in C++. Nestopia UE (Undead Edition) is a fork
+of the original source code, with enhancements from members of the emulation
+community. This includes support for new platforms, and bug fixes in the
+emulator core.
+
+It can emulate a Famicom Disk System, which requires the DISKSYS.ROM BIOS file
+to be placed in the RetroArch system directory or content directory.
diff --git a/emulators/libretro-nestopia/Makefile b/emulators/libretro-nestopia/Makefile
index fed8d7d0bfc..2c679232c9f 100644
--- a/emulators/libretro-nestopia/Makefile
+++ b/emulators/libretro-nestopia/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/07/18 00:06:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/08/11 20:26:12 nia Exp $
 
-DISTNAME=	2c586b592597751f015ac30e05d2a180a1ffd723
-PKGNAME=	libretro-nestopia-20150319
+DISTNAME=	libretro-nestopia-1.49
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/nestopia/archive/}
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	nestopia
 
 MAINTAINER=	snj@NetBSD.org
-HOMEPAGE=	https://github.com/libretro/nestopia
+HOMEPAGE=	https://docs.libretro.com/library/nestopia_ue/
 COMMENT=	Libretro core based on the Nestopia UE emulator
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/nestopia-${DISTNAME}
+EXTRACT_USING=	bsdtar
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 BUILD_DIRS=	libretro
 USE_LANGUAGES=	c c++03
 USE_TOOLS+=	gmake
@@ -19,6 +19,7 @@ USE_TOOLS+=	gmake
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 INSTALLATION_DIRS+=	share/libretro-nestopia
 
+MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 CFLAGS+=	-DPREFIX=\"${PREFIX}\"
 
 do-install:
diff --git a/emulators/libretro-nestopia/distinfo b/emulators/libretro-nestopia/distinfo
index e0e3b059352..1f172c46253 100644
--- a/emulators/libretro-nestopia/distinfo
+++ b/emulators/libretro-nestopia/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:30:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/08/11 20:26:12 nia Exp $
 
-SHA1 (2c586b592597751f015ac30e05d2a180a1ffd723.zip) = e1d97ba63472ab41afd7439cd1b839ce8704bf9b
-RMD160 (2c586b592597751f015ac30e05d2a180a1ffd723.zip) = 1b61cf3f745d84f748222fe4de9b1985f4a7d9f9
-SHA512 (2c586b592597751f015ac30e05d2a180a1ffd723.zip) = 20c946cad156db159a700dff3fe7063b409e7feacfb3bdddae47e50d99a102d3a7d42e0160f1b9bc5f6d3283919764d042feeb48fb8f7a75f63d7a667d811c21
-Size (2c586b592597751f015ac30e05d2a180a1ffd723.zip) = 2161787 bytes
-SHA1 (patch-libretro_Makefile) = b9ab72caf2b42158e8adbf705cede20cd9ceb42b
-SHA1 (patch-libretro_libretro.cpp) = c8887390e4d0ac4b82ddfa87154303778f1567d6
+SHA1 (libretro-nestopia-1.49.tar.gz) = c8c1f65ee06f31ef93a9e23452c0c6c2dfdf44e4
+RMD160 (libretro-nestopia-1.49.tar.gz) = cf363f152dfcd62e567d3064c8ffade1855b3940
+SHA512 (libretro-nestopia-1.49.tar.gz) = 1d96756692d5a08bddb75f2bafb2a2e72458386668637848b0da20401d71525641aaf54c0ad4c960bf7e893d9455043f8ed7c4fd5cc6595d6a566979a549a5e0
+Size (libretro-nestopia-1.49.tar.gz) = 1259705 bytes
+SHA1 (patch-libretro_libretro.cpp) = 1e578150a058d37ce9c988d6eb259ec0b0e9974b
diff --git a/emulators/libretro-nestopia/patches/patch-libretro_Makefile b/emulators/libretro-nestopia/patches/patch-libretro_Makefile
deleted file mode 100644
index 09c8fc75ea4..00000000000
--- a/emulators/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	2015-04-09 20:00:41.000000000 -0700
-+++ libretro/Makefile	2015-04-09 20:00:50.000000000 -0700
-@@ -196,9 +196,6 @@ ifeq ($(DEBUG), 1)
- else ifeq ($(platform), ps3)
- 	CFLAGS += -O2
- 	CXXFLAGS += -O2
--else
--	CFLAGS += -O3
--	CXXFLAGS += -O3
- endif
- 
- CORE_DIR = ..
diff --git a/emulators/libretro-nestopia/patches/patch-libretro_libretro.cpp b/emulators/libretro-nestopia/patches/patch-libretro_libretro.cpp
index 0708fac9d99..a7bec9c5ea6 100644
--- a/emulators/libretro-nestopia/patches/patch-libretro_libretro.cpp
+++ b/emulators/libretro-nestopia/patches/patch-libretro_libretro.cpp
@@ -1,17 +1,17 @@
-$NetBSD: patch-libretro_libretro.cpp,v 1.1 2015/04/10 03:16:18 snj Exp $
+$NetBSD: patch-libretro_libretro.cpp,v 1.2 2018/08/11 20:26:12 nia Exp $
 
 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.
 
---- libretro/libretro.cpp.orig	2015-03-19 19:54:18.000000000 -0700
-+++ libretro/libretro.cpp	2015-03-29 23:31:42.000000000 -0700
-@@ -624,7 +624,7 @@ bool retro_load_game(const struct retro_
-    if (!environ_cb(RETRO_ENVIRONMENT_GET_OVERSCAN, &use_overscan))
-       use_overscan = true;
- 
--   snprintf(db_path, sizeof(db_path), "%s%cNstDatabase.xml", dir, slash);
+--- libretro/libretro.cpp.orig	2018-06-24 23:26:58.000000000 +0000
++++ libretro/libretro.cpp
+@@ -1073,7 +1073,7 @@ bool retro_load_game(const struct retro_
+    }
+    delete custompalette;
+    
+-   sprintf(db_path, "%s%cNstDatabase.xml", dir, slash);
 +   snprintf(db_path, sizeof(db_path), "%s/share/libretro-nestopia/NstDatabase.xml", PREFIX);
  
     if (log_cb)