reinit the tree, so we can have metadata

3 files changed, 373 insertions, 0 deletions

diff --git a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
new file mode 100644
index 000000000000..9b17c99e146b
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
@@ -0,0 +1,296 @@
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.alsa sndpeek-1.3/src/sndpeek/makefile.alsa
+--- sndpeek-1.3~/src/sndpeek/makefile.alsa	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.alsa	2007-08-12 19:27:57.000000000 +0200
+@@ -1,10 +1,10 @@
+ 
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
++CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
+@@ -12,55 +12,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -68,7 +68,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.jack sndpeek-1.3/src/sndpeek/makefile.jack
+--- sndpeek-1.3~/src/sndpeek/makefile.jack	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.jack	2007-08-12 19:31:29.000000000 +0200
+@@ -1,9 +1,9 @@
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
++CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
+@@ -11,55 +11,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -67,7 +67,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.oss sndpeek-1.3/src/sndpeek/makefile.oss
+--- sndpeek-1.3~/src/sndpeek/makefile.oss	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.oss	2007-08-12 19:33:28.000000000 +0200
+@@ -1,8 +1,8 @@
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
++CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
+ LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ TARGE=sndpeek
+@@ -12,55 +12,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -68,7 +68,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
diff --git a/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch b/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch
new file mode 100644
index 000000000000..524b0bd746af
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch
@@ -0,0 +1,12 @@
+Index: sndpeek-1.4/src/marsyas/LPC.cpp
+===================================================================
+--- sndpeek-1.4.orig/src/marsyas/LPC.cpp
++++ sndpeek-1.4/src/marsyas/LPC.cpp
+@@ -26,6 +26,7 @@ in Speech Recognition research.
+ */
+ 
+ 
++#include <cstdlib>
+ #include "LPC.h"
+ 
+ LPC::LPC( unsigned int inSize )
diff --git a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
new file mode 100644
index 000000000000..9822434b263a
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
@@ -0,0 +1,65 @@
+Index: sndpeek-1.4/src/sndpeek/makefile.alsa
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.alsa
++++ sndpeek-1.4/src/sndpeek/makefile.alsa
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.jack
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.jack
++++ sndpeek-1.4/src/sndpeek/makefile.jack
+@@ -11,7 +11,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.oss
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.oss
++++ sndpeek-1.4/src/sndpeek/makefile.oss
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.osx
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.osx
++++ sndpeek-1.4/src/sndpeek/makefile.osx
+@@ -13,7 +13,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.win32
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.win32
++++ sndpeek-1.4/src/sndpeek/makefile.win32
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp