typo fftw-2* to be fftw-3* per bug #70285.

6 files changed, 104 insertions, 14 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index cceef7381546..42c45628eb49 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.17 2004/12/19 06:58:46 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.18 2005/01/09 03:43:10 jnc Exp $
+
+*zynaddsubfx-2.1.1-r1 (08 Jan 2005)
+
+  08 Jan 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.1.1-r1.ebuild:
+  typo fftw-2* to be fftw-3* per bug #70285.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   zynaddsubfx-2.1.1.ebuild:
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 2712e69e568f..96fdb56e8b73 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,15 +1,17 @@
-MD5 49554e8601bedad3de8ca011edf00138 zynaddsubfx-1.4.3.ebuild 1140
-MD5 407fbdd212eb7654407a3ac1e11929a3 zynaddsubfx-2.1.1.ebuild 2041
 MD5 7ef8ce93e7d321a22ce7b9d0457dd864 ChangeLog 3161
 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
+MD5 49554e8601bedad3de8ca011edf00138 zynaddsubfx-1.4.3.ebuild 1140
+MD5 407fbdd212eb7654407a3ac1e11929a3 zynaddsubfx-2.1.1.ebuild 2041
+MD5 e1c18f569231b1c1017c8212b3095586 zynaddsubfx-2.1.1-r1.ebuild 2041
+MD5 7eb2c2f2ba9a5bf80ce3945bbbeb803c files/digest-zynaddsubfx-1.4.3 69
+MD5 231dd10bada5a14518a5c47ce9ca2920 files/digest-zynaddsubfx-2.1.1 70
+MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.0.patch 2050
 MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.2.patch 2050
-MD5 41af4c94f32d7ced5e6a7966a68fbea0 files/zynaddsubfx-2.1.1-sanitize_makefile.patch 554
 MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.3.patch 2050
 MD5 a67819493977e20890a96bf84836e319 files/zynaddsubfx-2.0.0.patch 12720
 MD5 3a9cf8fb487fa84f9d81a7046ef6176f files/zynaddsubfx-2.1.1-fltk_flags.patch 1508
-MD5 b4ed2c2e9a47c4a32f9ebd7c92c6f1b1 files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch 3699
-MD5 7eb2c2f2ba9a5bf80ce3945bbbeb803c files/digest-zynaddsubfx-1.4.3 69
-MD5 231dd10bada5a14518a5c47ce9ca2920 files/digest-zynaddsubfx-2.1.1 70
-MD5 0d5966c1bb944f5474326706fee29e0d files/zynaddsubfx-2.1.1-gcc34_no_sse.patch 495
-MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.0.patch 2050
 MD5 5f8f148faeaa1e1fa03f084a40515aa4 files/zynaddsubfx-2.1.1-fltk_version.patch 10611
+MD5 0d5966c1bb944f5474326706fee29e0d files/zynaddsubfx-2.1.1-gcc34_no_sse.patch 495
+MD5 b4ed2c2e9a47c4a32f9ebd7c92c6f1b1 files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch 3699
+MD5 41af4c94f32d7ced5e6a7966a68fbea0 files/zynaddsubfx-2.1.1-sanitize_makefile.patch 554
+MD5 231dd10bada5a14518a5c47ce9ca2920 files/digest-zynaddsubfx-2.1.1-r1 70
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1
new file mode 100644
index 000000000000..9b2441e6179d
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1
@@ -0,0 +1 @@
+MD5 a078a85fc140bad8da6dd8114b9e5f41 ZynAddSubFX-2.1.1.tar.bz2 784495
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-1.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-1.4.3.ebuild
index 4b958e171fc4..ad411d64658d 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-1.4.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-1.4.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/zynaddsubfx/zynaddsubfx-1.4.3.ebuild,v 1.9 2004/12/29 02:57:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-1.4.3.ebuild,v 1.10 2005/01/09 03:43:10 jnc Exp $
 
 inherit eutils
 
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.1.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..523e0b8c25eb
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.1.1-r1.ebuild,v 1.1 2005/01/09 03:43:10 jnc Exp $
+
+inherit eutils
+
+MY_P=ZynAddSubFX-${PV}
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+#IUSE="oss alsa jack mmx"
+IUSE="oss alsa jack"
+
+DEPEND=">=x11-libs/fltk-1.1.2
+	=sci-libs/fftw-3*
+	media-sound/jack-audio-connection-kit
+	>=dev-libs/mini-xml-2.0"
+#	portaudio? ( media-libs/portaudio )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2 || die
+	epatch ${FILESDIR}/${P}-*.patch
+}
+
+src_compile() {
+	local FFTW_VERSION=3
+	local ASM_F2I=NO
+	local LINUX_MIDIIN=NONE
+	local LINUX_AUDIOOUT=NONE
+
+	if use oss ; then
+		LINUX_MIDIIN=OSS
+		LINUX_AUDIOOUT=OSS
+		use jack && LINUX_AUDIOOUT=OSS_AND_JACK
+	else
+		use jack && LINUX_AUDIOOUT=JACK
+	fi
+
+	use alsa && LINUX_MIDIIN=ALSA
+#	use portaudio && LINUX_AUDIOOUT=PA
+#	use mmx && ASM_F2I=YES
+
+	cd ${S}/src
+	make \
+		FFTW_VERSION=${FFTW_VERSION} \
+		ASM_F2I=${ASM_F2I} \
+		LINUX_MIDIIN=${LINUX_MIDIIN} \
+		LINUX_AUDIOOUT=${LINUX_AUDIOOUT} \
+		|| die "compile failed"
+	cd ${S}/ExternalPrograms/Spliter
+	./compile.sh
+	cd ${S}/ExternalPrograms/Controller
+	./compile.sh
+}
+
+src_install() {
+	dobin ${S}/src/zynaddsubfx
+	dobin ${S}/ExternalPrograms/Spliter/spliter
+	dobin ${S}/ExternalPrograms/Controller/controller
+	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
+
+	for i in "Arpeggios" "Bass" "Brass" "Choir and Voice" "Drums" \
+			 "Dual" "Fantasy" "Guitar" "Misc" "Noises" "Organ" \
+			 "Pads" "Plucked" "Reed and Wind" "Rhodes" "Splited" \
+			 "Strings" "Synth" "SynthPiano"
+	do
+		insinto "/usr/share/${PN}/banks/${i}"
+		doins "${S}/banks/${i}/"*
+	done
+
+	insinto /usr/share/${PN}/presets
+	doins "${S}/presets/"*
+	insinto /usr/share/${PN}
+	doins "${S}/examples/"*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild
index 4676002a5597..9792e8651b8f 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.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/zynaddsubfx/zynaddsubfx-2.1.1.ebuild,v 1.4 2004/12/29 02:57:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild,v 1.5 2005/01/09 03:43:10 jnc Exp $
 
 inherit eutils