View | Details | Raw Unified | Return to bug 40812
Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 14-25 Link Here
14
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
15
15
16
USE_REINPLACE=	yes
16
USE_REINPLACE=	yes
17
GNU_CONFIGURE=	yes
18
USE_GMAKE=	yes
17
USE_GMAKE=	yes
18
USE_LIBTOOL=	yes
19
INSTALLS_SHLIB=	yes
19
INSTALLS_SHLIB=	yes
20
20
21
post-patch:
21
post-patch:
22
	@${REINPLACE_CMD} -E -e "s,-ldl,,g ; s,\(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
22
	@${REINPLACE_CMD} -e "s,-ldl,,g ; s,(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
23
23
24
post-install:
24
post-install:
25
.if !defined(NOPORTDOCS)
25
.if !defined(NOPORTDOCS)
(-)pkg-plist (-6 / +2 lines)
Lines 20-45 Link Here
20
include/MaaateMPEG.h
20
include/MaaateMPEG.h
21
include/MaaateP.h
21
include/MaaateP.h
22
lib/Maaate/libMaaateM.a
22
lib/Maaate/libMaaateM.a
23
lib/Maaate/libMaaateM.la
24
lib/Maaate/libMaaateM.so
23
lib/Maaate/libMaaateM.so
25
lib/Maaate/libMaaateM.so.1
24
lib/Maaate/libMaaateM.so.1
26
lib/libMaaateA.a
25
lib/libMaaateA.a
27
lib/libMaaateA.la
28
lib/libMaaateA.so
26
lib/libMaaateA.so
29
lib/libMaaateA.so.1
27
lib/libMaaateA.so.1
30
lib/libMaaateMPEG.a
28
lib/libMaaateMPEG.a
31
lib/libMaaateMPEG.la
32
lib/libMaaateMPEG.so
29
lib/libMaaateMPEG.so
33
lib/libMaaateMPEG.so.1
30
lib/libMaaateMPEG.so.1
34
lib/libMaaateP.a
31
lib/libMaaateP.a
35
lib/libMaaateP.la
36
lib/libMaaateP.so
32
lib/libMaaateP.so
37
lib/libMaaateP.so.1
33
lib/libMaaateP.so.1
38
@dirrm include/Maaate
39
@dirrm lib/Maaate
40
%%PORTDOCS%%share/doc/Maaate/API.html
34
%%PORTDOCS%%share/doc/Maaate/API.html
41
%%PORTDOCS%%share/doc/Maaate/COPYING
35
%%PORTDOCS%%share/doc/Maaate/COPYING
42
%%PORTDOCS%%share/doc/Maaate/ChangeLog
36
%%PORTDOCS%%share/doc/Maaate/ChangeLog
43
%%PORTDOCS%%share/doc/Maaate/THANKS
37
%%PORTDOCS%%share/doc/Maaate/THANKS
44
%%PORTDOCS%%share/doc/Maaate/applications.html
38
%%PORTDOCS%%share/doc/Maaate/applications.html
45
%%PORTDOCS%%@dirrm share/doc/Maaate
39
%%PORTDOCS%%@dirrm share/doc/Maaate
40
@dirrm lib/Maaate
41
@dirrm include/Maaate
(-)files/patch-src-mpeg-MPEGfile.cc (+67 lines)
Added Link Here
1
--- src/mpeg/MPEGfile.cc.orig	Mon Mar  4 03:31:28 2002
2
+++ src/mpeg/MPEGfile.cc	Sat Jul 20 17:21:11 2002
3
@@ -97,7 +97,7 @@
4
 /*---------------- time functions --------------------*/
5
 
6
 float 
7
-MPEGfile::sample_duration( Resolution res = LOW ) {
8
+MPEGfile::sample_duration( Resolution res) {
9
   //duration of one MPEG frame
10
   double frameDur = (1.0*samples_per_frame() / (1000.0 * samplingrate()));
11
 
12
@@ -147,7 +147,7 @@
13
 }
14
 
15
 unsigned int 
16
-MPEGfile::timeticks( Resolution res = LOW ) {
17
+MPEGfile::timeticks( Resolution res) {
18
   if ( layer() == III  ) {
19
     if ( res == LOW || res == PCM) {
20
       return 18;
21
@@ -164,7 +164,7 @@
22
 /*------------------- skip and analyse function -----------*/
23
 
24
 bool 
25
-MPEGfile::next_window( Resolution res = LOW ) {
26
+MPEGfile::next_window( Resolution res) {
27
   int nb_gr = nb_granules();
28
   DecodeLevel touse;
29
   //futur current window
30
@@ -272,8 +272,8 @@
31
 /*------------- access function ----------------*/
32
 
33
 double 
34
-MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0,
35
-		      Resolution res = LOW ) {
36
+MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb,
37
+		      Resolution res) {
38
   if ( res == HIGH && layer() == III) {
39
     return mdct_sample (ch,sb); //576 subbands
40
   } else {
41
@@ -283,7 +283,7 @@
42
 }
43
 
44
 unsigned int 
45
-MPEGfile::nb_subbands( Resolution res = LOW ) {
46
+MPEGfile::nb_subbands( Resolution res) {
47
   if ( layer() == III && res == HIGH ) {
48
     return 576;
49
   } else {
50
@@ -423,7 +423,7 @@
51
 
52
 //allow to parse next frame if available, keep windowNo up to date
53
 bool 
54
-MPEGfile::goTo_nextFrame( Resolution res = LOW) {
55
+MPEGfile::goTo_nextFrame( Resolution res) {
56
   if (!data_available()) return false;
57
   long oldfr = frameNo;
58
   while (frameNo == oldfr) {
59
@@ -732,7 +732,7 @@
60
 }
61
 
62
 short 
63
-MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss=0) {
64
+MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss) {
65
   return audio->pcm_sample(ch, sb, no, ss);
66
 }
67
 
(-)files/patch-src-mpeg-layer1.cc (+32 lines)
Added Link Here
1
--- src/mpeg/layer1.cc.orig	Thu Jan 10 00:32:43 2002
2
+++ src/mpeg/layer1.cc	Sat Jul 20 17:21:11 2002
3
@@ -235,25 +235,25 @@
4
 }
5
 
6
 float
7
-Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss=0) 
8
+Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss) 
9
 {
10
     return maaate_scalefactors[scale_index[channel][subband]];
11
 }
12
 
13
 int
14
-Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss=0) 
15
+Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss) 
16
 {
17
     return samples[number][channel][subb];
18
 }
19
 
20
 double
21
-Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0) 
22
+Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss) 
23
 {
24
     return restoredsamples[no][ch][subb];
25
 }
26
 
27
 short
28
-Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0) 
29
+Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss) 
30
 {
31
     return pcm[no][ch][subb];
32
 }
(-)files/patch-src-plugins-spectralFlux.cc (+15 lines)
Added Link Here
1
--- src/plugins/spectralFlux.cc.orig	Wed Jan 23 12:22:13 2002
2
+++ src/plugins/spectralFlux.cc	Sat Jul 20 17:21:11 2002
3
@@ -182,9 +182,9 @@
4
 
5
   //temporary results
6
   int SBM = mf->nb_subbands(LOW);
7
-  double temp[SBM];
8
-  double old_temp[SBM];
9
-  double (* aux)[SBM];
10
+  double btemp[SBM];
11
+  double bold_temp[SBM];
12
+  double *temp = btemp, *old_temp = bold_temp, **aux;
13
   double max = 0.0;
14
 
15
 
(-)files/patch-src-tier1-SOUNDfile.cc (+107 lines)
Added Link Here
1
--- src/tier1/SOUNDfile.cc.orig	Mon Mar  4 03:31:29 2002
2
+++ src/tier1/SOUNDfile.cc	Sat Jul 20 17:21:11 2002
3
@@ -132,7 +132,7 @@
4
 
5
 //give the duration of one subband sample in sec
6
 float 
7
-SOUNDfile::sample_duration( Resolution res = LOW ) {
8
+SOUNDfile::sample_duration( Resolution res) {
9
   return format->sample_duration( res );
10
 }
11
 
12
@@ -164,7 +164,7 @@
13
 
14
 //give the nuber of subband samples in one window
15
 unsigned int 
16
-SOUNDfile::timeticks( Resolution res = LOW ) {
17
+SOUNDfile::timeticks( Resolution res) {
18
   return format->timeticks( res );
19
 }
20
 
21
@@ -194,7 +194,7 @@
22
 /*-------------- extract and skip --------------*/
23
 //go to next window and analyse it with res
24
 bool 
25
-SOUNDfile::next_window( Resolution res = LOW) {
26
+SOUNDfile::next_window( Resolution res) {
27
   //set which_max as maxim do not contain a meaningful value
28
   which_max = -1;
29
   return format->next_window( res );
30
@@ -212,20 +212,20 @@
31
 /*--------------- access function ---------------*/
32
 //give the value of the subband samples of the current window
33
 double 
34
-SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0, Resolution res = LOW ) {
35
+SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb, Resolution res) {
36
   return format->freq_value(ch,sb,nb,res);
37
 }
38
 
39
 //give the number of subband at that resolution
40
 unsigned int 
41
-SOUNDfile::nb_subbands( Resolution res = LOW ) {
42
+SOUNDfile::nb_subbands( Resolution res) {
43
   return format->nb_subbands( res );
44
 }
45
 
46
 /*------------- Analyse functions ----------------------*/
47
 //give the mean of samples nb in subband sb on both channels if available
48
 double 
49
-SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb = 0, Resolution res = LOW )
50
+SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb, Resolution res)
51
 {
52
   
53
   if ( format->is_stereo() ) { // in case of a stereo file it is possible to compute the mean
54
@@ -237,7 +237,7 @@
55
 
56
 //give the rms of samples nb in subband sb on both channels if available 
57
 double 
58
-SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb = 0, Resolution res = LOW) 
59
+SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb, Resolution res) 
60
 {
61
 
62
   if ( format->is_stereo() ) {  // in case of a stereo file it is possible to compute the rms
63
@@ -249,7 +249,7 @@
64
 
65
 //give the normalised subband energy samples
66
 double
67
-SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb = 0, Resolution res = LOW) 
68
+SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb, Resolution res) 
69
 {
70
   double resu;
71
 
72
@@ -293,7 +293,7 @@
73
 
74
 //give a coarse and quick idea of the value in that subband
75
 double 
76
-SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res = LOW)
77
+SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res)
78
 {
79
   switch (filetype) {
80
   case MPEG:
81
@@ -319,7 +319,7 @@
82
 
83
 //give the mean of samples over the current window
84
 double
85
-SOUNDfile::subband_mean( unsigned int sb, Resolution res = LOW) 
86
+SOUNDfile::subband_mean( unsigned int sb, Resolution res) 
87
 {
88
 
89
   int num = format->timeticks(res);
90
@@ -335,7 +335,7 @@
91
 
92
 //give the rms of samples over the current window
93
 double
94
-SOUNDfile::subband_rms( unsigned int sb, Resolution res = LOW) 
95
+SOUNDfile::subband_rms( unsigned int sb, Resolution res) 
96
 {
97
     
98
   int num = format->timeticks(res);
99
@@ -351,7 +351,7 @@
100
 
101
 //give the normalised subband energy over the current window  
102
 double
103
-SOUNDfile::subband_nrj( unsigned int sb, Resolution res = LOW) 
104
+SOUNDfile::subband_nrj( unsigned int sb, Resolution res) 
105
 {
106
   double resu;
107
 
(-)files/patch-src-tier2-segmentData.cc (+49 lines)
Added Link Here
1
--- src/tier2/segmentData.cc.orig	Mon Mar  4 03:31:29 2002
2
+++ src/tier2/segmentData.cc	Sat Jul 20 17:21:11 2002
3
@@ -27,8 +27,8 @@
4
 #include "segmentData.H"
5
 
6
 // constructor
7
-SegmentData::SegmentData(double t1, double t2, int col=0, int row=0, 
8
-			 int i=0, char f=' ', double cnf=0.0) : 
9
+SegmentData::SegmentData(double t1, double t2, int col, int row, 
10
+			 int i, char f, double cnf) : 
11
     starttime(t1), endtime(t2), columns(col), rows(row),
12
     id(i), flag(f), conf(cnf) {
13
 	if (col<0) col=0;
14
@@ -89,7 +89,7 @@
15
 // partial copy constructor
16
 SegmentData::SegmentData(const SegmentData& sd,
17
 			 int st_row, int end_row,
18
-			 int i=0, char f=' ', double cnf=0.0)
19
+			 int i, char f, double cnf)
20
 {
21
   int nb_rows;
22
 
23
@@ -309,7 +309,7 @@
24
 
25
 // minimum of all contained data
26
 double
27
-SegmentData::min(double downto = -DBL_MAX) {
28
+SegmentData::min(double downto ) {
29
 
30
   double * ptr;
31
 
32
@@ -332,7 +332,7 @@
33
 
34
 // maximum of all contained data
35
 double
36
-SegmentData::max(double upto = DBL_MAX) {
37
+SegmentData::max(double upto) {
38
 
39
   double * ptr;
40
 
41
@@ -363,7 +363,7 @@
42
 
43
 // normalize data values to [0;1], clipping outside of [downto;upto]
44
 bool
45
-SegmentData::normalise(double downto = - DBL_MAX, double upto = DBL_MAX) {
46
+SegmentData::normalise(double downto, double upto) {
47
 
48
   double * ptr;
49

Return to bug 40812