* [gentoo-commits] repo/gentoo:master commit in: media-sound/sndpeek/, media-sound/sndpeek/files/
@ 2015-08-25 14:13 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2015-08-25 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 05533753408f78186692229b9e88a5edbd0bee10
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 14:13:08 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 14:13:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05533753
media-sound/sndpeek: version bump to 1.4.
Also respect LDFLAGS, bug #334595.
Package-Manager: portage-2.2.20.1
media-sound/sndpeek/Manifest | 3 +-
media-sound/sndpeek/files/sndpeek-1.4-gcc.patch | 12 ++++
.../sndpeek/files/sndpeek-1.4-ldflags.patch | 65 +++++++++++++++++++
media-sound/sndpeek/sndpeek-1.4.ebuild | 73 ++++++++++++++++++++++
4 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 7dbbba6..61b5771 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1 +1,2 @@
-DIST sndpeek-1.3.tgz 298983 SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08
+DIST sndpeek-1.3.tgz 298983 SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08 SHA512 0642400f8e806ab8ffac73b2cd92593feb5032c63b825899982b7ebafd770d53bb43b940a74d8fa0962ddd730b404bf8c842114a9f64234adddee5ae990ae9d4 WHIRLPOOL 088a05a7ea947c45f895bb3e0ad3bd3da439b8282b92f69a58e84e07e65db873a2a54bb0b6856903e833f21354e112711a65a4a2321044d9c9ded49b083af0d7
+DIST sndpeek-1.4.tgz 311174 SHA256 2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb WHIRLPOOL a11d2b75f0814643ad75b1b2da7bbd5876a2d1daececc776a3d562ecbdc3fe1c17957e1c479a6df7e8265ad862ed13615e80ada0beddd34c4b999e01b3f0abe0
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 0000000..524b0bd
--- /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 0000000..9822434
--- /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
diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.4.ebuild
new file mode 100644
index 0000000..5c4cdc3
--- /dev/null
+++ b/media-sound/sndpeek/sndpeek-1.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="real-time audio visualization"
+HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
+SRC_URI="http://soundlab.cs.princeton.edu/software/${PN}/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack oss"
+
+RDEPEND="media-libs/freeglut
+ virtual/opengl
+ virtual/glu
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXext
+ media-libs/libsndfile
+ jack? ( media-sound/jack-audio-connection-kit )
+ alsa? ( media-libs/alsa-lib )
+ app-eselect/eselect-sndpeek"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.3-makefile.patch \
+ "${FILESDIR}"/${P}-gcc.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
+}
+
+pkg_setup() {
+ if ! use alsa && ! use jack && ! use oss; then
+ eerror "One of the following USE flags is needed: jack, alsa or oss"
+ die "Please set one audio engine type"
+ fi
+}
+
+compile_backend() {
+ backend=$1
+ cd "${S}/src/sndpeek"
+ einfo "Compiling against ${backend}"
+ emake -f "makefile.${backend}" CC=$(tc-getCC) \
+ CXX=$(tc-getCXX) || die "emake failed"
+ mv sndpeek{,-${backend}}
+ emake -f "makefile.${backend}" clean
+ cd -
+}
+
+src_compile() {
+ use alsa && compile_backend alsa
+ use jack && compile_backend jack
+ use oss && compile_backend oss
+}
+
+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
+}
+
+pkg_postinst() {
+ elog "Sndpeek now can use many audio engines, so you can specify audio engine"
+ elog "with sndpeek-{jack,alsa,oss}"
+ elog "Or you can use 'eselect sndpeek' to set the audio engine"
+
+ einfo "Calling eselect sndpeek update..."
+ eselect sndpeek update --if-unset
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/sndpeek/, media-sound/sndpeek/files/
@ 2015-08-28 0:57 Manuel Rüger
0 siblings, 0 replies; 3+ messages in thread
From: Manuel Rüger @ 2015-08-28 0:57 UTC (permalink / raw
To: gentoo-commits
commit: bab476943fa6331d335022fc20da707721b4600f
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 00:56:51 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 00:56:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab47694
media-sound/sndpeek: Remove old
Package-Manager: portage-2.2.20.1
media-sound/sndpeek/Manifest | 1 -
.../sndpeek/files/sndpeek-1.3-gcc-4.3.patch | 26 --------
.../sndpeek/files/sndpeek-1.3-gcc-4.4.patch | 11 ----
media-sound/sndpeek/sndpeek-1.3-r2.ebuild | 73 ----------------------
4 files changed, 111 deletions(-)
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 61b5771..6c2d425 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,2 +1 @@
-DIST sndpeek-1.3.tgz 298983 SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08 SHA512 0642400f8e806ab8ffac73b2cd92593feb5032c63b825899982b7ebafd770d53bb43b940a74d8fa0962ddd730b404bf8c842114a9f64234adddee5ae990ae9d4 WHIRLPOOL 088a05a7ea947c45f895bb3e0ad3bd3da439b8282b92f69a58e84e07e65db873a2a54bb0b6856903e833f21354e112711a65a4a2321044d9c9ded49b083af0d7
DIST sndpeek-1.4.tgz 311174 SHA256 2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb WHIRLPOOL a11d2b75f0814643ad75b1b2da7bbd5876a2d1daececc776a3d562ecbdc3fe1c17957e1c479a6df7e8265ad862ed13615e80ada0beddd34c4b999e01b3f0abe0
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch
deleted file mode 100644
index dcaa930..0000000
--- a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru sndpeek-1.3~/src/marsyas/LPC.h sndpeek-1.3/src/marsyas/LPC.h
---- sndpeek-1.3~/src/marsyas/LPC.h 2008-06-28 12:37:05.000000000 +0200
-+++ sndpeek-1.3/src/marsyas/LPC.h 2008-06-28 12:37:15.000000000 +0200
-@@ -35,7 +35,7 @@
- #include "MagFFT.h"
- #include "fvec.h"
- #include "fmatrix.h"
--#include <math.h>
-+#include <cstdlib>
- #include "AutoCorrelation.h"
- #include "MarSignal.h"
-
-diff -ru sndpeek-1.3~/src/sndpeek/RtAudio.h sndpeek-1.3/src/sndpeek/RtAudio.h
---- sndpeek-1.3~/src/sndpeek/RtAudio.h 2008-06-28 12:37:05.000000000 +0200
-+++ sndpeek-1.3/src/sndpeek/RtAudio.h 2008-06-28 12:37:15.000000000 +0200
-@@ -43,8 +43,9 @@
- #define __RTAUDIO_H
-
- #include "RtError.h"
--#include <string>
-+#include <cstring>
- #include <vector>
-+#include <cstdlib>
- using namespace std;
-
- // Operating system dependent thread functionality.
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
deleted file mode 100644
index d92bcdd..0000000
--- a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp sndpeek-1.3/src/sndpeek/RtAudio.cpp
---- sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp 2006-01-14 01:38:54.000000000 +0200
-+++ sndpeek-1.3/src/sndpeek/RtAudio.cpp 2009-06-06 10:58:48.000000000 +0300
-@@ -40,6 +40,7 @@
- // RtAudio: Version 3.0.1, 22 March 2004
-
- #include "RtAudio.h"
-+#include <cstdio>
- #include <iostream>
-
- // Static variable definitions.
diff --git a/media-sound/sndpeek/sndpeek-1.3-r2.ebuild b/media-sound/sndpeek/sndpeek-1.3-r2.ebuild
deleted file mode 100644
index 9d7a405..0000000
--- a/media-sound/sndpeek/sndpeek-1.3-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="real-time audio visualization"
-HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
-SRC_URI="http://soundlab.cs.princeton.edu/software/${PN}/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack oss"
-
-RDEPEND="media-libs/freeglut
- virtual/opengl
- virtual/glu
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXext
- media-libs/libsndfile
- jack? ( media-sound/jack-audio-connection-kit )
- alsa? ( media-libs/alsa-lib )
- app-eselect/eselect-sndpeek"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-gcc-4.3.patch \
- "${FILESDIR}"/${P}-gcc-4.4.patch
-}
-
-pkg_setup() {
- if ! use alsa && ! use jack && ! use oss; then
- eerror "One of the following USE flags is needed: jack, alsa or oss"
- die "Please set one audio engine type"
- fi
-}
-
-compile_backend() {
- backend=$1
- cd "${S}/src/sndpeek"
- einfo "Compiling against ${backend}"
- emake -f "makefile.${backend}" CC=$(tc-getCC) \
- CXX=$(tc-getCXX) || die "emake failed"
- mv sndpeek{,-${backend}}
- emake -f "makefile.${backend}" clean
- cd -
-}
-
-src_compile() {
- use alsa && compile_backend alsa
- use jack && compile_backend jack
- use oss && compile_backend oss
-}
-
-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
-}
-
-pkg_postinst() {
- elog "Sndpeek now can use many audio engines, so you can specify audio engine"
- elog "with sndpeek-{jack,alsa,oss}"
- elog "Or you can use 'eselect sndpeek' to set the audio engine"
-
- einfo "Calling eselect sndpeek update..."
- eselect sndpeek update --if-unset
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/sndpeek/, media-sound/sndpeek/files/
@ 2020-08-09 12:09 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-08-09 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 797e0935c6550fd7a344f3187418f8666156d5d1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 12:08:50 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 12:09:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797e0935
media-sound/sndpeek: respecting CFLAGS + removed unused patches
Closes: https://bugs.gentoo.org/736493
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../sndpeek/files/sndpeek-1.3-makefile.patch | 296 ---------------------
.../sndpeek/files/sndpeek-1.4-ldflags.patch | 65 -----
.../sndpeek/files/sndpeek-1.41-makefile.patch | 135 +++++-----
...{sndpeek-1.41.ebuild => sndpeek-1.41-r1.ebuild} | 0
4 files changed, 72 insertions(+), 424 deletions(-)
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 9b17c99e146..00000000000
--- 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 9822434b263..00000000000
--- 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
index 4a1472f11da..9dc4fa06d10 100644
--- a/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
+++ b/media-sound/sndpeek/files/sndpeek-1.41-makefile.patch
@@ -1,5 +1,5 @@
diff --git a/src/sndpeek/makefile.alsa b/src/sndpeek/makefile.alsa
-index a0f76ba..1b7a21f 100644
+index a0f76ba..e50cf82 100644
--- a/src/sndpeek/makefile.alsa
+++ b/src/sndpeek/makefile.alsa
@@ -1,10 +1,10 @@
@@ -12,95 +12,98 @@ index a0f76ba..1b7a21f 100644
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
++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,55 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.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) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
DownSampler.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Flux.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
LPC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MFCC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
RMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Rolloff.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
System.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fvec.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
AutoCorrelation.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Communicator.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Hamming.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MagFFT.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
NormRMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MarSignal.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fmatrix.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
.o: $*.h
-@@ -68,7 +68,7 @@ fmatrix.o:
+@@ -68,7 +71,7 @@ fmatrix.o:
$(CC) $(CFLAGS) $*.c
.cpp.o: $*.h $*.cpp
- $(CC) $(CFLAGS) $*.cpp
-+ $(CXX) $(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..86be1e7 100644
+index ec15276..70fa6e3 100644
--- a/src/sndpeek/makefile.jack
+++ b/src/sndpeek/makefile.jack
@@ -1,8 +1,8 @@
@@ -111,94 +114,97 @@ index ec15276..86be1e7 100644
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
++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,55 @@ 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) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
DownSampler.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Flux.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
LPC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MFCC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
RMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Rolloff.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
System.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fvec.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
AutoCorrelation.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Communicator.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Hamming.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MagFFT.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
NormRMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MarSignal.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fmatrix.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
.o: $*.h
-@@ -67,7 +67,7 @@ fmatrix.o:
+@@ -67,7 +70,7 @@ fmatrix.o:
$(CC) $(CFLAGS) $*.c
.cpp.o: $*.h $*.cpp
- $(CC) $(CFLAGS) $*.cpp
-+ $(CXX) $(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..d5768aa 100644
+index f092df2..3ef005c 100644
--- a/src/sndpeek/makefile.oss
+++ b/src/sndpeek/makefile.oss
@@ -1,8 +1,8 @@
@@ -209,89 +215,92 @@ index f092df2..d5768aa 100644
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
++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,55 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.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) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
DownSampler.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Flux.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
LPC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MFCC.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
RMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Rolloff.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
System.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fvec.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
AutoCorrelation.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Communicator.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
Hamming.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MagFFT.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
NormRMS.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
MarSignal.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
fmatrix.o:
- $(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+ $(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
.o: $*.h
-@@ -68,7 +68,7 @@ fmatrix.o:
+@@ -68,7 +71,7 @@ fmatrix.o:
$(CC) $(CFLAGS) $*.c
.cpp.o: $*.h $*.cpp
- $(CC) $(CFLAGS) $*.cpp
-+ $(CXX) $(CFLAGS) $*.cpp
++ $(CXX) $(CFLAGS_MAIN) $(CFLAGS) $*.cpp
clean:
rm -f sndpeek *~ *.o
diff --git a/media-sound/sndpeek/sndpeek-1.41.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
similarity index 100%
rename from media-sound/sndpeek/sndpeek-1.41.ebuild
rename to media-sound/sndpeek/sndpeek-1.41-r1.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-09 12:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-09 12:09 [gentoo-commits] repo/gentoo:master commit in: media-sound/sndpeek/, media-sound/sndpeek/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2015-08-28 0:57 Manuel Rüger
2015-08-25 14:13 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox