version bump

(Portage version: 2.2_rc36/cvs/Linux x86_64)

4 files changed, 150 insertions, 1 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 0ed6fa667978..52b4ab39e96e 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.33 2009/08/01 06:41:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.34 2009/08/10 07:28:00 aballier Exp $
+
+*zynaddsubfx-2.4.0 (10 Aug 2009)
+
+  10 Aug 2009; Alexis Ballier <aballier@gentoo.org>
+  +zynaddsubfx-2.4.0.ebuild, +files/zynaddsubfx-2.4.0-ldflags.patch,
+  +files/zynaddsubfx-2.4.0-string.patch:
+  version bump
 
   01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   zynaddsubfx-2.2.1-r2.ebuild, zynaddsubfx-2.2.1-r4.ebuild:
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch
new file mode 100644
index 000000000000..13f9a7a31956
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch
@@ -0,0 +1,16 @@
+Index: ZynAddSubFX-2.4.0/src/Makefile
+===================================================================
+--- ZynAddSubFX-2.4.0.orig/src/Makefile
++++ ZynAddSubFX-2.4.0/src/Makefile
+@@ -101,9 +101,9 @@ else
+ 
+ 
+ ifeq ($(OS_PORT),LINUX) 
+-	$(CXX) -o zynaddsubfx */*.o *.o $(LIBS)
++	$(CXX) $(LDFLAGS) -o zynaddsubfx */*.o *.o $(LIBS)
+ else
+-	$(CXX) -o zynaddsubfx.exe */*.o *.o $(LIBS)
++	$(CXX) $(LDFLAGS) -o zynaddsubfx.exe */*.o *.o $(LIBS)
+ endif 
+ endif
+ endif
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch
new file mode 100644
index 000000000000..d901d4981c01
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch
@@ -0,0 +1,20 @@
+https://sourceforge.net/tracker/?func=detail&atid=502314&aid=2834750&group_id=62934
+
+Index: ZynAddSubFX-2.4.0/src/main.cpp
+===================================================================
+--- ZynAddSubFX-2.4.0.orig/src/main.cpp
++++ ZynAddSubFX-2.4.0/src/main.cpp
+@@ -210,11 +210,11 @@ void *thread3(void *arg)
+         string filename;
+         switch (lash->checkevents(filename)) {
+         case LASHClient::Save:
+-            ui->do_save_master(filename);
++            ui->do_save_master(filename.c_str());
+             lash->confirmevent(LASHClient::Save);
+             break;
+         case LASHClient::Restore:
+-            ui->do_load_master(filename);
++            ui->do_load_master(filename.c_str());
+             lash->confirmevent(LASHClient::Restore);
+             break;
+         case LASHClient::Quit:
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
new file mode 100644
index 000000000000..3bdff26dd6fc
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild,v 1.1 2009/08/10 07:28:00 aballier Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+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 ~ppc ~x86"
+
+IUSE="oss alsa jack lash +fltk"
+
+RDEPEND="fltk? ( >=x11-libs/fltk-1.1.2:1.1 )
+	=sci-libs/fftw-3*
+	jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( media-libs/alsa-lib )
+	lash? ( media-sound/lash )
+	>=dev-libs/mini-xml-2.2.1"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e '/CXXFLAGS +=/s:CXXFLAGS +=:override CXXFLAGS +=:' \
+		-e '/export CXXFLAGS/d' \
+		-e '/\$(MAKE) -C UI/s:$: CXXFLAGS="${CXXFLAGS}":' \
+		-e '/\$(MAKE) -C $@/s:$: CXXFLAGS="${CXXFLAGS}":' \
+		"${S}/src/Makefile" || die "unable to reset CXXFLAGS overrides."
+	sed -e 's/gcc -g/$(CC) $(CFLAGS)/' \
+		-e 's/gcc -o/$(CC) $(LDFLAGS) -o/' \
+		-i "${S}/ExternalPrograms/Spliter/Makefile" || die
+	sed -e 's/gcc -o/$(CC) $(LDFLAGS) -o/' \
+		-e 's/gcc/$(CC) $(CFLAGS)/' \
+		-i "${S}/ExternalPrograms/Controller/Makefile" || die
+	epatch "${FILESDIR}/${P}-string.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+use_echo_yesno() {
+	if use $1 ; then
+		echo "YES"
+	else
+		echo "NO"
+	fi
+}
+
+src_configure() {
+	cd "${S}/src"
+	echo "OS_PORT=LINUX" > Makefile.inc
+	echo "FFTW_VERSION=3" >> Makefile.inc
+	echo "ASM_F2I=NO" >> Makefile.inc
+	echo "DISABLE_GUI=$(use_echo_yesno !fltk)" >> Makefile.inc
+	if use oss ; then
+		use alsa || echo "MIDIIN=OSS" >> Makefile.inc
+		if use jack; then
+			echo "AUDIOOUT=OSS_AND_JACK" >> Makefile.inc
+		else
+			echo "AUDIOOUT=OSS" >> Makefile.inc
+		fi
+	else
+		if use jack; then
+			echo "AUDIOOUT=JACK" >> Makefile.inc
+		else
+			echo "AUDIOOUT=NONE" >> Makefile.inc
+		fi
+	fi
+	if use alsa ;  then
+		echo "MIDIIN=ALSA" >> Makefile.inc
+	else
+		use oss || echo "MIDIIN=NONE" >> Makefile.inc
+	fi
+	echo "LINUX_USE_LASH=$(use_echo_yesno lash)" >> Makefile.inc
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	cd "${S}/src"
+	emake -j1 \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		|| die "compile failed"
+	if use fltk ; then
+		cd "${S}/ExternalPrograms/Spliter"
+		emake || die
+		cd "${S}/ExternalPrograms/Controller"
+		emake || die
+	fi
+}
+
+src_install() {
+	dobin "${S}/src/zynaddsubfx"
+	use fltk && dobin "${S}/ExternalPrograms/Spliter/spliter"
+	use fltk && dobin "${S}/ExternalPrograms/Controller/controller"
+	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
+
+	insinto "/usr/share/${PN}"
+	doins -r "${S}/banks" "${S}/examples"
+}