CVS commit: pkgsrc/emulators/xm7

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Sep 30 10:05:19 UTC 2019

Modified Files:
        pkgsrc/emulators/xm7: Makefile distinfo
Added Files:
        pkgsrc/emulators/xm7/patches: patch-psg.cpp

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/emulators/xm7/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/xm7/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/xm7/patches/patch-psg.cpp

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

Modified files:

Index: pkgsrc/emulators/xm7/Makefile
diff -u pkgsrc/emulators/xm7/Makefile:1.31 pkgsrc/emulators/xm7/Makefile:1.32
--- pkgsrc/emulators/xm7/Makefile:1.31  Tue Oct 23 10:24:04 2012
+++ pkgsrc/emulators/xm7/Makefile       Mon Sep 30 10:05:19 2019
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/09/30 10:05:19 maya Exp $
 #
 
 DISTNAME=              xm71020s
 PKGNAME=               xm7-1020s
 CATEGORIES=            emulators
 MASTER_SITES=          http://yohkai.no-ip.info/fm7/
+MASTER_SITES+=         http://www.mirrorservice.org/pub/minix/distfiles/backup/
 EXTRACT_SUFX=          .zip
 
 MAINTAINER=            tech-pkg-ja%jp.NetBSD.org@localhost

Index: pkgsrc/emulators/xm7/distinfo
diff -u pkgsrc/emulators/xm7/distinfo:1.16 pkgsrc/emulators/xm7/distinfo:1.17
--- pkgsrc/emulators/xm7/distinfo:1.16  Thu Mar 23 14:38:16 2017
+++ pkgsrc/emulators/xm7/distinfo       Mon Sep 30 10:05:19 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/03/23 14:38:16 wiz Exp $
+$NetBSD: distinfo,v 1.17 2019/09/30 10:05:19 maya Exp $
 
 SHA1 (xm71020s.zip) = 9a222f210de4d1107a966f4b739e3cb498504ece
 RMD160 (xm71020s.zip) = c65938b33081a7563dc13b0265b6f849ba4929e9
@@ -9,3 +9,4 @@ SHA1 (patch-ab) = 4e6cc9113e25eca32a1f67
 SHA1 (patch-ac) = 5a2dd19976d117651860d7ee5b83afe762050001
 SHA1 (patch-ad) = 9b0a2187b1af22a743ffdf2caceaed5fac40df89
 SHA1 (patch-ae) = ee3a92da9301db4aca1b9eff7b4850f17334345c
+SHA1 (patch-psg.cpp) = a90c40c28d072b4493a0bec232a3d33d83ccb4f1

Added files:

Index: pkgsrc/emulators/xm7/patches/patch-psg.cpp
diff -u /dev/null pkgsrc/emulators/xm7/patches/patch-psg.cpp:1.1
--- /dev/null   Mon Sep 30 10:05:19 2019
+++ pkgsrc/emulators/xm7/patches/patch-psg.cpp  Mon Sep 30 10:05:19 2019
@@ -0,0 +1,15 @@
+$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])
+       {