CVS commit: pkgsrc/audio/libsidplay2

["Nathanial Sloss" <nat%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nat
Date:           Sat Dec 26 19:54:14 UTC 2020

Modified Files:
        pkgsrc/audio/libsidplay2: distinfo
Added Files:
        pkgsrc/audio/libsidplay2/patches: patch-libsidplay_src_xsid_xsid.cpp
            patch-libsidplay_src_xsid_xsid.h

Log Message:
Change the way the sample table values are stored.


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

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

Modified files:

Index: pkgsrc/audio/libsidplay2/distinfo
diff -u pkgsrc/audio/libsidplay2/distinfo:1.8 pkgsrc/audio/libsidplay2/distinfo:1.9
--- pkgsrc/audio/libsidplay2/distinfo:1.8       Tue Nov  3 01:12:38 2015
+++ pkgsrc/audio/libsidplay2/distinfo   Sat Dec 26 19:54:14 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:12:38 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/12/26 19:54:14 nat Exp $
 
 SHA1 (sidplay-libs-2.1.1.tar.gz) = 8af6350866edc30b0d331e075fa97292f6f645a5
 RMD160 (sidplay-libs-2.1.1.tar.gz) = 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd
@@ -11,4 +11,6 @@ SHA1 (patch-builders_hardsid-builder_src
 SHA1 (patch-builders_resid-builder_src_resid-builder.cpp) = 46d3686eb67256397458df1eac2c017465b616d8
 SHA1 (patch-builders_resid-builder_src_resid.cpp) = db9f0bf3658c38e88eba7ced3f6102587558160d
 SHA1 (patch-libsidplay_src_sidtune_SidTune.cpp) = 20f2a2f36db8c08989ad1239da15a91d82cd2a2f
+SHA1 (patch-libsidplay_src_xsid_xsid.cpp) = 5991e8efd3e648a344fb77468d9917617cff0530
+SHA1 (patch-libsidplay_src_xsid_xsid.h) = 61ca52d027afe5af2d22e044bf346f7a384a362d
 SHA1 (patch-resid_sid.cc) = 88da243fab096f6b532af111c1d23ebc64ece632

Added files:

Index: pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.cpp
diff -u /dev/null pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.cpp:1.1
--- /dev/null   Sat Dec 26 19:54:14 2020
+++ pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.cpp Sat Dec 26 19:54:14 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-libsidplay_src_xsid_xsid.cpp,v 1.1 2020/12/26 19:54:14 nat Exp $
+Requires unsigned type to avoid overflow.
+Express data in hex.
+--- libsidplay/src/xsid/xsid.cpp.orig  2004-06-14 20:08:02.000000000 +0000
++++ libsidplay/src/xsid/xsid.cpp
+@@ -94,10 +94,10 @@ const int8_t XSID::sampleConvertTable[16
+     '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f'
+ };
+ */
+-const int8_t XSID::sampleConvertTable[16] =
++const uint8_t XSID::sampleConvertTable[16] =
+ {
+-    '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
+-    '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
++    0x80, 0x94, 0xa9, 0xbc, 0xce, 0xe1, 0xf2, 0x03,
++    0x1b, 0x2a, 0x3b, 0x49, 0x58, 0x66, 0x73, 0x7f
+ };
+ 
+ const char *XSID::credit =
Index: pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.h
diff -u /dev/null pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.h:1.1
--- /dev/null   Sat Dec 26 19:54:14 2020
+++ pkgsrc/audio/libsidplay2/patches/patch-libsidplay_src_xsid_xsid.h   Sat Dec 26 19:54:14 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libsidplay_src_xsid_xsid.h,v 1.1 2020/12/26 19:54:14 nat Exp $
+Requires unsigned type to avoid overflow.
+--- libsidplay/src/xsid/xsid.h.orig    2004-06-14 20:08:02.000000000 +0000
++++ libsidplay/src/xsid/xsid.h
+@@ -238,7 +238,7 @@ private:
+     uint8_t             sidData0x18;
+     bool                _sidSamples;
+     int8_t              sampleOffset;
+-    static const int8_t sampleConvertTable[16];
++    static const uint8_t sampleConvertTable[16];
+     bool                wasRunning;
+ 
+ private: