diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2006-11-05 20:54:26 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2006-11-05 20:54:26 +0000 |
| commit | 6de35061d4325dac6f7bc9ff6456a82e14d69866 (patch) | |
| tree | 00bd40911c9a07a5b7611b6519469b2b353b52ff /media-sound | |
| parent | Add fix for 64bit OS. Add ~amd64 wrt bug #146426. (diff) | |
| download | gentoo-2-6de35061d4325dac6f7bc9ff6456a82e14d69866.tar.gz gentoo-2-6de35061d4325dac6f7bc9ff6456a82e14d69866.tar.bz2 gentoo-2-6de35061d4325dac6f7bc9ff6456a82e14d69866.zip | |
Gcc 4 fix wrt to bug #147793
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/smurf/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/smurf/files/digest-smurf-0.52.6 | 2 | ||||
| -rw-r--r-- | media-sound/smurf/files/smurf-0.52.6-gcc4.patch | 46 | ||||
| -rw-r--r-- | media-sound/smurf/smurf-0.52.6.ebuild | 5 |
4 files changed, 57 insertions, 2 deletions
diff --git a/media-sound/smurf/ChangeLog b/media-sound/smurf/ChangeLog index d4cdbab6d069..ad14cfc0c492 100644 --- a/media-sound/smurf/ChangeLog +++ b/media-sound/smurf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/smurf # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.10 2006/02/15 13:35:50 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.11 2006/11/05 20:54:26 aballier Exp $ + + 05 Nov 2006; Alexis Ballier <aballier@gentoo.org> + +files/smurf-0.52.6-gcc4.patch, smurf-0.52.6.ebuild: + Gcc 4 patch wrt to bug #147793 15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> smurf-0.52.6.ebuild: Fix gettext/libintl dependencies. diff --git a/media-sound/smurf/files/digest-smurf-0.52.6 b/media-sound/smurf/files/digest-smurf-0.52.6 index 72ea90e341de..6268f40bcaed 100644 --- a/media-sound/smurf/files/digest-smurf-0.52.6 +++ b/media-sound/smurf/files/digest-smurf-0.52.6 @@ -1 +1,3 @@ MD5 5fafbd7557112f8d3d794a8101075d84 smurf-0.52.6.tar.gz 481593 +RMD160 277f44dba24f66aa9234fc92a3a5ef4883b333a0 smurf-0.52.6.tar.gz 481593 +SHA256 a9f79f7f6de7537f45f817676c41061975790c0f9dfeb9772b8e45bc28f0ff3a smurf-0.52.6.tar.gz 481593 diff --git a/media-sound/smurf/files/smurf-0.52.6-gcc4.patch b/media-sound/smurf/files/smurf-0.52.6-gcc4.patch new file mode 100644 index 000000000000..820a7efe016a --- /dev/null +++ b/media-sound/smurf/files/smurf-0.52.6-gcc4.patch @@ -0,0 +1,46 @@ +--- smurf-0.52.6/src/sfload.c.old 2006-11-05 21:42:20.000000000 +0100 ++++ smurf-0.52.6/src/sfload.c 2006-11-05 21:42:36.000000000 +0100 +@@ -705,7 +705,7 @@ + { /* inst is last gen */ + level = 3; + READW (genval.uword, fd); +- GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) = ++ (((SFZone *) (p2->data))->instsamp) = + genval.uword + 1; + break; /* break out of generator loop */ + } +@@ -1055,7 +1055,7 @@ + { /* sample is last gen */ + level = 3; + READW (genval.uword, fd); +- GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) = ++ (((SFZone *) (p2->data))->instsamp) = + genval.uword + 1; + break; /* break out of generator loop */ + } +--- smurf-0.52.6/src/sfsave.c.old 2006-11-05 21:43:15.000000000 +0100 ++++ smurf-0.52.6/src/sfsave.c 2006-11-05 21:44:51.000000000 +0100 +@@ -620,9 +620,9 @@ + z = (SFZone *) (p2->data); + if (z->instsamp) + { +- (guint16) dummy = Gen_Instrument; ++ dummy = Gen_Instrument; + WRITEW ((guint16) dummy, fd); +- (guint16) dummy = g_slist_position (sf->inst, z->instsamp); ++ dummy = g_slist_position (sf->inst, z->instsamp); + WRITEW ((guint16) dummy, fd); + *size += SFGENSIZE; + } +@@ -780,9 +780,9 @@ + z = (SFZone *) (p2->data); + if (z->instsamp) + { +- (guint16) dummy = Gen_SampleId; ++ dummy = Gen_SampleId; + WRITEW ((guint16) dummy, fd); +- (guint16) dummy = g_slist_position (sf->sample, z->instsamp); ++ dummy = g_slist_position (sf->sample, z->instsamp); + WRITEW ((guint16) dummy, fd); + *size += SFGENSIZE; + } diff --git a/media-sound/smurf/smurf-0.52.6.ebuild b/media-sound/smurf/smurf-0.52.6.ebuild index 26d4802e487a..8dc9a29e71af 100644 --- a/media-sound/smurf/smurf-0.52.6.ebuild +++ b/media-sound/smurf/smurf-0.52.6.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/smurf-0.52.6.ebuild,v 1.10 2006/02/15 13:35:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/smurf-0.52.6.ebuild,v 1.11 2006/11/05 20:54:26 aballier Exp $ + +inherit eutils DESCRIPTION="The Smurf Sound Font Editor" HOMEPAGE="http://smurf.sourceforge.net/" @@ -21,6 +23,7 @@ DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.11.5-r1 )" src_compile() { + epatch "${FILESDIR}/${P}-gcc4.patch" local myconf="--with-audiofile" use nls || myconf="${myconf} --disable-nls" use debug || myconf="${myconf} --disable-debug" |