Add patch for gcc-4.3 for bug #229211

Package-Manager: portage-2.1.4.4

4 files changed, 101 insertions, 2 deletions

diff --git a/media-sound/sndpeek/ChangeLog b/media-sound/sndpeek/ChangeLog
index a3b515edfa30..d9966907e689 100644
--- a/media-sound/sndpeek/ChangeLog
+++ b/media-sound/sndpeek/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/sndpeek
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/ChangeLog,v 1.2 2008/04/05 10:41:09 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/ChangeLog,v 1.3 2008/06/28 10:45:42 cedk Exp $
+
+*sndpeek-1.3-r1 (28 Jun 2008)
+
+  28 Jun 2008; Cédric Krier <cedk@gentoo.org>
+  +files/sndpeek-1.3-gcc-4.3.patch, +sndpeek-1.3-r1.ebuild:
+  Add patch for gcc-4.3 for bug #229211
 
   05 Apr 2008; Cédric Krier <cedk@gentoo.org>
   files/sndpeek-1.3-makefile.patch:
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 77b533c8d999..f580d5d25b58 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,5 +1,7 @@
+AUX sndpeek-1.3-gcc-4.3.patch 831 RMD160 0f77883203a18c88a206fc32f94f0e778f3bdaab SHA1 f2e75b0381181c36f9aabe84c106aecfb8eb0fa1 SHA256 07ca504403485e4d9f03ab62ada02e17d3e48af42f7c5b24fa3bfa3539232e36
 AUX sndpeek-1.3-makefile.patch 7578 RMD160 3cb1ccd318fc11710ab34dcaf2dc621f888ed53b SHA1 e82eae70cbe7d677857dab5868446405fa934c6a SHA256 fc7fcb83c2d8063b161dd73f0ba5255e2822250818ca9c3d11a78652ca6958e5
 DIST sndpeek-1.3.tgz 298983 RMD160 cec1696a6b5e26551748fc7e6230baa2bd77edc2 SHA1 16291c1cc595068150d4c2a9075982d9bed5416e SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08
+EBUILD sndpeek-1.3-r1.ebuild 1583 RMD160 ebf20c9cd2efe8c40e78eea6b1926c6079ed1f5e SHA1 88cd099d8d1e164aea3374521e4a0b422031a46d SHA256 5b3fe676ed7e14ceb7905e25c249dedda2eda4746c337b4511423a26661e3656
 EBUILD sndpeek-1.3.ebuild 1539 RMD160 f68ba13b1931ed10cf9502cb8e2aced3f026a2d7 SHA1 57a497a9d5e461e0b41a31e2f272d92d8cc31761 SHA256 c754dbbcdf543934942208f44422ac69bcba96280b853d1423cd78e8991c3d26
-MISC ChangeLog 498 RMD160 14b6c2823a45c0a407c5fd0adb8227fe2e4e65ed SHA1 bfee72305bd5c68f862def5553c9d13d5bc88a30 SHA256 e096d8d92a95cdc7a08a6c7085550d5970c82459e50e26fd247613598205167e
+MISC ChangeLog 677 RMD160 81e26a46420e1a12ef514a583bd68e133299892c SHA1 d428f37dd094fb995a5788adcc312b33d6af2da4 SHA256 82334432959641a66c75afa4af29bee5e335d8994754532ad9a8b24b400a65fc
 MISC metadata.xml 334 RMD160 0d5ac0f00b7f4fbdaab75bf8702a37276d53f1f0 SHA1 a66c874258738edb7dfa0050fa5233b1cd1b2c61 SHA256 ab94c9c3418d1cc5778593b4c3a3c703c7ee4ce652985bdc3c681ff8a3fcc9f1
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
new file mode 100644
index 000000000000..dcaa930440d4
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch
@@ -0,0 +1,26 @@
+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/sndpeek-1.3-r1.ebuild b/media-sound/sndpeek/sndpeek-1.3-r1.ebuild
new file mode 100644
index 000000000000..b6ca0e73b1f1
--- /dev/null
+++ b/media-sound/sndpeek/sndpeek-1.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/sndpeek-1.3-r1.ebuild,v 1.1 2008/06/28 10:45:42 cedk Exp $
+
+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="~x86"
+IUSE="oss jack alsa"
+
+DEPEND="virtual/glut
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXext
+	jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
+pkg_setup() {
+	local cnt=0
+	use jack && cnt="$((${cnt} + 1))"
+	use alsa && cnt="$((${cnt} + 1))"
+	use oss && cnt="$((${cnt} + 1))"
+	if [[ "${cnt}" -eq 0 ]]; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set one audio engine type"
+	elif [[ "${cnt}" -ne 1 ]]; then
+		ewarn "You have set ${P} to use multiple audio engine."
+	fi
+}
+
+src_compile() {
+	cd "${S}/src/sndpeek"
+
+	local backend
+	if use jack; then
+		backend="jack"
+	elif use alsa; then
+		backend="alsa"
+	elif use oss; then
+		backend="oss"
+	fi
+	einfo "Compiling against ${backend}"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
+}
+
+src_install() {
+	dobin src/sndpeek/sndpeek
+
+	dodoc AUTHORS README THANKS TODO VERSIONS
+}