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

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5 x86_64)

2 files changed, 76 insertions, 62 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/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>