version bump

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 159 insertions, 5 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index e6eedf5b6abf..418b61234fbb 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.75 2008/04/20 16:54:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.76 2008/07/11 14:35:36 aballier Exp $
+
+*ardour-2.5 (11 Jul 2008)
+
+  11 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ardour-2.5-gcc43.patch, +ardour-2.5.ebuild:
+  version bump
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/ardour-2.4-gcc43.patch, ardour-2.4.1.ebuild:
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 9832595d1fab..9a2e7942b00a 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -6,16 +6,19 @@ AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0
 AUX ardour-2.3.1-soundtouch.patch 920 RMD160 ca2c41c990dcaf7dcc4bba8ba6ef26ba712233bf SHA1 97ec6abe0e4ad5453a001976879afcc93ebc73de SHA256 e6395d043f7c6d6fb003e1d5024150e80fdf1a6ec626468c569d3ec61d9c17ab
 AUX ardour-2.4-cflags.patch 1199 RMD160 32e6f8c22e1f83072f3183a26f02c2e66fe61401 SHA1 bf6c46463df21a2cc431fa17180fe91069a99a21 SHA256 ba59b111d4d93081aa743793d3307e18c6a06560e1500c3700ee0930df7f2f5b
 AUX ardour-2.4-gcc43.patch 12717 RMD160 6e1a76ce2a5b85a049513ee7d32a70467ea0fc12 SHA1 7b618d17c1e9bf2b533c2b51639e95f2a71790de SHA256 8e7e130ce67cc6541c3a94a8485e59580ec79362868362682ddbe38408c711b2
+AUX ardour-2.5-gcc43.patch 466 RMD160 2d33410aa956e4a3476f1919a6a55147f84c8ed4 SHA1 fa1b9919064de4fe001bf6eb606c53d6016b0286 SHA256 b2ed889282a2051c20126b92facd9d338d11511a0c4e303fa65e25171743bc5a
 DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
 DIST ardour-2.4.1.tar.bz2 3147427 RMD160 cad214271af97707da76701d2e8c65cb7b598e5f SHA1 d7c2f786711fc98598a090aa076a91bcd444b0e4 SHA256 29d6ca482e13e58058616b6118a0d036429db2141fbd95811d7ad7536690484e
+DIST ardour-2.5.tar.bz2 3254328 RMD160 81961248b48f5a9cd1eed0f1010e02f3236da6dc SHA1 6d3d563cc11772d4d6de6f89551dd89e43466f84 SHA256 735611e2fe44626adbb46567b14c3d9e700bb8ad0556dafa0688ea87032d14a3
 EBUILD ardour-2.0.5.ebuild 3240 RMD160 5a625dfad2ab4ba0fade90cd13d98ea469ef03b1 SHA1 078f58a80e21f8f8b9887ce5cca4783c71a31d7d SHA256 e87e65758e368b6cb3b325b56559a93c8215369e48c8c6f18445a29e1ce3cb79
 EBUILD ardour-2.4.1.ebuild 3762 RMD160 3e2eeed0cd129f3b3c2cd4bdb87728705b0ff18f SHA1 b31c6b2c3239532b58e471847dbe4a807eb2ad5a SHA256 e31a2ab3799fd44dc77a65b0d2209fe74b2ef0aa6840bb2d3a983f878d6c829c
-MISC ChangeLog 11753 RMD160 d27b3b932d34feea2dee29fec914627de3aa1e1b SHA1 c437d01e3c511a431207edb72c7532d7f31f46cd SHA256 b189c1d9e8f44227b4c30c5235b16e95154770b819fbd316731a5b51ddad481c
+EBUILD ardour-2.5.ebuild 3778 RMD160 c8b9dc39b5b84ec39c63382fa200ad8cbc771997 SHA1 f5f87391ca93b9fcd48200f0f5d76d9cc2fae42d SHA256 9c0f5e115cbecf61c1bfc47fce87862f1b3b5a509d59223280bbf86ef8ac0006
+MISC ChangeLog 11901 RMD160 dd6a0fcaf3583488d85a9b3805bf8f6414c3e94b SHA1 f26fae8409713a98c76d8e095c86fe8bf998fd48 SHA256 4f88bd5476916b2a6ab313c8acee3876db3b9019eea592581a7ba11615e02fd9
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgLdWMACgkQvFcC4BYPU0rujwCgkwMQgyyrEKaGLv75GJCQXBi3
-8oYAn3wVsIUCVZa/U2rSeDgLSqAeQmCj
-=5k20
+iEYEARECAAYFAkh3b8AACgkQvFcC4BYPU0p8XACgpVKu+jnMdeksUZACrd6+UeVK
+nmkAoLqxjvCH1aQjaFNjxrzJ/Pm+18tF
+=Zwql
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.5.ebuild b/media-sound/ardour/ardour-2.5.ebuild
new file mode 100644
index 000000000000..4e67185b9dfe
--- /dev/null
+++ b/media-sound/ardour/ardour-2.5.ebuild
@@ -0,0 +1,132 @@
+# 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.5.ebuild,v 1.1 2008/07/11 14:35:36 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/aubio
+	>=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}/${PN}-2.4-cflags.patch"
+	epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch"
+	epatch "${FILESDIR}/${PN}-2.5-gcc43.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.5-gcc43.patch b/media-sound/ardour/files/ardour-2.5-gcc43.patch
new file mode 100644
index 000000000000..acc73e95dd79
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.5-gcc43.patch
@@ -0,0 +1,13 @@
+http://tracker.ardour.org/view.php?id=2181
+
+diff -up ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 ardour-2.4/libs/surfaces/tranzport/screen.cc
+--- ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43	2008-04-05 16:55:26.000000000 -0400
++++ ardour-2.4/libs/surfaces/tranzport/screen.cc	2008-04-05 16:55:39.000000000 -0400
+@@ -19,6 +19,7 @@
+  *   */
+ 
+ #include <tranzport_control_protocol.h>
++#include <cstring>
+ 
+ void
+ TranzportControlProtocol::screen_clear ()