version bump, bug #216314

(Portage version: 2.1.5_rc2)

3 files changed, 174 insertions, 1 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index e3015c452e01..0e6933aec252 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.70 2008/02/29 20:03:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.71 2008/04/06 21:28:27 aballier Exp $
+
+*ardour-2.4 (06 Apr 2008)
+
+  06 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ardour-2.4-cflags.patch, +ardour-2.4.ebuild:
+  version bump, bug #216314
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> ardour-2.0.3.ebuild,
   ardour-2.0.5.ebuild, ardour-2.1.ebuild, ardour-2.2.ebuild,
diff --git a/media-sound/ardour/ardour-2.4.ebuild b/media-sound/ardour/ardour-2.4.ebuild
new file mode 100644
index 000000000000..4b30b81b140f
--- /dev/null
+++ b/media-sound/ardour/ardour-2.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.4.ebuild,v 1.1 2008/04/06 21:28:27 aballier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="multi-track hard disk recording software"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="altivec debug freesound nls sse"
+
+RDEPEND="media-libs/liblo
+	>=media-libs/liblrdf-0.4.0
+	>=media-libs/raptor-1.4.2
+	>=media-sound/jack-audio-connection-kit-0.101.1
+	>=dev-libs/glib-2.10.3
+	x11-libs/pango
+	>=x11-libs/gtk+-2.8.8
+	media-libs/flac
+	>=media-libs/alsa-lib-1.0.14a-r1
+	>=media-libs/libsamplerate-0.1.1-r1
+	>=dev-libs/libxml2-2.6.0
+	dev-libs/libxslt
+	>=media-libs/libsndfile-1.0.16
+	gnome-base/libgnomecanvas
+	x11-themes/gtk-engines
+	>=dev-cpp/gtkmm-2.12.3
+	>=dev-cpp/glibmm-2.14.2
+	>=dev-cpp/libgnomecanvasmm-2.20.0
+	dev-cpp/cairomm
+	>=dev-libs/libsigc++-2.0
+	media-libs/libsoundtouch
+	dev-libs/libusb
+	=sci-libs/fftw-3*
+	freesound? ( net-misc/curl )"
+# slv2? ( >=media-libs/slv2-0.6.0 )
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	dev-libs/boost
+	dev-util/pkgconfig
+	>=dev-util/scons-0.96.1
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if ! built_with_use dev-cpp/gtkmm accessibility; then
+		eerror "dev-cpp/gtkmm needs to be built with use accessibility"
+		eerror "in order to build ${PN}"
+		die "gtkmm was not built with use accessibility"
+	fi
+	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ${PN} 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
+}
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
+	epatch "${FILESDIR}/${P}-cflags.patch"
+	epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch"
+}
+
+ardour_use_enable() {
+	use ${2} && echo "${1}=1" || echo "${1}=0"
+}
+
+src_compile() {
+	# Required for scons to "see" intermediate install location
+	mkdir -p "${D}"
+
+	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
+	cd "${S}"
+
+	tc-export CC CXX
+
+	# Avoid compiling x86 asm when building on amd64 without using sse
+	# bug #186798
+	use amd64 && append-flags "-DUSE_X86_64_ASM"
+
+	scons \
+		$(ardour_use_enable DEBUG debug) \
+		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
+		DESTDIR="${D}" \
+		$(ardour_use_enable NLS nls) \
+		$(ardour_use_enable FREESOUND freesound) \
+		FFT_ANALYSIS=1 \
+		SYSLIBS=1 \
+		CFLAGS="${CFLAGS}" \
+		LV2=0 \
+		PREFIX=/usr || die "scons failed"
+}
+
+src_install() {
+	scons install || die "make install failed"
+
+	dodoc DOCUMENTATION/*
+
+	doicon "${S}/icons/icon/ardour_icon_mac.png"
+	make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo
+}
+
+pkg_postinst() {
+	ewarn "---------------- WARNING -------------------"
+	ewarn ""
+	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
+	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
+	ewarn "not understand."
+	ewarn ""
+	ewarn "MAKE BACKUPS OF THE SESSION FILES."
+	ewarn ""
+	ewarn "The simplest way to address this is to make a copy of the session file itself"
+	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
+	ewarn ""
+	ewarn "---------------- WARNING -------------------"
+	ewarn ""
+	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
+	ewarn "the colors configuration module if you want to be able to actually see various"
+	ewarn "texts in Ardour 2."
+}
diff --git a/media-sound/ardour/files/ardour-2.4-cflags.patch b/media-sound/ardour/files/ardour-2.4-cflags.patch
new file mode 100644
index 000000000000..9f3007b7d19a
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.4-cflags.patch
@@ -0,0 +1,37 @@
+Index: ardour-2.4/SConstruct
+===================================================================
+--- ardour-2.4.orig/SConstruct
++++ ardour-2.4/SConstruct
+@@ -27,6 +27,7 @@ subst_dict = { }
+ opts = Options('scache.conf')
+ opts.AddOptions(
+     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
++    ('CFLAGS', 'Set custom CFLAGS',''),
+     ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),
+     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
+     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
+@@ -771,14 +772,18 @@ if env['ARCH'] != '':
+ # prepend boiler plate optimization flags
+ #
+ 
+-opt_flags[:0] = [
+-    "-O3",
+-    "-fomit-frame-pointer",
+-    "-ffast-math",
+-    "-fstrength-reduce",
+-    "-pipe"
++if env['CFLAGS'] != '':
++    opt_flags[:0]=env['CFLAGS'].split()
++else:
++    opt_flags[:0] = [
++        "-O3",
++        "-fomit-frame-pointer",
++        "-ffast-math",
++        "-fstrength-reduce",
++        "-pipe"
+     ]
+ 
++
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+     env.Append(LINKFLAGS=" ".join (debug_flags))