version bump, port to rubberband 1.2 api, dont ignore cxxflags, fix build with asneeded, use wx 2.8

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)

5 files changed, 119 insertions, 1 deletions

diff --git a/media-sound/sooperlooper/ChangeLog b/media-sound/sooperlooper/ChangeLog
index fbca6c062bd1..4d119f2ec344 100644
--- a/media-sound/sooperlooper/ChangeLog
+++ b/media-sound/sooperlooper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/sooperlooper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/ChangeLog,v 1.13 2008/05/15 12:35:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/ChangeLog,v 1.14 2008/07/11 16:13:27 aballier Exp $
+
+*sooperlooper-1.6.5 (11 Jul 2008)
+
+  11 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sooperlooper-1.6.5-asneeded.patch,
+  +files/sooperlooper-1.6.5-cxxflags.patch,
+  +files/sooperlooper-1.6.5-rubberband12.patch, +sooperlooper-1.6.5.ebuild:
+  version bump, port to rubberband 1.2 api, dont ignore cxxflags, fix build
+  with asneeded, use wx 2.8
 
   15 May 2008; Markus Rothe <corsair@gentoo.org> sooperlooper-1.6.3.ebuild:
   Added ~ppc; bug #215033
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.6.5-asneeded.patch b/media-sound/sooperlooper/files/sooperlooper-1.6.5-asneeded.patch
new file mode 100644
index 000000000000..8a5a6820a7f7
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.6.5-asneeded.patch
@@ -0,0 +1,23 @@
+Index: work/aclocal/buildenv.m4
+===================================================================
+--- work.orig/aclocal/buildenv.m4
++++ work/aclocal/buildenv.m4
+@@ -32,5 +32,4 @@ BASE_LIBS="$SOOPERLOOPER_TOP/libs/midi++
+ BASE_INCLUDES="-I$SOOPERLOOPER_TOP/libs/pbd -I$SOOPERLOOPER_TOP/libs/midi++"
+ CFLAGS="$CFLAGS  -I$SOOPERLOOPER_TOP/libs/pbd -I$SOOPERLOOPER_TOP/libs/midi++"
+ CXXFLAGS="$CXXFLAGS -I$SOOPERLOOPER_TOP/libs/pbd -I$SOOPERLOOPER_TOP/libs/midi++"
+-LIBS="$LIBS $SOOPERLOOPER_TOP/libs/midi++/libmidipp.a $SOOPERLOOPER_TOP/libs/pbd/libpbd.a"
+ ])
+Index: work/sooperlooper-1.6.5/src/gui/Makefile.am
+===================================================================
+--- work.orig/sooperlooper-1.6.5/src/gui/Makefile.am
++++ work/sooperlooper-1.6.5/src/gui/Makefile.am
+@@ -11,7 +11,7 @@ bin_PROGRAMS =  slgui
+ 
+ AM_CXXFLAGS = -I.. @LOSC_CFLAGS@ @SIGCPP_CFLAGS@ @XML_CFLAGS@ @WX_CFLAGS@
+ 
+-slgui_LDADD = ../libslcore.a  @LOSC_LIBS@ @WX_LIBS@ @SIGCPP_LIBS@ @XML_LIBS@
++slgui_LDADD = ../libslcore.a  @BASE_LIBS@ @LOSC_LIBS@ @WX_LIBS@ @SIGCPP_LIBS@ @XML_LIBS@
+ 
+ slgui_SOURCES = \
+ 	gui_app.cpp \
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch b/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch
new file mode 100644
index 000000000000..48997a668774
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch
@@ -0,0 +1,13 @@
+Index: work/aclocal/optflags.m4
+===================================================================
+--- work.orig/aclocal/optflags.m4
++++ work/aclocal/optflags.m4
+@@ -61,7 +61,7 @@ OPT_FLAGS="$OPT_FLAGS -pipe"
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+-CXXFLAGS="-g -D_REENTRANT $LARGEFILE_FLAGS"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT $LARGEFILE_FLAGS"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.6.5-rubberband12.patch b/media-sound/sooperlooper/files/sooperlooper-1.6.5-rubberband12.patch
new file mode 100644
index 000000000000..00242ac7aee3
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.6.5-rubberband12.patch
@@ -0,0 +1,23 @@
+Index: sooperlooper-1.6.5/src/looper.cpp
+===================================================================
+--- sooperlooper-1.6.5.orig/src/looper.cpp
++++ sooperlooper-1.6.5/src/looper.cpp
+@@ -166,11 +166,17 @@ Looper::initialize (unsigned int index, 
+ 	nframes_t srate = _driver->get_samplerate();
+ 	
+ 	// rubberband stretch stuff
++#if defined(RUBBERBAND_API_MAJOR_VERSION) && RUBBERBAND_API_MAJOR_VERSION >= 2
++	_in_stretcher = new RubberBandStretcher(srate, _chan_count, 
++					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseLaminar);
++	_out_stretcher = new RubberBandStretcher(srate, _chan_count, 
++					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseLaminar);
++#else
+ 	_in_stretcher = new RubberBandStretcher(srate, _chan_count, 
+ 					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseAdaptive);
+ 	_out_stretcher = new RubberBandStretcher(srate, _chan_count, 
+ 					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseAdaptive);
+-
++#endif
+ 	
+ 	set_buffer_size(_driver->get_buffersize());
+ 	
diff --git a/media-sound/sooperlooper/sooperlooper-1.6.5.ebuild b/media-sound/sooperlooper/sooperlooper-1.6.5.ebuild
new file mode 100644
index 000000000000..fa416b32bf4c
--- /dev/null
+++ b/media-sound/sooperlooper/sooperlooper-1.6.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/sooperlooper-1.6.5.ebuild,v 1.1 2008/07/11 16:13:27 aballier Exp $
+
+EAPI=1
+
+inherit wxwidgets eutils autotools
+
+DESCRIPTION="Live looping sampler with immediate loop recording"
+HOMEPAGE="http://essej.net/sooperlooper/index.html"
+SRC_URI="http://essej.net/sooperlooper/${P}.tar.gz
+	mirror://gentoo/${P}-m4.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	x11-libs/wxGTK:2.8
+	media-libs/liblo
+	dev-libs/libsigc++:1.2
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	dev-libs/libxml2
+	media-libs/rubberband
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-cxxflags.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-rubberband12.patch"
+	AT_M4DIR="${WORKDIR}/aclocal" eautoreconf
+}
+
+src_compile() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+	econf --disable-optimize --with-wxconfig-path="${WX_CONFIG}"
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc OSC README
+}