Add a check for midi USE flag on alsa-lib needed to build, thanks to Patrick for reporting in bug #216890. Also add a patch to build with GCC 4.3.

(Portage version: 2.1.5_rc5)

3 files changed, 93 insertions, 2 deletions

diff --git a/media-sound/amsynth/ChangeLog b/media-sound/amsynth/ChangeLog
index 18d0fee67b50..204bdeb2e543 100644
--- a/media-sound/amsynth/ChangeLog
+++ b/media-sound/amsynth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amsynth
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.25 2008/01/14 12:50:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.26 2008/04/20 17:52:06 flameeyes Exp $
+
+  20 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amsynth-1.2.0+gcc-4.3.patch, amsynth-1.2.0.ebuild:
+  Add a check for midi USE flag on alsa-lib needed to build, thanks to
+  Patrick for reporting in bug #216890. Also add a patch to build with GCC
+  4.3.
 
   14 Jan 2008; Diego Pettenò <flameeyes@gentoo.org> amsynth-1.2.0.ebuild:
   Add missing pkg-config dependency. Thanks to Patrick in bug #205700.
diff --git a/media-sound/amsynth/amsynth-1.2.0.ebuild b/media-sound/amsynth/amsynth-1.2.0.ebuild
index 3f5c9920ae4f..1b157c3c91c5 100644
--- a/media-sound/amsynth/amsynth-1.2.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.0.ebuild,v 1.3 2008/01/14 12:50:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.0.ebuild,v 1.4 2008/04/20 17:52:06 flameeyes Exp $
 
 IUSE="debug alsa jack sndfile oss"
 
@@ -26,6 +26,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build Fluidsynth with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -33,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-asneeded.patch"
 	epatch "${FILESDIR}/${P}-cflags.patch"
 	epatch "${FILESDIR}/${P}-debug.patch"
+	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
 	eautoreconf
 }
 
diff --git a/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch b/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch
new file mode 100644
index 000000000000..cd49c9fefdd2
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch
@@ -0,0 +1,75 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=1947310&group_id=47275&atid=448967
+
+Index: amSynth-1.2.0/src/Config.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/Config.cc
++++ amSynth-1.2.0/src/Config.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <fstream>
+ #include <iostream>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+Index: amSynth-1.2.0/src/drivers/MidiInterface.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/drivers/MidiInterface.cc
++++ amSynth-1.2.0/src/drivers/MidiInterface.cc
+@@ -8,6 +8,7 @@
+ #include "OSSMidiDriver.h"
+ 
+ #include <iostream>
++#include <strings.h>
+ 
+ #define MIDI_BUF_SIZE 64
+ void sched_realtime (); // defined in main.cc
+Index: amSynth-1.2.0/src/GUI/PresetControllerView.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/GUI/PresetControllerView.cc
++++ amSynth-1.2.0/src/GUI/PresetControllerView.cc
+@@ -8,7 +8,6 @@
+ #include <stdio.h>
+ #include <iostream>
+ 
+-using SigC::slot;
+ using sigc::bind;
+ using std::cout;
+ using namespace std;
+Index: amSynth-1.2.0/src/MidiController.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/MidiController.cc
++++ amSynth-1.2.0/src/MidiController.cc
+@@ -8,6 +8,7 @@
+ #ifdef _DEBUG
+ #include <iostream>
+ #endif
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+Index: amSynth-1.2.0/src/Parameter.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/Parameter.cc
++++ amSynth-1.2.0/src/Parameter.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "Parameter.h"
+ 
++#include <cstdlib>
++
+ #ifdef _DEBUG
+ #include <iostream>
+ #endif
+Index: amSynth-1.2.0/src/VoiceAllocationUnit.cc
+===================================================================
+--- amSynth-1.2.0.orig/src/VoiceAllocationUnit.cc
++++ amSynth-1.2.0/src/VoiceAllocationUnit.cc
+@@ -9,6 +9,7 @@
+ #include "Effects/Distortion.h"
+ 
+ #include <iostream>
++#include <cstring>
+ #include <math.h>
+ #include <assert.h>
+