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.

Package-Manager: portage-2.1.5_rc5

4 files changed, 106 insertions, 4 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/Manifest b/media-sound/amsynth/Manifest
index 6097224458b3..645eaf778736 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amsynth-1.0.0-ALSAMidiDriver.patch 269 RMD160 3aba3ee27cd407d0ba7c2ee4b656fd6896672241 SHA1 07cf4ca55e7f84661f4c7c35d54b893477c2a9aa SHA256 c24473566db3d831ef99c3c714efc6361c6b5e6e19750b3a3f3cc8b9f7c251fa
 AUX amsynth-1.1.0-gcc4.patch 299 RMD160 72f7a718fc56d317ff2a42e8605436588ec0e00f SHA1 7af0871940c6d21424b7d9e9bddf5d7a33a86165 SHA256 1804f340feda5ef3e9563ddceb0294f2a38dd7a7827f15ebf643269c477d2c51
+AUX amsynth-1.2.0+gcc-4.3.patch 2053 RMD160 f95c85ee18b3106bb332ffaa1126016f7d49de41 SHA1 d6f7146370b1efedc91af473afbeb4a0c072f51b SHA256 e8f8bd2d5575aed85e3eafd1eae52a2f8292c3cef73dc1289fcfdbc0d8698729
 AUX amsynth-1.2.0-asneeded.patch 1326 RMD160 b162bafcca8924540960c1b85c6080f19bdbabaf SHA1 d40428cda5af6df537cb4e5f22587d97ecfec88a SHA256 39c4cf8de92dcce9e90eda336bf545876207cf070e1be6573e3c2368a1579d06
 AUX amsynth-1.2.0-cflags.patch 542 RMD160 9725b28818b7cc6c7d4090ba1aea2dadecd5d1e7 SHA1 4725f56e6e946623fa9e043a481a8e4c54fb360e SHA256 463c6f9df0084d398e37783d25e95340ce3029660e221f68842b06aef08e3a5d
 AUX amsynth-1.2.0-debug.patch 1526 RMD160 85303509b7e400b892cf4b29ef54e1125908861a SHA1 d8909b260396771c78fe1ab4e351375eb4001698 SHA256 87c5de38991eae846f8c202e649d5cfc05c69daae1c2b6e8b88ace2ca66d13b5
@@ -10,6 +14,13 @@ DIST amSynth-1.2.0.tar.gz 616311 RMD160 b24b493e1532f3b1ad574856cfaadf8418e32900
 EBUILD amsynth-1.0.0-r1.ebuild 1576 RMD160 e70648983cf3d1a74459b25f0507a9bfe59b762c SHA1 c28d7bdbd06d2c5b1470b084e22f942a43be473a SHA256 082ea1b069ef4be11d9163491afe000d6aa219f430d4f52e4c6e841efc18a2fd
 EBUILD amsynth-1.0.0.ebuild 1525 RMD160 e4566dab35d6a4008aa7767ff3f616c99384b286 SHA1 6cff904687671fe718db9a40309cd70135cbc0a9 SHA256 36e2ecf2ee117ad500fad41f8a217eed280e1046bc17ec4ea9e22978c19de43f
 EBUILD amsynth-1.1.0.ebuild 1403 RMD160 b8a13eff10f37644744fa9623d11459cf3a09539 SHA1 11c4788f4cc3d59990df05b3b6d0dd2e3f842502 SHA256 e826c7c52891f8d0cad3f848412884bff43edc99aeae82956d0dc34fdf4ff65e
-EBUILD amsynth-1.2.0.ebuild 1610 RMD160 238de8188c1a3f3e97934b836cf4977482db52e2 SHA1 e18ae6d49668a7c48dae9afcfec39522d40aecef SHA256 6533303b00cd16c5207697f603a953f32cd419cda7875fe6c56f81345fc8fce7
-MISC ChangeLog 3361 RMD160 c436a04831f7202708f283d7bf1a9bbf6be87a32 SHA1 09c0d9b9bbb4aaf00ba95b5b83c088aca3dc962a SHA256 c4a968816ad8cd5b8b2acc92a5cbf8aebfa3293ea13afdf9b29b376aa073d4d8
+EBUILD amsynth-1.2.0.ebuild 1950 RMD160 300901d98e1c160f73cdd35cc687fa6c214e8406 SHA1 85e6c6e28177ab08e9432a74e66ffc80aefc8c04 SHA256 167e5a38ce3d6cef7388d08c0995dd63c8b000a474c7ac1ed28f6b343caff471
+MISC ChangeLog 3628 RMD160 2b6e68d327ca25cb84deb7876c2c4b17d377dc36 SHA1 7f949940f7cd0c803844600d1591a0c77ad5e837 SHA256 79167063865dc3dfdb4a86d98c702368a20f5c7f843fdc2d4937f9ce120c9c40
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgLgswACgkQAiZjviIA2Xi9RQCeKyGXeoltxd4YL5E5+PUZLA/b
+E20AoJ1zV5RTU123HNR29fdu9cR0ErFv
+=pEkp
+-----END PGP SIGNATURE-----
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>
+