Added a patch to fix build on amd64 thanks to <malc@gentoo.org>.

(Portage version: 2.1.1_pre5-r3)

4 files changed, 89 insertions, 1 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index efd92a3140f4..f18cd963bb65 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.37 2006/08/18 23:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.38 2006/08/25 17:00:23 metalgod Exp $
+
+*rosegarden-4.1.0-r2 (25 Aug 2006)
+
+  25 Aug 2006; Luis Medinas <metalgod@gentoo.org> +files/4.1.0-amd64.patch,
+  +rosegarden-4.1.0-r2.ebuild:
+  Added a patch to fix build on amd64 thanks to <malc@gentoo.org>.
 
 *rosegarden-1.2.4 (18 Aug 2006)
 
diff --git a/media-sound/rosegarden/files/4.1.0-amd64.patch b/media-sound/rosegarden/files/4.1.0-amd64.patch
new file mode 100644
index 000000000000..10fb3ddcabfa
--- /dev/null
+++ b/media-sound/rosegarden/files/4.1.0-amd64.patch
@@ -0,0 +1,22 @@
+--- gui/segmentcanvas.cpp	2005-02-08 14:56:26.000000000 +0000
++++ gui/segmentcanvas.cpp	2006-08-21 21:29:03.000000000 +0100
+@@ -444,7 +444,7 @@
+     if (e->type() == QEvent::User + 1) {
+ 	QCustomEvent *ev = dynamic_cast<QCustomEvent *>(e);
+ 	if (ev) {
+-	    int token = (int)ev->data();
++	    int token = (int)(long)ev->data();
+ 	    AudioPreviewThread &thread = m_parent.getDocument()->getAudioPreviewThread();
+ 
+ 	    RG_DEBUG << "SegmentAudioPreview::token " << token << ", my token " << m_previewToken <<endl;
+--- gui/mmapper.cpp	2005-02-09 10:44:38.000000000 +0000
++++ gui/mmapper.cpp	2006-08-21 21:28:57.000000000 +0100
+@@ -896,7 +896,7 @@
+ 
+     return QString("%1/segment_%2")
+         .arg(tmpDirs.last())
+-        .arg((unsigned int)segment, 0, 16);
++        .arg((unsigned long)segment, 0, 16);
+ }
+ 
+ QString CompositionMmapper::getSegmentFileName(Segment* s)
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2 b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2
new file mode 100644
index 000000000000..333bc6854d6a
--- /dev/null
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2
@@ -0,0 +1,3 @@
+MD5 ca63f343e2a6240a0f64d32e362bf436 rosegarden-4-1.0.tar.bz2 5471903
+RMD160 80d2afeb7064a46e3725c427dfc9aa63451fdd9c rosegarden-4-1.0.tar.bz2 5471903
+SHA256 5cc20e7d72fb6e3e30a199051d07b0825f3cc7a98e4bdc939c80d830958858e4 rosegarden-4-1.0.tar.bz2 5471903
diff --git a/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild b/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild
new file mode 100644
index 000000000000..d041ed096ee5
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild,v 1.1 2006/08/25 17:00:23 metalgod Exp $
+
+inherit kde eutils flag-o-matic
+
+IUSE="arts jack"
+
+MY_PV="${PV/_rc*/}"
+MY_PV="${MY_PV/./-}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="MIDI and audio sequencer and notation editor."
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/rosegarden/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
+	!arts? ( media-libs/alsa-lib
+		jack? ( media-sound/jack-audio-connection-kit )
+		>=media-libs/ladspa-sdk-1.0
+		>=media-libs/ladspa-cmt-1.14 )"
+need-kde 3
+
+PATCHES="${FILESDIR}/4.1.0-dssi.patch
+	${FILESDIR}/4.1.0-gcc4.diff
+	${FILESDIR}/4.1.0-includehints.patch
+	${FILESDIR}/4.1.0-amd64"
+
+pkg_setup() {
+	echo
+	if use arts ; then
+		einfo "aRts support enabled"
+		ewarn "ALSA support disabled, USE=-arts enables ALSA"
+		built_with_use kde-base/arts jack && einfo "aRts was built with Jack support" \
+					|| ewarn "aRts wasn't built with Jack support"
+	else
+		einfo "ALSA support enabled"
+		use jack && einfo "Jack support enabled" || ewarn "Jack support disabled"
+	fi
+	echo
+}
+
+src_compile() {
+	strip-flags -fvisibility-inlines-hidden
+	use arts && myconf="" || myconf="$(use_with jack) --with-ladspa"
+	kde_src_compile
+}
+
+pkg_postinstall() {
+	elog "The developers of Rosegarden dropped the \"4\" as major version. If you're"
+	elog "interested in the latest testing release, hard mask >=media-sound/rosegarden-4."
+}