1 |
spock 08/09/08 20:47:14 |
2 |
|
3 |
Modified: adplug-2.1-gcc43.patch |
4 |
Log: |
5 |
Update the gcc43 patch to include fixes for the test suite. |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 media-libs/adplug/files/adplug-2.1-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/adplug/files/adplug-2.1-gcc43.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/adplug/files/adplug-2.1-gcc43.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/adplug/files/adplug-2.1-gcc43.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: adplug-2.1-gcc43.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/adplug/files/adplug-2.1-gcc43.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- adplug-2.1-gcc43.patch 16 Apr 2008 16:30:46 -0000 1.1 |
22 |
+++ adplug-2.1-gcc43.patch 8 Sep 2008 20:47:14 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-diff -ur adplug-2.1.orig/src/a2m.cpp adplug-2.1/src/a2m.cpp |
25 |
---- adplug-2.1.orig/src/a2m.cpp 2007-04-08 21:33:31.000000000 +0300 |
26 |
-+++ adplug-2.1/src/a2m.cpp 2008-04-16 19:23:40.000000000 +0300 |
27 |
+diff -Naurp adplug-2.1-orig/src/a2m.cpp adplug-2.1/src/a2m.cpp |
28 |
+--- adplug-2.1-orig/src/a2m.cpp 2008-09-08 22:33:32.000000000 +0200 |
29 |
++++ adplug-2.1/src/a2m.cpp 2008-09-08 22:33:53.000000000 +0200 |
30 |
@@ -31,6 +31,8 @@ |
31 |
|
32 |
#include "a2m.h" |
33 |
@@ -10,10 +10,9 @@ |
34 |
const unsigned int Ca2mLoader::MAXFREQ = 2000, |
35 |
Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY, |
36 |
Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY, |
37 |
-Vain hakemistossa adplug-2.1/src: a2m.cpp.orig |
38 |
-diff -ur adplug-2.1.orig/src/adl.cpp adplug-2.1/src/adl.cpp |
39 |
---- adplug-2.1.orig/src/adl.cpp 2006-08-16 03:20:45.000000000 +0300 |
40 |
-+++ adplug-2.1/src/adl.cpp 2008-04-16 19:23:40.000000000 +0300 |
41 |
+diff -Naurp adplug-2.1-orig/src/adl.cpp adplug-2.1/src/adl.cpp |
42 |
+--- adplug-2.1-orig/src/adl.cpp 2008-09-08 22:33:32.000000000 +0200 |
43 |
++++ adplug-2.1/src/adl.cpp 2008-09-08 22:33:53.000000000 +0200 |
44 |
@@ -49,6 +49,7 @@ |
45 |
*/ |
46 |
|
47 |
@@ -22,9 +21,9 @@ |
48 |
#include <stdarg.h> |
49 |
#include <assert.h> |
50 |
|
51 |
-diff -ur adplug-2.1.orig/src/bmf.cpp adplug-2.1/src/bmf.cpp |
52 |
---- adplug-2.1.orig/src/bmf.cpp 2006-05-17 20:53:10.000000000 +0300 |
53 |
-+++ adplug-2.1/src/bmf.cpp 2008-04-16 19:23:40.000000000 +0300 |
54 |
+diff -Naurp adplug-2.1-orig/src/bmf.cpp adplug-2.1/src/bmf.cpp |
55 |
+--- adplug-2.1-orig/src/bmf.cpp 2008-09-08 22:33:32.000000000 +0200 |
56 |
++++ adplug-2.1/src/bmf.cpp 2008-09-08 22:33:53.000000000 +0200 |
57 |
@@ -43,6 +43,8 @@ |
58 |
#include "bmf.h" |
59 |
#include "debug.h" |
60 |
@@ -34,9 +33,9 @@ |
61 |
const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] = |
62 |
{ |
63 |
0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3, |
64 |
-diff -ur adplug-2.1.orig/src/cff.cpp adplug-2.1/src/cff.cpp |
65 |
---- adplug-2.1.orig/src/cff.cpp 2006-07-04 16:31:12.000000000 +0300 |
66 |
-+++ adplug-2.1/src/cff.cpp 2008-04-16 19:23:40.000000000 +0300 |
67 |
+diff -Naurp adplug-2.1-orig/src/cff.cpp adplug-2.1/src/cff.cpp |
68 |
+--- adplug-2.1-orig/src/cff.cpp 2008-09-08 22:33:32.000000000 +0200 |
69 |
++++ adplug-2.1/src/cff.cpp 2008-09-08 22:33:53.000000000 +0200 |
70 |
@@ -28,6 +28,8 @@ |
71 |
|
72 |
#include "cff.h" |
73 |
@@ -46,9 +45,9 @@ |
74 |
/* -------- Public Methods -------------------------------- */ |
75 |
|
76 |
CPlayer *CcffLoader::factory(Copl *newopl) |
77 |
-diff -ur adplug-2.1.orig/src/dro.cpp adplug-2.1/src/dro.cpp |
78 |
---- adplug-2.1.orig/src/dro.cpp 2006-05-13 08:36:42.000000000 +0300 |
79 |
-+++ adplug-2.1/src/dro.cpp 2008-04-16 19:23:40.000000000 +0300 |
80 |
+diff -Naurp adplug-2.1-orig/src/dro.cpp adplug-2.1/src/dro.cpp |
81 |
+--- adplug-2.1-orig/src/dro.cpp 2008-09-08 22:33:32.000000000 +0200 |
82 |
++++ adplug-2.1/src/dro.cpp 2008-09-08 22:33:53.000000000 +0200 |
83 |
@@ -27,6 +27,8 @@ |
84 |
|
85 |
#include "dro.h" |
86 |
@@ -58,9 +57,9 @@ |
87 |
/*** public methods *************************************/ |
88 |
|
89 |
CPlayer *CdroPlayer::factory(Copl *newopl) |
90 |
-diff -ur adplug-2.1.orig/src/dtm.cpp adplug-2.1/src/dtm.cpp |
91 |
---- adplug-2.1.orig/src/dtm.cpp 2006-07-06 10:07:23.000000000 +0300 |
92 |
-+++ adplug-2.1/src/dtm.cpp 2008-04-16 19:23:40.000000000 +0300 |
93 |
+diff -Naurp adplug-2.1-orig/src/dtm.cpp adplug-2.1/src/dtm.cpp |
94 |
+--- adplug-2.1-orig/src/dtm.cpp 2008-09-08 22:33:32.000000000 +0200 |
95 |
++++ adplug-2.1/src/dtm.cpp 2008-09-08 22:33:53.000000000 +0200 |
96 |
@@ -24,6 +24,8 @@ |
97 |
|
98 |
#include "dtm.h" |
99 |
@@ -70,9 +69,9 @@ |
100 |
/* -------- Public Methods -------------------------------- */ |
101 |
|
102 |
CPlayer *CdtmLoader::factory(Copl *newopl) |
103 |
-diff -ur adplug-2.1.orig/src/fmc.cpp adplug-2.1/src/fmc.cpp |
104 |
---- adplug-2.1.orig/src/fmc.cpp 2007-04-08 15:00:04.000000000 +0300 |
105 |
-+++ adplug-2.1/src/fmc.cpp 2008-04-16 19:23:40.000000000 +0300 |
106 |
+diff -Naurp adplug-2.1-orig/src/fmc.cpp adplug-2.1/src/fmc.cpp |
107 |
+--- adplug-2.1-orig/src/fmc.cpp 2008-09-08 22:33:32.000000000 +0200 |
108 |
++++ adplug-2.1/src/fmc.cpp 2008-09-08 22:33:53.000000000 +0200 |
109 |
@@ -21,6 +21,8 @@ |
110 |
|
111 |
#include "fmc.h" |
112 |
@@ -82,9 +81,9 @@ |
113 |
/* -------- Public Methods -------------------------------- */ |
114 |
|
115 |
CPlayer *CfmcLoader::factory(Copl *newopl) |
116 |
-diff -ur adplug-2.1.orig/src/mad.cpp adplug-2.1/src/mad.cpp |
117 |
---- adplug-2.1.orig/src/mad.cpp 2006-05-13 08:36:42.000000000 +0300 |
118 |
-+++ adplug-2.1/src/mad.cpp 2008-04-16 19:23:40.000000000 +0300 |
119 |
+diff -Naurp adplug-2.1-orig/src/mad.cpp adplug-2.1/src/mad.cpp |
120 |
+--- adplug-2.1-orig/src/mad.cpp 2008-09-08 22:33:32.000000000 +0200 |
121 |
++++ adplug-2.1/src/mad.cpp 2008-09-08 22:33:53.000000000 +0200 |
122 |
@@ -21,6 +21,8 @@ |
123 |
|
124 |
#include "mad.h" |
125 |
@@ -94,9 +93,9 @@ |
126 |
/* -------- Public Methods -------------------------------- */ |
127 |
|
128 |
CPlayer *CmadLoader::factory(Copl *newopl) |
129 |
-diff -ur adplug-2.1.orig/src/mkj.cpp adplug-2.1/src/mkj.cpp |
130 |
---- adplug-2.1.orig/src/mkj.cpp 2006-05-13 08:36:42.000000000 +0300 |
131 |
-+++ adplug-2.1/src/mkj.cpp 2008-04-16 19:23:40.000000000 +0300 |
132 |
+diff -Naurp adplug-2.1-orig/src/mkj.cpp adplug-2.1/src/mkj.cpp |
133 |
+--- adplug-2.1-orig/src/mkj.cpp 2008-09-08 22:33:32.000000000 +0200 |
134 |
++++ adplug-2.1/src/mkj.cpp 2008-09-08 22:33:53.000000000 +0200 |
135 |
@@ -24,6 +24,8 @@ |
136 |
#include "mkj.h" |
137 |
#include "debug.h" |
138 |
@@ -106,9 +105,9 @@ |
139 |
CPlayer *CmkjPlayer::factory(Copl *newopl) |
140 |
{ |
141 |
return new CmkjPlayer(newopl); |
142 |
-diff -ur adplug-2.1.orig/src/msc.cpp adplug-2.1/src/msc.cpp |
143 |
---- adplug-2.1.orig/src/msc.cpp 2006-05-17 21:13:07.000000000 +0300 |
144 |
-+++ adplug-2.1/src/msc.cpp 2008-04-16 19:23:40.000000000 +0300 |
145 |
+diff -Naurp adplug-2.1-orig/src/msc.cpp adplug-2.1/src/msc.cpp |
146 |
+--- adplug-2.1-orig/src/msc.cpp 2008-09-08 22:33:32.000000000 +0200 |
147 |
++++ adplug-2.1/src/msc.cpp 2008-09-08 22:33:53.000000000 +0200 |
148 |
@@ -24,6 +24,8 @@ |
149 |
#include "msc.h" |
150 |
#include "debug.h" |
151 |
@@ -118,9 +117,9 @@ |
152 |
const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = { |
153 |
'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ', |
154 |
'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' }; |
155 |
-diff -ur adplug-2.1.orig/src/mtk.cpp adplug-2.1/src/mtk.cpp |
156 |
---- adplug-2.1.orig/src/mtk.cpp 2006-07-04 16:39:10.000000000 +0300 |
157 |
-+++ adplug-2.1/src/mtk.cpp 2008-04-16 19:23:40.000000000 +0300 |
158 |
+diff -Naurp adplug-2.1-orig/src/mtk.cpp adplug-2.1/src/mtk.cpp |
159 |
+--- adplug-2.1-orig/src/mtk.cpp 2008-09-08 22:33:32.000000000 +0200 |
160 |
++++ adplug-2.1/src/mtk.cpp 2008-09-08 22:33:53.000000000 +0200 |
161 |
@@ -21,6 +21,8 @@ |
162 |
|
163 |
#include "mtk.h" |
164 |
@@ -130,9 +129,9 @@ |
165 |
/*** public methods **************************************/ |
166 |
|
167 |
CPlayer *CmtkLoader::factory(Copl *newopl) |
168 |
-diff -ur adplug-2.1.orig/src/protrack.cpp adplug-2.1/src/protrack.cpp |
169 |
---- adplug-2.1.orig/src/protrack.cpp 2007-04-08 20:14:27.000000000 +0300 |
170 |
-+++ adplug-2.1/src/protrack.cpp 2008-04-16 19:23:40.000000000 +0300 |
171 |
+diff -Naurp adplug-2.1-orig/src/protrack.cpp adplug-2.1/src/protrack.cpp |
172 |
+--- adplug-2.1-orig/src/protrack.cpp 2008-09-08 22:33:32.000000000 +0200 |
173 |
++++ adplug-2.1/src/protrack.cpp 2008-09-08 22:33:53.000000000 +0200 |
174 |
@@ -28,6 +28,8 @@ |
175 |
#include "protrack.h" |
176 |
#include "debug.h" |
177 |
@@ -142,9 +141,9 @@ |
178 |
#define SPECIALARPLEN 256 // Standard length of special arpeggio lists |
179 |
#define JUMPMARKER 0x80 // Orderlist jump marker |
180 |
|
181 |
-diff -ur adplug-2.1.orig/src/rad.cpp adplug-2.1/src/rad.cpp |
182 |
---- adplug-2.1.orig/src/rad.cpp 2007-04-08 14:57:32.000000000 +0300 |
183 |
-+++ adplug-2.1/src/rad.cpp 2008-04-16 19:23:40.000000000 +0300 |
184 |
+diff -Naurp adplug-2.1-orig/src/rad.cpp adplug-2.1/src/rad.cpp |
185 |
+--- adplug-2.1-orig/src/rad.cpp 2008-09-08 22:33:32.000000000 +0200 |
186 |
++++ adplug-2.1/src/rad.cpp 2008-09-08 22:33:53.000000000 +0200 |
187 |
@@ -24,6 +24,8 @@ |
188 |
|
189 |
#include "rad.h" |
190 |
@@ -154,9 +153,9 @@ |
191 |
CPlayer *CradLoader::factory(Copl *newopl) |
192 |
{ |
193 |
return new CradLoader(newopl); |
194 |
-diff -ur adplug-2.1.orig/src/rat.cpp adplug-2.1/src/rat.cpp |
195 |
---- adplug-2.1.orig/src/rat.cpp 2006-05-13 08:36:42.000000000 +0300 |
196 |
-+++ adplug-2.1/src/rat.cpp 2008-04-16 19:23:40.000000000 +0300 |
197 |
+diff -Naurp adplug-2.1-orig/src/rat.cpp adplug-2.1/src/rat.cpp |
198 |
+--- adplug-2.1-orig/src/rat.cpp 2008-09-08 22:33:32.000000000 +0200 |
199 |
++++ adplug-2.1/src/rat.cpp 2008-09-08 22:33:53.000000000 +0200 |
200 |
@@ -32,6 +32,8 @@ |
201 |
#include "rat.h" |
202 |
#include "debug.h" |
203 |
@@ -166,9 +165,9 @@ |
204 |
const unsigned char CxadratPlayer::rat_adlib_bases[18] = |
205 |
{ |
206 |
0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12, |
207 |
-diff -ur adplug-2.1.orig/src/raw.cpp adplug-2.1/src/raw.cpp |
208 |
---- adplug-2.1.orig/src/raw.cpp 2006-05-13 08:36:42.000000000 +0300 |
209 |
-+++ adplug-2.1/src/raw.cpp 2008-04-16 19:23:40.000000000 +0300 |
210 |
+diff -Naurp adplug-2.1-orig/src/raw.cpp adplug-2.1/src/raw.cpp |
211 |
+--- adplug-2.1-orig/src/raw.cpp 2008-09-08 22:33:32.000000000 +0200 |
212 |
++++ adplug-2.1/src/raw.cpp 2008-09-08 22:33:53.000000000 +0200 |
213 |
@@ -21,6 +21,8 @@ |
214 |
|
215 |
#include "raw.h" |
216 |
@@ -178,9 +177,9 @@ |
217 |
/*** public methods *************************************/ |
218 |
|
219 |
CPlayer *CrawPlayer::factory(Copl *newopl) |
220 |
-diff -ur adplug-2.1.orig/src/rix.cpp adplug-2.1/src/rix.cpp |
221 |
---- adplug-2.1.orig/src/rix.cpp 2007-04-01 18:32:49.000000000 +0300 |
222 |
-+++ adplug-2.1/src/rix.cpp 2008-04-16 19:23:40.000000000 +0300 |
223 |
+diff -Naurp adplug-2.1-orig/src/rix.cpp adplug-2.1/src/rix.cpp |
224 |
+--- adplug-2.1-orig/src/rix.cpp 2008-09-08 22:33:32.000000000 +0200 |
225 |
++++ adplug-2.1/src/rix.cpp 2008-09-08 22:33:53.000000000 +0200 |
226 |
@@ -23,6 +23,9 @@ |
227 |
#include "rix.h" |
228 |
#include "debug.h" |
229 |
@@ -191,9 +190,9 @@ |
230 |
const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1}; |
231 |
const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21}; |
232 |
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}; |
233 |
-diff -ur adplug-2.1.orig/src/rol.h adplug-2.1/src/rol.h |
234 |
---- adplug-2.1.orig/src/rol.h 2006-05-13 08:36:42.000000000 +0300 |
235 |
-+++ adplug-2.1/src/rol.h 2008-04-16 19:23:40.000000000 +0300 |
236 |
+diff -Naurp adplug-2.1-orig/src/rol.h adplug-2.1/src/rol.h |
237 |
+--- adplug-2.1-orig/src/rol.h 2008-09-08 22:33:32.000000000 +0200 |
238 |
++++ adplug-2.1/src/rol.h 2008-09-08 22:33:53.000000000 +0200 |
239 |
@@ -25,6 +25,7 @@ |
240 |
|
241 |
#include <vector> |
242 |
@@ -202,9 +201,9 @@ |
243 |
|
244 |
#include "player.h" |
245 |
|
246 |
-diff -ur adplug-2.1.orig/src/s3m.cpp adplug-2.1/src/s3m.cpp |
247 |
---- adplug-2.1.orig/src/s3m.cpp 2006-07-02 08:27:00.000000000 +0300 |
248 |
-+++ adplug-2.1/src/s3m.cpp 2008-04-16 19:23:40.000000000 +0300 |
249 |
+diff -Naurp adplug-2.1-orig/src/s3m.cpp adplug-2.1/src/s3m.cpp |
250 |
+--- adplug-2.1-orig/src/s3m.cpp 2008-09-08 22:33:32.000000000 +0200 |
251 |
++++ adplug-2.1/src/s3m.cpp 2008-09-08 22:33:53.000000000 +0200 |
252 |
@@ -24,6 +24,8 @@ |
253 |
|
254 |
#include "s3m.h" |
255 |
@@ -214,9 +213,9 @@ |
256 |
const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion |
257 |
{-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}; |
258 |
|
259 |
-diff -ur adplug-2.1.orig/src/sa2.cpp adplug-2.1/src/sa2.cpp |
260 |
---- adplug-2.1.orig/src/sa2.cpp 2007-04-08 14:58:45.000000000 +0300 |
261 |
-+++ adplug-2.1/src/sa2.cpp 2008-04-16 19:23:40.000000000 +0300 |
262 |
+diff -Naurp adplug-2.1-orig/src/sa2.cpp adplug-2.1/src/sa2.cpp |
263 |
+--- adplug-2.1-orig/src/sa2.cpp 2008-09-08 22:33:32.000000000 +0200 |
264 |
++++ adplug-2.1/src/sa2.cpp 2008-09-08 22:33:53.000000000 +0200 |
265 |
@@ -25,6 +25,8 @@ |
266 |
#include "sa2.h" |
267 |
#include "debug.h" |
268 |
@@ -226,9 +225,9 @@ |
269 |
CPlayer *Csa2Loader::factory(Copl *newopl) |
270 |
{ |
271 |
return new Csa2Loader(newopl); |
272 |
-diff -ur adplug-2.1.orig/src/sng.cpp adplug-2.1/src/sng.cpp |
273 |
---- adplug-2.1.orig/src/sng.cpp 2006-05-13 08:36:42.000000000 +0300 |
274 |
-+++ adplug-2.1/src/sng.cpp 2008-04-16 19:23:40.000000000 +0300 |
275 |
+diff -Naurp adplug-2.1-orig/src/sng.cpp adplug-2.1/src/sng.cpp |
276 |
+--- adplug-2.1-orig/src/sng.cpp 2008-09-08 22:33:32.000000000 +0200 |
277 |
++++ adplug-2.1/src/sng.cpp 2008-09-08 22:33:53.000000000 +0200 |
278 |
@@ -21,6 +21,8 @@ |
279 |
|
280 |
#include "sng.h" |
281 |
@@ -238,3 +237,14 @@ |
282 |
CPlayer *CsngPlayer::factory(Copl *newopl) |
283 |
{ |
284 |
return new CsngPlayer(newopl); |
285 |
+diff -Naurp adplug-2.1-orig/test/playertest.cpp adplug-2.1/test/playertest.cpp |
286 |
+--- adplug-2.1-orig/test/playertest.cpp 2008-09-08 22:33:33.000000000 +0200 |
287 |
++++ adplug-2.1/test/playertest.cpp 2008-09-08 22:34:45.000000000 +0200 |
288 |
+@@ -19,6 +19,7 @@ |
289 |
+ * playertest.cpp - Test AdPlug replayers, by Simon Peter <dn.tlp@×××.net> |
290 |
+ */ |
291 |
+ |
292 |
++#include <cstring> |
293 |
+ #include <stdlib.h> |
294 |
+ #include <stdio.h> |
295 |
+ #include <string> |