diff options
| author | jperkin <jperkin> | 2014-09-27 09:46:24 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-09-27 09:46:24 +0000 |
| commit | 1bc93cccafc775cba9fe627d10a7b901e817e778 (patch) | |
| tree | 4edfebb5c4b37393965c0b4a2d438dc6e9fdc6ce /emulators | |
| parent | b0968722ba194a5bd27fb7a1fd0c22f0a60ad843 (diff) | |
| download | pkgsrc-1bc93cccafc775cba9fe627d10a7b901e817e778.tar.gz | |
Use tr to handle differences between unzip implementations.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/nestopia/Makefile | 8 | ||||
| -rw-r--r-- | emulators/nestopia/distinfo | 4 | ||||
| -rw-r--r-- | emulators/nestopia/patches/patch-source_core_NstMemory.hpp | 20 |
3 files changed, 19 insertions, 13 deletions
diff --git a/emulators/nestopia/Makefile b/emulators/nestopia/Makefile index 2ac74a84d77..04cd08012f8 100644 --- a/emulators/nestopia/Makefile +++ b/emulators/nestopia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2014/05/05 00:47:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.26 2014/09/27 09:54:06 jperkin Exp $ # DISTNAME= Nestopia140src @@ -27,6 +27,12 @@ SUBST_STAGE.oss= pre-build INSTALLATION_DIRS= bin share/doc/nestopia share/examples/nestopia +pre-patch: + for f in ${WRKSRC}/source/core/NstMemory.hpp; do \ + ${TR} -d '\r' < $${f} > $${f}.new; \ + ${MV} $${f}.new $${f}; \ + done + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nst ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README.Linux \ diff --git a/emulators/nestopia/distinfo b/emulators/nestopia/distinfo index 5025bd40423..d2df952fafe 100644 --- a/emulators/nestopia/distinfo +++ b/emulators/nestopia/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2014/09/24 12:32:26 jperkin Exp $ +$NetBSD: distinfo,v 1.5 2014/09/27 09:54:06 jperkin Exp $ SHA1 (Nestopia140src.zip) = ef85771132cc8652456727278df36f7068d238e0 RMD160 (Nestopia140src.zip) = caecb991dfd459093b88b2abb84ac9bbd95ced63 @@ -8,4 +8,4 @@ RMD160 (nst140_lnx_release_h.zip) = f187b2ff44d8a57432cd7b73679a61142b9ff877 Size (nst140_lnx_release_h.zip) = 250216 bytes SHA1 (patch-Makefile) = d3abca01943618fe58d12fac3db2ef2762404aef SHA1 (patch-aa) = f598f572056344660c72212900b6b8997d996655 -SHA1 (patch-source_core_NstMemory.hpp) = f8e8f0adc3cf0c4ac0bd8847efc118d1001b1c8d +SHA1 (patch-source_core_NstMemory.hpp) = 82584af16889d2fd7c00ae601a0364cd0d909f6d diff --git a/emulators/nestopia/patches/patch-source_core_NstMemory.hpp b/emulators/nestopia/patches/patch-source_core_NstMemory.hpp index d095dafc1f3..09d653f78a7 100644 --- a/emulators/nestopia/patches/patch-source_core_NstMemory.hpp +++ b/emulators/nestopia/patches/patch-source_core_NstMemory.hpp @@ -1,13 +1,13 @@ -$NetBSD: patch-source_core_NstMemory.hpp,v 1.2 2014/09/24 12:32:26 jperkin Exp $ +$NetBSD: patch-source_core_NstMemory.hpp,v 1.3 2014/09/27 09:54:06 jperkin Exp $ ---- source/core/NstMemory.hpp.orig 2008-03-26 23:31:44.000000000 +0000 +--- source/core/NstMemory.hpp.orig 2012-12-25 16:47:49.000000000 +0000 +++ source/core/NstMemory.hpp @@ -763,7 +763,7 @@ namespace Nes - for (uint i=0; i < MEM_NUM_PAGES; ++i)
- {
- if (pageData[i*3+0] < NUM_SOURCES)
-- Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
-+ SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
- else
- throw RESULT_ERR_CORRUPT_FILE;
- }
+ for (uint i=0; i < MEM_NUM_PAGES; ++i) + { + if (pageData[i*3+0] < NUM_SOURCES) +- Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 ); ++ SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 ); + else + throw RESULT_ERR_CORRUPT_FILE; + } |