Mon Sep 30 10:05:19 2019 UTC ()
xm7: avoid narrowing conversion.
point to mirror which happens to host this distfile (it's marked RESTRICTED,
so we can't host a copy, and probably this mirror shouldn't either, but
it unbreaks the package now.)
(maya)
diff -r1.31 -r1.32 pkgsrc/emulators/xm7/Makefile
diff -r1.16 -r1.17 pkgsrc/emulators/xm7/distinfo
diff -r0 -r1.1 pkgsrc/emulators/xm7/patches/patch-psg.cpp
--- pkgsrc/emulators/xm7/Makefile 2012/10/23 10:24:04 1.31
+++ pkgsrc/emulators/xm7/Makefile 2019/09/30 10:05:19 1.32
| @@ -1,20 +1,21 @@ | | | @@ -1,20 +1,21 @@ |
| 1 | # $NetBSD: Makefile,v 1.31 2012/10/23 10:24:04 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.32 2019/09/30 10:05:19 maya Exp $ |
| 2 | # | | 2 | # |
| 3 | | | 3 | |
| 4 | DISTNAME= xm71020s | | 4 | DISTNAME= xm71020s |
| 5 | PKGNAME= xm7-1020s | | 5 | PKGNAME= xm7-1020s |
| 6 | CATEGORIES= emulators | | 6 | CATEGORIES= emulators |
| 7 | MASTER_SITES= http://yohkai.no-ip.info/fm7/ | | 7 | MASTER_SITES= http://yohkai.no-ip.info/fm7/ |
| | | 8 | MASTER_SITES+= http://www.mirrorservice.org/pub/minix/distfiles/backup/ |
| 8 | EXTRACT_SUFX= .zip | | 9 | EXTRACT_SUFX= .zip |
| 9 | | | 10 | |
| 10 | MAINTAINER= tech-pkg-ja@jp.NetBSD.org | | 11 | MAINTAINER= tech-pkg-ja@jp.NetBSD.org |
| 11 | HOMEPAGE= http://yohkai.no-ip.info/fm7/XM7.htm | | 12 | HOMEPAGE= http://yohkai.no-ip.info/fm7/XM7.htm |
| 12 | COMMENT= X11-based FM-7 emulator | | 13 | COMMENT= X11-based FM-7 emulator |
| 13 | LICENSE= xm7-license | | 14 | LICENSE= xm7-license |
| 14 | | | 15 | |
| 15 | RESTRICTED= source archive is not redistributable | | 16 | RESTRICTED= source archive is not redistributable |
| 16 | NO_BIN_ON_CDROM= ${RESTRICTED} | | 17 | NO_BIN_ON_CDROM= ${RESTRICTED} |
| 17 | NO_SRC_ON_CDROM= ${RESTRICTED} | | 18 | NO_SRC_ON_CDROM= ${RESTRICTED} |
| 18 | NO_BIN_ON_FTP= ${RESTRICTED} | | 19 | NO_BIN_ON_FTP= ${RESTRICTED} |
| 19 | NO_SRC_ON_FTP= ${RESTRICTED} | | 20 | NO_SRC_ON_FTP= ${RESTRICTED} |
| 20 | | | 21 | |
--- pkgsrc/emulators/xm7/distinfo 2017/03/23 14:38:16 1.16
+++ pkgsrc/emulators/xm7/distinfo 2019/09/30 10:05:19 1.17
| @@ -1,11 +1,12 @@ | | | @@ -1,11 +1,12 @@ |
| 1 | $NetBSD: distinfo,v 1.16 2017/03/23 14:38:16 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.17 2019/09/30 10:05:19 maya Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (xm71020s.zip) = 9a222f210de4d1107a966f4b739e3cb498504ece | | 3 | SHA1 (xm71020s.zip) = 9a222f210de4d1107a966f4b739e3cb498504ece |
| 4 | RMD160 (xm71020s.zip) = c65938b33081a7563dc13b0265b6f849ba4929e9 | | 4 | RMD160 (xm71020s.zip) = c65938b33081a7563dc13b0265b6f849ba4929e9 |
| 5 | SHA512 (xm71020s.zip) = 8798e268d5b14f540cdb930c50e813044968ce3ddb160f96628e382ee4981e71c71db2d1c52e0a3f50452d7dac3a0ee43956f0ba6bcbc01d16cb8d1fc5c25690 | | 5 | SHA512 (xm71020s.zip) = 8798e268d5b14f540cdb930c50e813044968ce3ddb160f96628e382ee4981e71c71db2d1c52e0a3f50452d7dac3a0ee43956f0ba6bcbc01d16cb8d1fc5c25690 |
| 6 | Size (xm71020s.zip) = 289896 bytes | | 6 | Size (xm71020s.zip) = 289896 bytes |
| 7 | SHA1 (patch-aa) = b49f4dac3dde6395fcf1d4ab0c987d577e5e9ce4 | | 7 | SHA1 (patch-aa) = b49f4dac3dde6395fcf1d4ab0c987d577e5e9ce4 |
| 8 | SHA1 (patch-ab) = 4e6cc9113e25eca32a1f672b82b3c07ed141a5b7 | | 8 | SHA1 (patch-ab) = 4e6cc9113e25eca32a1f672b82b3c07ed141a5b7 |
| 9 | SHA1 (patch-ac) = 5a2dd19976d117651860d7ee5b83afe762050001 | | 9 | SHA1 (patch-ac) = 5a2dd19976d117651860d7ee5b83afe762050001 |
| 10 | SHA1 (patch-ad) = 9b0a2187b1af22a743ffdf2caceaed5fac40df89 | | 10 | SHA1 (patch-ad) = 9b0a2187b1af22a743ffdf2caceaed5fac40df89 |
| 11 | SHA1 (patch-ae) = ee3a92da9301db4aca1b9eff7b4850f17334345c | | 11 | SHA1 (patch-ae) = ee3a92da9301db4aca1b9eff7b4850f17334345c |
| | | 12 | SHA1 (patch-psg.cpp) = a90c40c28d072b4493a0bec232a3d33d83ccb4f1 |
$NetBSD: patch-psg.cpp,v 1.1 2019/09/30 10:05:19 maya Exp $
Avoid narrowing conversion, -1 isn't a valid unsigned number.
--- psg.cpp.orig 2001-03-22 16:02:00.000000000 +0000
+++ psg.cpp
@@ -125,7 +125,7 @@ void PSG::MakeEnvelopTable()
2,2, 2,0, 2,1, 2,3, 1,1, 1,3, 1,2, 1,0,
};
static uint8 table2[4] = { 0, 0, 31, 31 };
- static uint8 table3[4] = { 0, 1, -1, 0 };
+ static uint8 table3[4] = { 0, 1, 0xFF, 0 };
if (!enveloptable[0][0])
{