| 1 |
aballier 08/08/06 22:36:01 |
| 2 |
|
| 3 |
Added: splay-0.9.5.2-gcc43.patch |
| 4 |
Log: |
| 5 |
fix build with gcc 4.3, bug #232773 |
| 6 |
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/splay/files/splay-0.9.5.2-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/splay/files/splay-0.9.5.2-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/splay/files/splay-0.9.5.2-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: splay-0.9.5.2-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
Index: splay-0.9.5.2/apps/splay.cc |
| 17 |
=================================================================== |
| 18 |
--- splay-0.9.5.2.orig/apps/splay.cc |
| 19 |
+++ splay-0.9.5.2/apps/splay.cc |
| 20 |
@@ -16,14 +16,14 @@ |
| 21 |
|
| 22 |
#include <sys/types.h> |
| 23 |
#include <sys/wait.h> |
| 24 |
-#include <iostream.h> |
| 25 |
+#include <iostream> |
| 26 |
|
| 27 |
#ifdef HAVE_LIBID3 |
| 28 |
#include <id3/tag.h> |
| 29 |
#include <id3/misc_support.h> |
| 30 |
#endif /* HAVE_LIBID3 */ |
| 31 |
|
| 32 |
-#include <iomanip.h> |
| 33 |
+#include <iomanip> |
| 34 |
|
| 35 |
#include "mpegsound.h" |
| 36 |
|
| 37 |
@@ -172,7 +172,7 @@ ostream& operator<<(ostream& s, const ID |
| 38 |
static void play(char *filename) |
| 39 |
{ |
| 40 |
if( splay_verbose-- ) |
| 41 |
- cout << filename << ":" << endl; |
| 42 |
+ std::cout << filename << ":" << std::endl; |
| 43 |
if( splay_verbose>0 ) |
| 44 |
{ |
| 45 |
// cerr << getpid() << endl; |
| 46 |
Index: splay-0.9.5.2/libs/fileplayer.cc |
| 47 |
=================================================================== |
| 48 |
--- splay-0.9.5.2.orig/libs/fileplayer.cc |
| 49 |
+++ splay-0.9.5.2/libs/fileplayer.cc |
| 50 |
@@ -10,7 +10,7 @@ |
| 51 |
#endif |
| 52 |
|
| 53 |
#include <string.h> |
| 54 |
-#include <iostream.h> |
| 55 |
+#include <iostream> |
| 56 |
#include <sys/types.h> |
| 57 |
#include <sys/stat.h> |
| 58 |
#include <fcntl.h> |
| 59 |
@@ -55,7 +55,7 @@ bool Mpegfileplayer::openfile(char *file |
| 60 |
fd=open(device, O_WRONLY|O_NDELAY); |
| 61 |
} |
| 62 |
if ( fd == -1 ) { |
| 63 |
- cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << endl; |
| 64 |
+ std::cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << std::endl; |
| 65 |
return seterrorcode(SOUND_ERROR_DEVOPENFAIL); |
| 66 |
} |
| 67 |
close(fd); |
| 68 |
@@ -121,8 +121,8 @@ bool Mpegfileplayer::playing(int verbose |
| 69 |
int totframes=server->gettotalframe(); |
| 70 |
double tottime=1.0*totframes*pcmperframe/frequency; |
| 71 |
if(frameinfo) { |
| 72 |
- cout << "Totalframes " << totframes; |
| 73 |
- cout << "; Totaltime " << tominsec(tottime) << endl; |
| 74 |
+ std::cout << "Totalframes " << totframes; |
| 75 |
+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl; |
| 76 |
} |
| 77 |
|
| 78 |
// Playing |
| 79 |
@@ -132,9 +132,9 @@ bool Mpegfileplayer::playing(int verbose |
| 80 |
if(frameinfo) { |
| 81 |
int currframe=server-> getcurrentframe(); |
| 82 |
double currtime=1.0*currframe*pcmperframe/frequency; |
| 83 |
- cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
| 84 |
- cout << "Time " << tominsec(currtime) << " [" ; |
| 85 |
- cout << tominsec(tottime-currtime) << "]" << endl ; |
| 86 |
+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
| 87 |
+ std::cout << "Time " << tominsec(currtime) << " [" ; |
| 88 |
+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ; |
| 89 |
} |
| 90 |
} |
| 91 |
|
| 92 |
@@ -161,8 +161,8 @@ bool Mpegfileplayer::playingwiththread(i |
| 93 |
int totframes=server->gettotalframe(); |
| 94 |
double tottime=1.0*totframes*pcmperframe/frequency; |
| 95 |
if(frameinfo) { |
| 96 |
- cout << "Totalframes " << totframes; |
| 97 |
- cout << "; Totaltime " << tominsec(tottime) << endl; |
| 98 |
+ std::cout << "Totalframes " << totframes; |
| 99 |
+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl; |
| 100 |
} |
| 101 |
|
| 102 |
// Playing |
| 103 |
@@ -172,9 +172,9 @@ bool Mpegfileplayer::playingwiththread(i |
| 104 |
if(frameinfo) { |
| 105 |
int currframe=server-> getcurrentframe(); |
| 106 |
double currtime=1.0*currframe*pcmperframe/frequency; |
| 107 |
- cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
| 108 |
- cout << "Time " << tominsec(currtime) << " [" ; |
| 109 |
- cout << tominsec(tottime-currtime) << "]" << endl ; |
| 110 |
+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
| 111 |
+ std::cout << "Time " << tominsec(currtime) << " [" ; |
| 112 |
+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ; |
| 113 |
} |
| 114 |
} |
| 115 |
|
| 116 |
Index: splay-0.9.5.2/libs/mpegtoraw.cc |
| 117 |
=================================================================== |
| 118 |
--- splay-0.9.5.2.orig/libs/mpegtoraw.cc |
| 119 |
+++ splay-0.9.5.2/libs/mpegtoraw.cc |
| 120 |
@@ -552,7 +552,7 @@ int Mpegtoraw::getframesaved(void) |
| 121 |
#endif |
| 122 |
|
| 123 |
|
| 124 |
-#include <iostream.h> |
| 125 |
+#include <iostream> |
| 126 |
// Convert mpeg to raw |
| 127 |
bool Mpegtoraw::run(int frames) |
| 128 |
{ |
Archives