Version bump. Included quickfix by Josh Green for crashes on amd64 (http://lists.nongnu.org/archive/html/fluid-dev/2005-07/msg00003.html)

Package-Manager: portage-2.0.51.22-r1

6 files changed, 103 insertions, 7 deletions

diff --git a/media-sound/fluidsynth/ChangeLog b/media-sound/fluidsynth/ChangeLog
index 1f7d14988dab..41b78d1b4b18 100644
--- a/media-sound/fluidsynth/ChangeLog
+++ b/media-sound/fluidsynth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/fluidsynth
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/ChangeLog,v 1.19 2005/04/08 17:30:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/ChangeLog,v 1.20 2005/07/11 19:41:43 fvdpol Exp $
+
+*fluidsynth-1.0.6 (11 Jul 2005)
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +files/fluidsynth-1.0.6.amd64.patch, +fluidsynth-1.0.6.ebuild:
+  Version bump. Included quickfix by Josh Green for crashes on amd64
+  (http://lists.nongnu.org/archive/html/fluid-dev/2005-07/msg00003.html)
 
   08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   fluidsynth-1.0.5.ebuild:
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 5d426ef0b215..f87f613c2a4e 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,20 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 52b07444270fe3dd94db963adb3686e1 ChangeLog 2605
-MD5 08f73bf08781a82851c5951630dc0de4 fluidsynth-1.0.3.ebuild 1653
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 00705e9c967054e0db107272a92ef82a fluidsynth-1.0.6.ebuild 1632
+MD5 b1ec0b159ee4b09353cd22add80ddbc4 fluidsynth-1.0.3.ebuild 1649
 MD5 4c8fbc12d12848250b73b2c72860ffcd fluidsynth-1.0.5.ebuild 1606
+MD5 8584c6baa0df131151da18bb2904afad ChangeLog 2898
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c1870b0eef4d2331c692f1206a55ac6d files/1.0.3-nonx86.patch 215
+MD5 ff3d9256f0b85633e9c7be266e877937 files/fluidsynth-1.0.6.amd64.patch 550
 MD5 751ab7ab31fc6b9ccf266a683545b750 files/digest-fluidsynth-1.0.3 68
 MD5 7f3eace12f38e061b55b4b207bc65184 files/digest-fluidsynth-1.0.5 68
-MD5 c1870b0eef4d2331c692f1206a55ac6d files/1.0.3-nonx86.patch 215
+MD5 fae86296e0239d950f90b2b6f170070a files/digest-fluidsynth-1.0.6 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0swNvpz1081QvMkRAt8LAJ9h9hUEVj22uIS3U9q2i8MW0JclbQCdGUUk
+XM0pmC47hxGhen10bVQAfxI=
+=TZWB
+-----END PGP SIGNATURE-----
diff --git a/media-sound/fluidsynth/files/digest-fluidsynth-1.0.6 b/media-sound/fluidsynth/files/digest-fluidsynth-1.0.6
new file mode 100644
index 000000000000..225235737409
--- /dev/null
+++ b/media-sound/fluidsynth/files/digest-fluidsynth-1.0.6
@@ -0,0 +1 @@
+MD5 f18fd54d3f877a547b8455d2b6c7b177 fluidsynth-1.0.6.tar.gz 1022289
diff --git a/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch b/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch
new file mode 100644
index 000000000000..f08652ec083e
--- /dev/null
+++ b/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch
@@ -0,0 +1,15 @@
+--- fluidsynth-1.0.6/src/fluidsynth_priv.h      2005-06-11 16:40:01.000000000 -0500

++++ fluidsynth-1.0.6-new/src/fluidsynth_priv.h  2005-07-06 00:38:10.000000000 -0500

+@@ -285,7 +285,12 @@

+  * As soon as proper alignment is supported by the compiler, this

+  * can be removed.

+  */

++#ifdef ENABLE_SSE

++/* FIXME - This is broken on AMD 64 - only used if SSE enabled */

+ #define FLUID_ALIGN16BYTE(ptr)(((int)(ptr)+15) & (~0xFL))

++#else

++#define FLUID_ALIGN16BYTE(ptr) ptr

++#endif

+

+ #if WITH_FTS

+ #define FLUID_PRINTF                 post

diff --git a/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild b/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
index 87f5f83c48d5..0f6ea1e78ff0 100644
--- a/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild,v 1.15 2004/09/03 17:17:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild,v 1.16 2005/07/11 19:41:43 fvdpol Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild
new file mode 100644
index 000000000000..ccaa55d91478
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild,v 1.1 2005/07/11 19:41:43 fvdpol Exp $
+
+IUSE="alsa jack sse ladcca static"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="IIWU Synth is a software real-time synthesizer based on the Soundfont 2 specifications."
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	media-libs/ladspa-sdk
+	alsa? ( media-libs/alsa-lib
+	        ladcca? ( >=media-libs/ladcca-0.3 ) )"
+
+# Alsa is required for ladcca support in this package.
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/fluidsynth-1.0.6.amd64.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-ladspa `use_enable jack jack-support` `use_enable static`"
+
+	if use alsa; then
+		myconf="${myconf} --enable-alsa `use_enable ladcca`"
+	else
+		myconf="${myconf} --disable-alsa --disable-ladcca"
+	fi
+
+	if use sse; then
+		myconf="--enable-SSE ${myconf}"
+		# If your CFLAGS include optimizations for sse, ie:
+		# -march=pentium4 -mfpmath=sse -msse2
+		# AND your USE flags include sse, ie: USE=sse,
+		# the sounds with fluidsynth will be distorted. 
+		if [ `is-flag "-march=pentium4"` ]; then
+			filter-flags "-msse2"
+			filter-flags "-mfpmath=sse"
+		fi
+	fi
+
+	econf ${myconf} || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README THANKS TODO
+}