summaryrefslogtreecommitdiff
path: root/media-sound/sndpeek
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/sndpeek')
-rw-r--r--media-sound/sndpeek/Manifest7
-rw-r--r--media-sound/sndpeek/files/sndpeek-1.3-makefile.patch296
-rw-r--r--media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch65
-rw-r--r--media-sound/sndpeek/files/sndpeek-1.41-makefile.patch306
-rw-r--r--media-sound/sndpeek/sndpeek-1.41-r1.ebuild (renamed from media-sound/sndpeek/sndpeek-1.4.ebuild)29
5 files changed, 325 insertions, 378 deletions
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 06dc0cc3bff8..b09bdfd1ba21 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,6 +1,5 @@
-AUX sndpeek-1.3-makefile.patch 7578 BLAKE2B b06da3d723a0d49e5e8ca058b7622f6b34c6ecf60233b26ede0b1f1a1f933cbe4db56519f39886f621169e0cfe7a03091eb70580fc4f3e58af3a1f21b9f2b242 SHA512 4f89535d28a2e01b752b689513e67fdbaeab9b6aa03b62724e96bfafa4f49b9be310647268a43564b96686e20d52e7fd646a7a2e654eec1dd1c9e38e686e20e7
AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce99018868d6831be978029be4a51ace611f41e36e91b2f70add83c3269722e1a5061e7fb267a63cce5772f3b1b1 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18
-AUX sndpeek-1.4-ldflags.patch 2255 BLAKE2B b78a6a15228e7c5d0a38b4ed1bdc86c6e6ec540099e6ac4e066135b9fcb53a3ac307a3239022fda14ec596b9e145317c2e61e65dec26e9940fbc37f3515c1b93 SHA512 36c8f4dd7a63c06a7cbefd66e1f2eca39cf7567ddfb8a76e6d50de7808086b17cdd3f4028e4d5ca458edbf6d257d75bce8d40538d865151d0ce11283b2cf3991
-DIST sndpeek-1.4.tgz 311174 BLAKE2B 8f75aa90e71c4b12e15da68774a357ecaab61dea64071b5276ea1fe5311c1e937350a8e46f6a8c4714a43f7174145881fa9be04c80c54ede351e0ece08de88ca SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb
-EBUILD sndpeek-1.4.ebuild 1659 BLAKE2B d3c15cd95858558c86d06829f54cba9ba4eb48206ab63dce3b707ba39c3dbe37b0ba3b1184008a18c76a8f0b77d8f260fb54a764c4f0c1124e783a2b0e571070 SHA512 40701ac8ce7f4299f8081746ad1ec1396ebc3e58a194fc5ca982be1fc1a812bbeab6d34d66ecb669b4749b57ce7a42d6f8930b27e04e306325ecabde32fc3226
+AUX sndpeek-1.41-makefile.patch 8410 BLAKE2B 13df444073c55efac49ea862957375b2284567134bf1313069e4b41254232440b6e7f83c25e79cfc62611caa0a215cc56d14f130a5bfa2d8b4ded307860ba3cb SHA512 9999454775686174bb9561eefb0150cd7031ed2faad26c5830a367e21a844aee62dd0ced65cb17a7cd063f45cc05c6824f3abc5d427ad3ba2c8b5c0efb5de71a
+DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465
+EBUILD sndpeek-1.41-r1.ebuild 1599 BLAKE2B 187ce2f3860f4346b93b8733e4fff6fb0e88de0f35c29256ffda7a49a80928b6c608cd6fd05c6c17653b954a15aa4ba4031ecd844b5f8a2725bb73f5e0ae7074 SHA512 f330b9951dafa25fda881bdf1e9bf64c57672e1d39d80f12039c7960b61ea152803939f356b9a96f23d992ea42cd720602db4f708b4400c01716399065a1e993
MISC metadata.xml 334 BLAKE2B d0828ab0ff2b5bc3a88013773a5653206e57420f5d0eceadcfa7db7e587d24e12ded0edd775123ecdb887b3adf8f357599f59a6b0997667346ab846d6656bd52 SHA512 13ab3514fb82b417aa9b69680d3370a9f674c307a10a289de8b370c9cbd7e8a6b3aa14a00b2d69885e8805473940cf0dbf1606571827e021c5245c20e0078fa8
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
deleted file mode 100644
index 9b17c99e146b..000000000000
--- a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-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-ldflags.patch b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
deleted file mode 100644
index 9822434b263a..000000000000
--- a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
diff --git a/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
new file mode 100644
index 000000000000..9dc4fa06d10a
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
@@ -0,0 +1,306 @@
+diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa
+index a0f76ba..e50cf82 100644
+--- a/src/sndpeek/makefile.alsa
++++ b/src/sndpeek/makefile.alsa
+@@ -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__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
++CFLAGS_MAIN=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(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,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+
+ sndpeek: $(OBJS)
+- $(CPP) -o $@ $(OBJS) $(LIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++
++chuck_fft.o:
++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c
+
+ Centroid.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ DownSampler.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Flux.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ LPC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MFCC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ RMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Rolloff.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ System.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fvec.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ AutoCorrelation.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Communicator.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Hamming.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MagFFT.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ NormRMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MarSignal.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fmatrix.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ .o: $*.h
+
+@@ -68,7 +71,7 @@ fmatrix.o:
+ $(CC) $(CFLAGS) $*.c
+
+ .cpp.o: $*.h $*.cpp
+- $(CC) $(CFLAGS) $*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp
+
+ clean:
+ rm -f sndpeek *~ *.o
+diff --git a/src/sndpeek/makefile.jack b/src/sndpeek/makefile.jack
+index ec15276..70fa6e3 100644
+--- a/src/sndpeek/makefile.jack
++++ b/src/sndpeek/makefile.jack
+@@ -1,8 +1,8 @@
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
++CFLAGS_MAIN=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(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 \
+@@ -11,55 +11,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+
+ sndpeek: $(OBJS)
+- $(CPP) -o $@ $(OBJS) $(LIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++
++chuck_fft.o:
++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c
+
+ Centroid.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ DownSampler.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Flux.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ LPC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MFCC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ RMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Rolloff.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ System.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fvec.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ AutoCorrelation.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Communicator.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Hamming.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MagFFT.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ NormRMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MarSignal.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fmatrix.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ .o: $*.h
+
+@@ -67,7 +70,7 @@ fmatrix.o:
+ $(CC) $(CFLAGS) $*.c
+
+ .cpp.o: $*.h $*.cpp
+- $(CC) $(CFLAGS) $*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp
+
+ clean:
+ rm -f sndpeek *~ *.o
+diff --git a/src/sndpeek/makefile.oss b/src/sndpeek/makefile.oss
+index f092df2..3ef005c 100644
+--- a/src/sndpeek/makefile.oss
++++ b/src/sndpeek/makefile.oss
+@@ -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__ -D__USE_GLUT__ $(INCLUDES) -O3 -c
++CFLAGS_MAIN=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ -D__USE_GLUT__ $(INCLUDES) -c
+ LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile
+
+ TARGE=sndpeek
+@@ -12,55 +12,58 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+
+ sndpeek: $(OBJS)
+- $(CPP) -o $@ $(OBJS) $(LIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++
++chuck_fft.o:
++ $(CC) $(CFLAGS_MAIN) $(CFLAGS) $*.c
+
+ Centroid.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ DownSampler.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Flux.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ LPC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MFCC.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ RMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Rolloff.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ System.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fvec.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ AutoCorrelation.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Communicator.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ Hamming.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MagFFT.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ NormRMS.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ MarSignal.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ fmatrix.o:
+- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+
+ .o: $*.h
+
+@@ -68,7 +71,7 @@ fmatrix.o:
+ $(CC) $(CFLAGS) $*.c
+
+ .cpp.o: $*.h $*.cpp
+- $(CC) $(CFLAGS) $*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp
+
+ clean:
+ rm -f sndpeek *~ *.o
diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
index b60e397e0d76..ce8567bae371 100644
--- a/media-sound/sndpeek/sndpeek-1.4.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit eutils toolchain-funcs
DESCRIPTION="real-time audio visualization"
@@ -13,24 +13,27 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+alsa jack oss"
-RDEPEND="media-libs/freeglut
- virtual/opengl
+RDEPEND="
+ app-eselect/eselect-sndpeek
+ media-libs/freeglut
virtual/glu
- x11-libs/libXmu
+ virtual/opengl
x11-libs/libX11
x11-libs/libXext
+ x11-libs/libXmu
media-libs/libsndfile
- jack? ( media-sound/jack-audio-connection-kit )
+ jack? ( virtual/jack )
alsa? ( media-libs/alsa-lib )
- app-eselect/eselect-sndpeek"
+"
DEPEND="${RDEPEND}"
REQUIRED_USE="|| ( alsa jack oss )"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3-makefile.patch \
- "${FILESDIR}"/${P}-gcc.patch \
- "${FILESDIR}"/${P}-ldflags.patch
-}
+DOCS=( AUTHORS README THANKS TODO VERSIONS )
+
+PATCHES=(
+ "${FILESDIR}/${P}-makefile.patch"
+# "${FILESDIR}/${PN}-1.4-gcc.patch"
+)
compile_backend() {
backend=$1
@@ -53,7 +56,7 @@ src_install() {
use alsa && dobin src/sndpeek/sndpeek-alsa
use jack && dobin src/sndpeek/sndpeek-jack
use oss && dobin src/sndpeek/sndpeek-oss
- dodoc AUTHORS README THANKS TODO VERSIONS
+ einstalldocs
}
pkg_postinst() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 12:37:00 +0000