commit: 0491efeb3218f91c7b4e1301a98a2222c6767f0b Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Aug 8 11:54:19 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Aug 8 11:54:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0491efeb
media-sound/sndpeek: bump to 1.41 + removed 1.4 1) eapi7 2) virtual/jack + sorted deps Closes: https://bugs.gentoo.org/736316 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/sndpeek/Manifest | 2 +- .../sndpeek/files/sndpeek-1.41-makefile.patch | 297 +++++++++++++++++++++ .../{sndpeek-1.4.ebuild => sndpeek-1.41.ebuild} | 29 +- 3 files changed, 314 insertions(+), 14 deletions(-) diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest index 4fe9edd1bfa..9d6a8578b66 100644 --- a/media-sound/sndpeek/Manifest +++ b/media-sound/sndpeek/Manifest @@ -1 +1 @@ -DIST sndpeek-1.4.tgz 311174 BLAKE2B 8f75aa90e71c4b12e15da68774a357ecaab61dea64071b5276ea1fe5311c1e937350a8e46f6a8c4714a43f7174145881fa9be04c80c54ede351e0ece08de88ca SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb +DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465 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 00000000000..4a1472f11da --- /dev/null +++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch @@ -0,0 +1,297 @@ +diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa +index a0f76ba..1b7a21f 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=-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,55 @@ 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) + + 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 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.jack b/src/sndpeek/makefile.jack +index ec15276..86be1e7 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=-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,55 @@ 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) + + 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 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o +diff --git a/src/sndpeek/makefile.oss b/src/sndpeek/makefile.oss +index f092df2..d5768aa 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=-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,55 @@ 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) + + 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 @@ fmatrix.o: + $(CC) $(CFLAGS) $*.c + + .cpp.o: $*.h $*.cpp +- $(CC) $(CFLAGS) $*.cpp ++ $(CXX) $(CFLAGS) $*.cpp + + clean: + rm -f sndpeek *~ *.o diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.41.ebuild similarity index 79% rename from media-sound/sndpeek/sndpeek-1.4.ebuild rename to media-sound/sndpeek/sndpeek-1.41.ebuild index b60e397e0d7..ce8567bae37 100644 --- a/media-sound/sndpeek/sndpeek-1.4.ebuild +++ b/media-sound/sndpeek/sndpeek-1.41.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() {
