Update the gcc43 patch to include fixes for the test suite.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5 x86_64

3 files changed, 81 insertions, 67 deletions

diff --git a/media-libs/adplug/ChangeLog b/media-libs/adplug/ChangeLog
index 49a39f70b49e..620d1941d7a6 100644
--- a/media-libs/adplug/ChangeLog
+++ b/media-libs/adplug/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/adplug
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.24 2008/09/08 20:38:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.25 2008/09/08 20:47:08 spock Exp $
+
+  08 Sep 2008; Michał Januszewski <spock@gentoo.org>
+  files/adplug-2.1-gcc43.patch:
+  Update the gcc43 patch to include fixes for the test suite.
 
   08 Sep 2008; Markus Meier <maekke@gentoo.org> adplug-2.1.ebuild:
   amd64/x86 stable, bug #237008
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index 764b8082abc2..dc995a4297d4 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX adplug-2.1-gcc43.patch 7557 RMD160 5a1651141e0490debe29cdf9d6de8854a0652571 SHA1 d8351d7e647374d5a77e67c547bee649a185270b SHA256 d6e52e919c05d58aac72c2b2d4bd8c2473268ecfdb9a9bd88f606490e57e7537
+AUX adplug-2.1-gcc43.patch 7977 RMD160 215136b8cdcc528f5deb0ef2d36c5b049c3d8cba SHA1 f2bc0e2eea60591ca9e9885d62b1e2706729acea SHA256 bbb68662ddf493ea8685acc66c0bbb5c8b6c619ecf9bd6226458fc015788e836
 DIST adplug-2.0.1.tar.bz2 698708 RMD160 8bcdc2347568d24d1a78e7fdfc352a8878777005 SHA1 f9da0c8732d6d106ec6e6d19d47eed7ea093ce05 SHA256 9751e22c0960935fda26ef62644f77918ba0bc7a630a131f577e32df825e872c
 DIST adplug-2.1.tar.bz2 730686 RMD160 8788c174507fe39d3415f36e1ac60df6b84c889f SHA1 49dd798467f194ece1863f18019912f8089cb9df SHA256 61666725189bc39898c74e81e5da6d88d83f5019979babf5d91798d82bfc93de
 EBUILD adplug-2.0.1.ebuild 665 RMD160 008b40a5be1d4826644facc1fa83620ae77aa48e SHA1 2a5c48ad585658fc709814de98657e128973fbaa SHA256 2093ce878fed64ade0fe87b1a20629880849675cccc23bf7b44c0de300b40633
 EBUILD adplug-2.1.ebuild 874 RMD160 2754e3475055051360f7c3c2b8fbb7b2cf2527bf SHA1 f6fba5b1a36ae4ef32c1f196ce37f0cbfa5a606c SHA256 394723c8551b3f7f6de00613b8d2d27d322ef951f61f3d5991a6cc28006f721c
-MISC ChangeLog 3295 RMD160 2570f61b7488ec065109ce8e3143d401d2f0aa18 SHA1 824038d04e05c8d07d2fe3af47a321aa2b469882 SHA256 5ac389e6af4516b5e6ef7199b795da3a59d6d25dfa35c1a8cf92d5c24449195b
+MISC ChangeLog 3443 RMD160 13b31d4573ba395eaa8c0aa151fe474eb6c04546 SHA1 bad26896b9ef3c3fcbfed80511c57a9c258da89b SHA256 ea38eb4d36551d98b20070eceaa9e62a991e366c5966600fa1a852e1a4aec374
 MISC metadata.xml 219 RMD160 adf9425714d416c5d3a617022a7f329b3028d7e1 SHA1 58176182db443c822f2bad772e2649eab15c336c SHA256 daa9d68ed73b1674688e969febaa6645c856c9334ea454e7bee99d56fcdda106
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjFjYMACgkQkKaRLQcq0GJeNQCeIOLN3CWFpRN5SnYsp1EL+FJ5
-pboAn2MhnFO3UvGRUqTwsB+BPYkUvEZr
-=NeLg
+iEYEARECAAYFAkjFjzQACgkQchej4aZK9/e3yQCfe4TV0BFgAW+FVk3V8sd4ShYS
+Pz8An2ALOAGd+vAIuIcCdYUXq+1Lgi/O
+=7sQ2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/adplug/files/adplug-2.1-gcc43.patch b/media-libs/adplug/files/adplug-2.1-gcc43.patch
index 00e63d705a33..2f6ad56cb6e2 100644
--- a/media-libs/adplug/files/adplug-2.1-gcc43.patch
+++ b/media-libs/adplug/files/adplug-2.1-gcc43.patch
@@ -1,6 +1,6 @@
-diff -ur adplug-2.1.orig/src/a2m.cpp adplug-2.1/src/a2m.cpp
---- adplug-2.1.orig/src/a2m.cpp	2007-04-08 21:33:31.000000000 +0300
-+++ adplug-2.1/src/a2m.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/a2m.cpp adplug-2.1/src/a2m.cpp
+--- adplug-2.1-orig/src/a2m.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/a2m.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -31,6 +31,8 @@
  
  #include "a2m.h"
