diff options
author | Cédric Krier <cedk@gentoo.org> | 2008-03-30 00:30:06 +0000 |
---|---|---|
committer | Cédric Krier <cedk@gentoo.org> | 2008-03-30 00:30:06 +0000 |
commit | 29a296085b5aaef6e135279611bcfa4040149208 (patch) | |
tree | ab76029ed0bd57372316b0b81cad724002465b47 /media-sound/sndpeek/files | |
parent | Version bumb. (diff) | |
download | gentoo-2-29a296085b5aaef6e135279611bcfa4040149208.tar.gz gentoo-2-29a296085b5aaef6e135279611bcfa4040149208.tar.bz2 gentoo-2-29a296085b5aaef6e135279611bcfa4040149208.zip |
New ebuild for bug #142079
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-sound/sndpeek/files')
-rw-r--r-- | media-sound/sndpeek/files/sndpeek-1.3-makefile.patch | 296 |
1 files changed, 296 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..bb02bc005593 --- /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 -lX12 -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 |