diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-08-07 13:23:50 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-08-07 13:23:50 +0000 |
| commit | f1400201b27e54c6f55d847cfe08a989548acb87 (patch) | |
| tree | 117ab55b4e25a52673de7ce7fb9b23e971600e4c /media-sound | |
| parent | Stable on sparc wrt #175465 (diff) | |
| download | gentoo-2-f1400201b27e54c6f55d847cfe08a989548acb87.tar.gz gentoo-2-f1400201b27e54c6f55d847cfe08a989548acb87.tar.bz2 gentoo-2-f1400201b27e54c6f55d847cfe08a989548acb87.zip | |
Apply endianess fixes from bug 169785, by Damian Pietras, Elimar Riesebieter and Hendrik Iben.
(Portage version: 2.1.3.3)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/moc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/moc/files/moc-2.5.0_alpha2-endianess.patch | 47 | ||||
| -rw-r--r-- | media-sound/moc/moc-2.5.0_alpha2.ebuild | 10 |
3 files changed, 62 insertions, 2 deletions
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog index c2f7b8fd4207..57dcc0c5594d 100644 --- a/media-sound/moc/ChangeLog +++ b/media-sound/moc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/moc # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.38 2007/07/30 18:15:54 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.39 2007/08/07 13:23:50 drac Exp $ + + 07 Aug 2007; Samuli Suominen <drac@gentoo.org> + +files/moc-2.5.0_alpha2-endianess.patch, moc-2.5.0_alpha2.ebuild: + Apply endianess fixes from bug 169785, by Damian Pietras, Elimar Riesebieter + and Hendrik Iben. *moc-2.5.0_alpha2 (30 Jul 2007) diff --git a/media-sound/moc/files/moc-2.5.0_alpha2-endianess.patch b/media-sound/moc/files/moc-2.5.0_alpha2-endianess.patch new file mode 100644 index 000000000000..d4af86c0d83a --- /dev/null +++ b/media-sound/moc/files/moc-2.5.0_alpha2-endianess.patch @@ -0,0 +1,47 @@ +diff -ur moc-2.5.0-alpha2.orig/decoder_plugins/sidplay2/sidplay2.cc moc-2.5.0-alpha2/decoder_plugins/sidplay2/sidplay2.cc +--- moc-2.5.0-alpha2.orig/decoder_plugins/sidplay2/sidplay2.cc 2007-04-02 20:39:51.000000000 +0300 ++++ moc-2.5.0-alpha2/decoder_plugins/sidplay2/sidplay2.cc 2007-08-07 16:16:20.000000000 +0300 +@@ -105,6 +105,16 @@ + + s2d->frequency = s2d->cfg.frequency; + ++#ifdef WORDS_BIGENDIAN ++ s2d->cfg.sampleFormat = SID2_BIG_SIGNED; ++#else ++ s2d->cfg.sampleFormat = SID2_LITTLE_SIGNED; ++#endif ++ ++ s2d->player->config(s2d->cfg); ++ ++ s2d->cfg = s2d->player->config(); ++ + switch(s2d->cfg.sampleFormat) + { + case SID2_LITTLE_SIGNED: +diff -ur moc-2.5.0-alpha2.orig/decoder_plugins/wavpack/wavpack.c moc-2.5.0-alpha2/decoder_plugins/wavpack/wavpack.c +--- moc-2.5.0-alpha2.orig/decoder_plugins/wavpack/wavpack.c 2007-06-09 10:26:24.000000000 +0300 ++++ moc-2.5.0-alpha2/decoder_plugins/wavpack/wavpack.c 2007-08-07 16:16:14.000000000 +0300 +@@ -223,19 +223,19 @@ + switch (iBps / data->channels){ + case 4: for (i = 0; i < ret * data->channels; i++) + buf32[i] = dbuf[i]; +- sound_params->fmt = SFMT_S32 | SFMT_LE; ++ sound_params->fmt = SFMT_S32 | SFMT_NE; + break; + case 3: for (i = 0; i < ret * data->channels; i++) + buf32[i] = dbuf[i] * 256; +- sound_params->fmt = SFMT_S32 | SFMT_LE; ++ sound_params->fmt = SFMT_S32 | SFMT_NE; + break; + case 2: for (i = 0; i < ret * data->channels; i++) + buf16[i] = dbuf[i]; +- sound_params->fmt = SFMT_S16 | SFMT_LE; ++ sound_params->fmt = SFMT_S16 | SFMT_NE; + break; + case 1: for (i = 0; i < ret * data->channels; i++) + buf8[i] = dbuf[i]; +- sound_params->fmt = SFMT_S8 | SFMT_LE; ++ sound_params->fmt = SFMT_S8 | SFMT_NE; + } + } + diff --git a/media-sound/moc/moc-2.5.0_alpha2.ebuild b/media-sound/moc/moc-2.5.0_alpha2.ebuild index 948bc4d44eca..e575e1af6ddd 100644 --- a/media-sound/moc/moc-2.5.0_alpha2.ebuild +++ b/media-sound/moc/moc-2.5.0_alpha2.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha2.ebuild,v 1.1 2007/07/30 18:15:54 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha2.ebuild,v 1.2 2007/08/07 13:23:50 drac Exp $ + +inherit eutils MY_P=${P/_/-} @@ -34,6 +36,12 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/${MY_P} +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-endianess.patch +} + src_compile() { econf --without-rcc \ $(use_with jack) \ |