CVS commit: pkgsrc/audio/libsidplay

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Mar 26 21:32:37 UTC 2020

Modified Files:
        pkgsrc/audio/libsidplay: distinfo
Added Files:
        pkgsrc/audio/libsidplay/patches: patch-src_mus__.cpp

Log Message:
audio/libsidplay: fix -Wchar-subscripts


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/libsidplay/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libsidplay/patches/patch-src_mus__.cpp

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

Modified files:

Index: pkgsrc/audio/libsidplay/distinfo
diff -u pkgsrc/audio/libsidplay/distinfo:1.8 pkgsrc/audio/libsidplay/distinfo:1.9
--- pkgsrc/audio/libsidplay/distinfo:1.8        Tue Nov  3 01:12:38 2015
+++ pkgsrc/audio/libsidplay/distinfo    Thu Mar 26 21:32:37 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:12:38 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/03/26 21:32:37 rillig Exp $
 
 SHA1 (libsidplay-1.36.59.tar.bz2) = 8a5c057a44de6f1fd008e8d37a1e5cbe335f72bb
 RMD160 (libsidplay-1.36.59.tar.bz2) = 1a49d6e818bf231d22564884d2f4999885bb3bff
 SHA512 (libsidplay-1.36.59.tar.bz2) = 21aacdd7a44c6bb410dd3383e85a4560fd142504fc37e3f0878aa2b8ba76e8cf310d61ff9741100b166c88dbdb78b574eec0e8b24d7d6b90187633009d5fcec9
 Size (libsidplay-1.36.59.tar.bz2) = 307720 bytes
+SHA1 (patch-src_mus__.cpp) = 31c8174d10ae9757de84d5357c69eba17408aece

Added files:

Index: pkgsrc/audio/libsidplay/patches/patch-src_mus__.cpp
diff -u /dev/null pkgsrc/audio/libsidplay/patches/patch-src_mus__.cpp:1.1
--- /dev/null   Thu Mar 26 21:32:37 2020
+++ pkgsrc/audio/libsidplay/patches/patch-src_mus__.cpp Thu Mar 26 21:32:37 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_mus__.cpp,v 1.1 2020/03/26 21:32:37 rillig Exp $
+
+mus_.cpp: In member function 'virtual bool sidTune::MUS_fileSupport(const void*, udword)':
+mus_.cpp:76:38: error: array subscript has type 'char' [-Werror=char-subscripts]
+                 infoString[line][si++] = c;  // copy to info string
+                                      ^
+
+Using a char here is ok, but GCC cannot prove it. It is used only in the
+range [0, 31].
+
+--- src/mus_.cpp.orig  2004-08-17 11:43:38.000000000 +0000
++++ src/mus_.cpp
+@@ -66,7 +66,7 @@ bool sidTune::MUS_fileSupport(const void
+     for ( int line = 0; line < 5; line++ )
+     {
+         char c;
+-        char si = 0;  // count copied characters
++        unsigned char si = 0;  // count copied characters
+         do
+         {
+             // ASCII CHR$ conversion