@@ -10,10 +10,9 @@ diff -ur adplug-2.1.orig/src/a2m.cpp adplug-2.1/src/a2m.cpp
  const unsigned int Ca2mLoader::MAXFREQ = 2000,
  Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY,
  Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY,
-Vain hakemistossa adplug-2.1/src: a2m.cpp.orig
-diff -ur adplug-2.1.orig/src/adl.cpp adplug-2.1/src/adl.cpp
---- adplug-2.1.orig/src/adl.cpp	2006-08-16 03:20:45.000000000 +0300
-+++ adplug-2.1/src/adl.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/adl.cpp adplug-2.1/src/adl.cpp
+--- adplug-2.1-orig/src/adl.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/adl.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -49,6 +49,7 @@
   */
  
@@ -22,9 +21,9 @@ diff -ur adplug-2.1.orig/src/adl.cpp adplug-2.1/src/adl.cpp
  #include <stdarg.h>
  #include <assert.h>
  
-diff -ur adplug-2.1.orig/src/bmf.cpp adplug-2.1/src/bmf.cpp
---- adplug-2.1.orig/src/bmf.cpp	2006-05-17 20:53:10.000000000 +0300
-+++ adplug-2.1/src/bmf.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/bmf.cpp adplug-2.1/src/bmf.cpp
+--- adplug-2.1-orig/src/bmf.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/bmf.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -43,6 +43,8 @@
  #include "bmf.h"
  #include "debug.h"
