forked from NetBSD/pkgsrc
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes since b141: Beta #142 - 18.03.2019 - XM loader: fixed a bug where XMs with stereo samples would display a warning message box for every stereo sample loaded, instead of just one.
- Loading branch information
1 parent
4c3b468
commit 5200595
Showing
4 changed files
with
34 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
$NetBSD: distinfo,v 1.12 2019/03/14 11:40:20 fox Exp $ | ||
$NetBSD: distinfo,v 1.13 2019/03/21 10:16:40 fox Exp $ | ||
|
||
SHA1 (ft2clone-b141-code.zip) = 23598007824313243aef0b1b0d70d5510ad7aac4 | ||
RMD160 (ft2clone-b141-code.zip) = 319aa0d64d714a77eef1443c6bf6d7940fc352dd | ||
SHA512 (ft2clone-b141-code.zip) = a3c0ad35cbc1353c51b12504cd5195b1fa860c81c04a55d4d53d925c2a316ff20f4b3c12cc1e103fe9094aa9f9a6ff865334ae800ff0ce142172617f9b7dc255 | ||
Size (ft2clone-b141-code.zip) = 3465021 bytes | ||
SHA1 (patch-src_ft2__diskop.c) = 51807a606e4dc0b5aac3e35f0e5917904442a883 | ||
SHA1 (patch-src_ft2__unicode.c) = 173ffddcb464834d67f85d759e2dbf01004f5f81 | ||
SHA1 (ft2clone-b142-code.zip) = 9b11a3431324f9f2413b6e087c26f64808b75019 | ||
RMD160 (ft2clone-b142-code.zip) = 9e5f2676c89bafd2fb488ae22aaea3a07b626d32 | ||
SHA512 (ft2clone-b142-code.zip) = 8e24ad9d6d2d1df038cc85833854caa050b81a579d64141e091d16bef6bcc9df031cd856163b8a6efd6b9bf09a9fd08c94cf3ff1b8d629d2d9cd626757a7be34 | ||
Size (ft2clone-b142-code.zip) = 3420707 bytes | ||
SHA1 (patch-src_ft2__diskop.c) = b553cf09d95b84ce56a761ab6745760b6cff4289 | ||
SHA1 (patch-src_ft2__unicode.c) = 7e61ebb563bb5edb592182461173d066493791e7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
$NetBSD: patch-src_ft2__diskop.c,v 1.1 2018/12/01 18:20:09 fox Exp $ | ||
$NetBSD: patch-src_ft2__diskop.c,v 1.2 2019/03/21 10:16:40 fox Exp $ | ||
|
||
Added <sys/types.h> / <sys/stat.h> to prevent "unknown type name" | ||
(dev_t, ino_t and nlink_t) error from the included <fts.h>. | ||
|
||
--- src/ft2_diskop.c.orig 2018-11-23 13:36:02.000000000 +0000 | ||
--- src/ft2_diskop.c.orig 2019-03-18 16:59:48.000000000 +0000 | ||
+++ src/ft2_diskop.c | ||
@@ -12,6 +12,8 @@ | ||
#include <windows.h> | ||
#include <direct.h> | ||
#else | ||
+#include <sys/types.h> | ||
+#include <sys/stat.h> | ||
#include <fts.h> /* for fts_open() and stuff in recursiveDelete() */ | ||
#include <fts.h> // for fts_open() and stuff in recursiveDelete() | ||
#include <unistd.h> | ||
#include <dirent.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,43 @@ | ||
$NetBSD: patch-src_ft2__unicode.c,v 1.1 2018/12/01 18:20:09 fox Exp $ | ||
$NetBSD: patch-src_ft2__unicode.c,v 1.2 2019/03/21 10:16:40 fox Exp $ | ||
|
||
1. Added a type cast to iconv(3) calls to match the prototypes defined | ||
in NetBSD's iconv.h. | ||
|
||
2. Added a NetBSD specific iconv_open() call to prevent failures due | ||
to mismatches iconv_open() parameters present in GNU iconv(3). | ||
|
||
--- src/ft2_unicode.c.orig 2018-07-01 09:13:52.000000000 +0000 | ||
--- src/ft2_unicode.c.orig 2019-03-16 22:34:24.000000000 +0000 | ||
+++ src/ft2_unicode.c | ||
@@ -275,7 +275,11 @@ char *cp437ToUtf8(char *src) | ||
inLen = srcLen; | ||
outPtr = outBuf; | ||
@@ -277,7 +277,11 @@ char *cp437ToUtf8(char *src) | ||
inLen = srcLen; | ||
outPtr = outBuf; | ||
|
||
+#if defined(__NetBSD__) | ||
+ rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen); | ||
+ rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen); | ||
+#else | ||
rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen); | ||
rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen); | ||
+#endif | ||
iconv(cd, NULL, NULL, &outPtr, &outLen); /* flush */ | ||
iconv_close(cd); | ||
iconv(cd, NULL, NULL, &outPtr, &outLen); // flush | ||
iconv_close(cd); | ||
|
||
@@ -307,6 +311,8 @@ char *utf8ToCp437(char *src, bool remove | ||
|
||
@@ -307,6 +311,8 @@ char *utf8ToCp437(char *src, uint8_t rem | ||
*/ | ||
#ifdef __APPLE__ | ||
cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8-MAC"); | ||
cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8-MAC"); | ||
+#elif defined(__NetBSD__) | ||
+ cd = iconv_open("437", "UTF-8"); | ||
+ cd = iconv_open("437", "UTF-8"); | ||
#else | ||
cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8"); | ||
cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8"); | ||
#endif | ||
@@ -323,7 +329,11 @@ char *utf8ToCp437(char *src, uint8_t rem | ||
inLen = srcLen; | ||
outPtr = outBuf; | ||
@@ -323,7 +329,11 @@ char *utf8ToCp437(char *src, bool remove | ||
inLen = srcLen; | ||
outPtr = outBuf; | ||
|
||
+#if defined(__NetBSD__) | ||
+ rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen); | ||
+ rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen); | ||
+#else | ||
rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen); | ||
+#endif | ||
iconv(cd, NULL, NULL, &outPtr, &outLen); /* flush */ | ||
iconv_close(cd); | ||
rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen); | ||
+#endif | ||
iconv(cd, NULL, NULL, &outPtr, &outLen); // flush | ||
iconv_close(cd); | ||
|