@@ -34,9 +33,9 @@ diff -ur adplug-2.1.orig/src/bmf.cpp adplug-2.1/src/bmf.cpp
  const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] =
  {
    0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3,
-diff -ur adplug-2.1.orig/src/cff.cpp adplug-2.1/src/cff.cpp
---- adplug-2.1.orig/src/cff.cpp	2006-07-04 16:31:12.000000000 +0300
-+++ adplug-2.1/src/cff.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/cff.cpp adplug-2.1/src/cff.cpp
+--- adplug-2.1-orig/src/cff.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/cff.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -28,6 +28,8 @@
  
  #include "cff.h"
@@ -46,9 +45,9 @@ diff -ur adplug-2.1.orig/src/cff.cpp adplug-2.1/src/cff.cpp
  /* -------- Public Methods -------------------------------- */
  
  CPlayer *CcffLoader::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/dro.cpp adplug-2.1/src/dro.cpp
---- adplug-2.1.orig/src/dro.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/dro.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/dro.cpp adplug-2.1/src/dro.cpp
+--- adplug-2.1-orig/src/dro.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/dro.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -27,6 +27,8 @@
  
  #include "dro.h"
@@ -58,9 +57,9 @@ diff -ur adplug-2.1.orig/src/dro.cpp adplug-2.1/src/dro.cpp
  /*** public methods *************************************/
  
  CPlayer *CdroPlayer::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/dtm.cpp adplug-2.1/src/dtm.cpp
---- adplug-2.1.orig/src/dtm.cpp	2006-07-06 10:07:23.000000000 +0300
-+++ adplug-2.1/src/dtm.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/dtm.cpp adplug-2.1/src/dtm.cpp
+--- adplug-2.1-orig/src/dtm.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/dtm.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -24,6 +24,8 @@
  
  #include "dtm.h"
@@ -70,9 +69,9 @@ diff -ur adplug-2.1.orig/src/dtm.cpp adplug-2.1/src/dtm.cpp
  /* -------- Public Methods -------------------------------- */
  
  CPlayer *CdtmLoader::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/fmc.cpp adplug-2.1/src/fmc.cpp
---- adplug-2.1.orig/src/fmc.cpp	2007-04-08 15:00:04.000000000 +0300
-+++ adplug-2.1/src/fmc.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/fmc.cpp adplug-2.1/src/fmc.cpp
+--- adplug-2.1-orig/src/fmc.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/fmc.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -21,6 +21,8 @@
  
  #include "fmc.h"
@@ -82,9 +81,9 @@ diff -ur adplug-2.1.orig/src/fmc.cpp adplug-2.1/src/fmc.cpp
  /* -------- Public Methods -------------------------------- */
  
  CPlayer *CfmcLoader::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/mad.cpp adplug-2.1/src/mad.cpp
---- adplug-2.1.orig/src/mad.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/mad.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/mad.cpp adplug-2.1/src/mad.cpp
+--- adplug-2.1-orig/src/mad.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/mad.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -21,6 +21,8 @@
  
  #include "mad.h"
@@ -94,9 +93,9 @@ diff -ur adplug-2.1.orig/src/mad.cpp adplug-2.1/src/mad.cpp
  /* -------- Public Methods -------------------------------- */
  
  CPlayer *CmadLoader::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/mkj.cpp adplug-2.1/src/mkj.cpp
---- adplug-2.1.orig/src/mkj.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/mkj.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/mkj.cpp adplug-2.1/src/mkj.cpp
+--- adplug-2.1-orig/src/mkj.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/mkj.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -24,6 +24,8 @@
  #include "mkj.h"
  #include "debug.h"
@@ -106,9 +105,9 @@ diff -ur adplug-2.1.orig/src/mkj.cpp adplug-2.1/src/mkj.cpp
  CPlayer *CmkjPlayer::factory(Copl *newopl)
  {
    return new CmkjPlayer(newopl);
-diff -ur adplug-2.1.orig/src/msc.cpp adplug-2.1/src/msc.cpp
---- adplug-2.1.orig/src/msc.cpp	2006-05-17 21:13:07.000000000 +0300
-+++ adplug-2.1/src/msc.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/msc.cpp adplug-2.1/src/msc.cpp
+--- adplug-2.1-orig/src/msc.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/msc.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -24,6 +24,8 @@
  #include "msc.h"
  #include "debug.h"
@@ -118,9 +117,9 @@ diff -ur adplug-2.1.orig/src/msc.cpp adplug-2.1/src/msc.cpp
  const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = {
    'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ',
    'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' };
-diff -ur adplug-2.1.orig/src/mtk.cpp adplug-2.1/src/mtk.cpp
---- adplug-2.1.orig/src/mtk.cpp	2006-07-04 16:39:10.000000000 +0300
-+++ adplug-2.1/src/mtk.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/mtk.cpp adplug-2.1/src/mtk.cpp
+--- adplug-2.1-orig/src/mtk.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/mtk.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -21,6 +21,8 @@
  
  #include "mtk.h"
@@ -130,9 +129,9 @@ diff -ur adplug-2.1.orig/src/mtk.cpp adplug-2.1/src/mtk.cpp
  /*** public methods **************************************/
  
  CPlayer *CmtkLoader::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/protrack.cpp adplug-2.1/src/protrack.cpp
---- adplug-2.1.orig/src/protrack.cpp	2007-04-08 20:14:27.000000000 +0300
-+++ adplug-2.1/src/protrack.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/protrack.cpp adplug-2.1/src/protrack.cpp
+--- adplug-2.1-orig/src/protrack.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/protrack.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -28,6 +28,8 @@
  #include "protrack.h"
  #include "debug.h"
@@ -142,9 +141,9 @@ diff -ur adplug-2.1.orig/src/protrack.cpp adplug-2.1/src/protrack.cpp
  #define SPECIALARPLEN	256	// Standard length of special arpeggio lists
  #define JUMPMARKER	0x80	// Orderlist jump marker
  
-diff -ur adplug-2.1.orig/src/rad.cpp adplug-2.1/src/rad.cpp
---- adplug-2.1.orig/src/rad.cpp	2007-04-08 14:57:32.000000000 +0300
-+++ adplug-2.1/src/rad.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/rad.cpp adplug-2.1/src/rad.cpp
+--- adplug-2.1-orig/src/rad.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/rad.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -24,6 +24,8 @@
  
  #include "rad.h"
@@ -154,9 +153,9 @@ diff -ur adplug-2.1.orig/src/rad.cpp adplug-2.1/src/rad.cpp
  CPlayer *CradLoader::factory(Copl *newopl)
  {
    return new CradLoader(newopl);
-diff -ur adplug-2.1.orig/src/rat.cpp adplug-2.1/src/rat.cpp
---- adplug-2.1.orig/src/rat.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/rat.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/rat.cpp adplug-2.1/src/rat.cpp
+--- adplug-2.1-orig/src/rat.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/rat.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -32,6 +32,8 @@
  #include "rat.h"
  #include "debug.h"
@@ -166,9 +165,9 @@ diff -ur adplug-2.1.orig/src/rat.cpp adplug-2.1/src/rat.cpp
  const unsigned char CxadratPlayer::rat_adlib_bases[18] =
  {
    0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12,
-diff -ur adplug-2.1.orig/src/raw.cpp adplug-2.1/src/raw.cpp
---- adplug-2.1.orig/src/raw.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/raw.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/raw.cpp adplug-2.1/src/raw.cpp
+--- adplug-2.1-orig/src/raw.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/raw.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -21,6 +21,8 @@
  
  #include "raw.h"
@@ -178,9 +177,9 @@ diff -ur adplug-2.1.orig/src/raw.cpp adplug-2.1/src/raw.cpp
  /*** public methods *************************************/
  
  CPlayer *CrawPlayer::factory(Copl *newopl)
-diff -ur adplug-2.1.orig/src/rix.cpp adplug-2.1/src/rix.cpp
---- adplug-2.1.orig/src/rix.cpp	2007-04-01 18:32:49.000000000 +0300
-+++ adplug-2.1/src/rix.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/rix.cpp adplug-2.1/src/rix.cpp
+--- adplug-2.1-orig/src/rix.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/rix.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -23,6 +23,9 @@
  #include "rix.h"
  #include "debug.h"
@@ -191,9 +190,9 @@ diff -ur adplug-2.1.orig/src/rix.cpp adplug-2.1/src/rix.cpp
  const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
  const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
  const unsigned char CrixPlayer::ad_C0_offs[] = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
-diff -ur adplug-2.1.orig/src/rol.h adplug-2.1/src/rol.h
---- adplug-2.1.orig/src/rol.h	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/rol.h	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/rol.h adplug-2.1/src/rol.h
+--- adplug-2.1-orig/src/rol.h	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/rol.h	2008-09-08 22:33:53.000000000 +0200
 @@ -25,6 +25,7 @@
  
  #include <vector>
@@ -202,9 +201,9 @@ diff -ur adplug-2.1.orig/src/rol.h adplug-2.1/src/rol.h
  
  #include "player.h"
  
-diff -ur adplug-2.1.orig/src/s3m.cpp adplug-2.1/src/s3m.cpp
---- adplug-2.1.orig/src/s3m.cpp	2006-07-02 08:27:00.000000000 +0300
-+++ adplug-2.1/src/s3m.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/s3m.cpp adplug-2.1/src/s3m.cpp
+--- adplug-2.1-orig/src/s3m.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/s3m.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -24,6 +24,8 @@
  
  #include "s3m.h"
@@ -214,9 +213,9 @@ diff -ur adplug-2.1.orig/src/s3m.cpp adplug-2.1/src/s3m.cpp
  const char Cs3mPlayer::chnresolv[] =	// S3M -> adlib channel conversion
    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
  
-diff -ur adplug-2.1.orig/src/sa2.cpp adplug-2.1/src/sa2.cpp
---- adplug-2.1.orig/src/sa2.cpp	2007-04-08 14:58:45.000000000 +0300
-+++ adplug-2.1/src/sa2.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/sa2.cpp adplug-2.1/src/sa2.cpp
+--- adplug-2.1-orig/src/sa2.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/sa2.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -25,6 +25,8 @@
  #include "sa2.h"
  #include "debug.h"
@@ -226,9 +225,9 @@ diff -ur adplug-2.1.orig/src/sa2.cpp adplug-2.1/src/sa2.cpp
  CPlayer *Csa2Loader::factory(Copl *newopl)
  {
    return new Csa2Loader(newopl);
-diff -ur adplug-2.1.orig/src/sng.cpp adplug-2.1/src/sng.cpp
---- adplug-2.1.orig/src/sng.cpp	2006-05-13 08:36:42.000000000 +0300
-+++ adplug-2.1/src/sng.cpp	2008-04-16 19:23:40.000000000 +0300
+diff -Naurp adplug-2.1-orig/src/sng.cpp adplug-2.1/src/sng.cpp
+--- adplug-2.1-orig/src/sng.cpp	2008-09-08 22:33:32.000000000 +0200
++++ adplug-2.1/src/sng.cpp	2008-09-08 22:33:53.000000000 +0200
 @@ -21,6 +21,8 @@
  
  #include "sng.h"
@@ -238,3 +237,14 @@ diff -ur adplug-2.1.orig/src/sng.cpp adplug-2.1/src/sng.cpp
  CPlayer *CsngPlayer::factory(Copl *newopl)
  {
    return new CsngPlayer(newopl);
+diff -Naurp adplug-2.1-orig/test/playertest.cpp adplug-2.1/test/playertest.cpp
+--- adplug-2.1-orig/test/playertest.cpp	2008-09-08 22:33:33.000000000 +0200
++++ adplug-2.1/test/playertest.cpp	2008-09-08 22:34:45.000000000 +0200
+@@ -19,6 +19,7 @@
+  * playertest.cpp - Test AdPlug replayers, by Simon Peter <dn.tlp@gmx.net>
+  */
+ 
++#include <cstring>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string>