Apply endianess fixes from bug 169785, by Damian Pietras, Elimar Riesebieter and Hendrik Iben.

Package-Manager: portage-2.1.3.3

4 files changed, 74 insertions, 10 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/Manifest b/media-sound/moc/Manifest
index 4019a28714f5..12ca254f236d 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,6 +2,10 @@ AUX moc-2.4.1+flac-1.1.3.patch 9407 RMD160 ebb75d57339ac06e471ac458cacb8ee66e06a
 MD5 60edb5eb095015cf5aadd3ed1911f9e0 files/moc-2.4.1+flac-1.1.3.patch 9407
 RMD160 ebb75d57339ac06e471ac458cacb8ee66e06a242 files/moc-2.4.1+flac-1.1.3.patch 9407
 SHA256 488245b26d2b4e1ae4480882f67762a0a7a7708103368b2116cde4788ef8c826 files/moc-2.4.1+flac-1.1.3.patch 9407
+AUX moc-2.5.0_alpha2-endianess.patch 1747 RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d SHA1 4a26b7f6b488f7781ba18a1423dadc0d74a6d8b7 SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f
+MD5 542c6a5419fc73e3e4dd449bf3a6e22f files/moc-2.5.0_alpha2-endianess.patch 1747
+RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d files/moc-2.5.0_alpha2-endianess.patch 1747
+SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f files/moc-2.5.0_alpha2-endianess.patch 1747
 DIST moc-2.4.1.tar.bz2 439866 RMD160 206d8342e331bf4f918069de4e797310a4adc2fb SHA1 63923cd7ff0f144d5a7baed7b55e3790da05134c SHA256 0f4ef44e86b7edb4ee910f8b5c02efa59985ab1a0cf2f57497c71a2932699d28
 DIST moc-2.4.2.tar.bz2 459922 RMD160 3643cf48ac2ece4e91242196ef17e7bcc33a73ff SHA1 a5421c0d900a856cc5ce45879305116e515faaec SHA256 7149cdff6a52fc8c9f0c3c1abfae81473c7fecb7b660247f4820301204a09341
 DIST moc-2.5.0-alpha2.tar.bz2 486681 RMD160 64efd4bff599ae419dad34905725db38633ec8c9 SHA1 9d448c79ad0889cc5a27c5d9e1bbe7b6a697954f SHA256 000deb3212a70fe4b83e4f005753746e80fdc7d5b74db89b8a6cf69410c455a3
@@ -13,14 +17,14 @@ EBUILD moc-2.4.2.ebuild 1731 RMD160 9dbb1e5b0b9c56b0758855f3bc9f9e68b5ff1067 SHA
 MD5 93bdca0374db851c2bc538b920c6067d moc-2.4.2.ebuild 1731
 RMD160 9dbb1e5b0b9c56b0758855f3bc9f9e68b5ff1067 moc-2.4.2.ebuild 1731
 SHA256 75af603861fe4019518d314ced247f4f0cf340bdde7839e3d5d70c991c0447e2 moc-2.4.2.ebuild 1731
-EBUILD moc-2.5.0_alpha2.ebuild 1924 RMD160 c299cb90448bfd3c9d9a334ee52e7d08ce593d29 SHA1 4bf78ca235cd5da76ed6c4bd5085cba25d625e3a SHA256 919802f3a3c82a01a5df599efb5b9aef70af440363be622c4c6adc07f7b79fe9
-MD5 fe061c8ded33a947b10ed21aaa9c9325 moc-2.5.0_alpha2.ebuild 1924
-RMD160 c299cb90448bfd3c9d9a334ee52e7d08ce593d29 moc-2.5.0_alpha2.ebuild 1924
-SHA256 919802f3a3c82a01a5df599efb5b9aef70af440363be622c4c6adc07f7b79fe9 moc-2.5.0_alpha2.ebuild 1924
-MISC ChangeLog 5473 RMD160 1166bac1cdb5af32f4e02e7945165e10e5a6b4b2 SHA1 25ba9d0ff4584a73ae1e839d51f8869fe5a515b5 SHA256 aedbe1633af3f2a88eb2e56387176a19650a6e0e1cb264eea06a2dda51cad17d
-MD5 5909bb97c2053d993d657914530043a9 ChangeLog 5473
-RMD160 1166bac1cdb5af32f4e02e7945165e10e5a6b4b2 ChangeLog 5473
-SHA256 aedbe1633af3f2a88eb2e56387176a19650a6e0e1cb264eea06a2dda51cad17d ChangeLog 5473
+EBUILD moc-2.5.0_alpha2.ebuild 2025 RMD160 8130680b961e65c00e95bc0e6871d82434063401 SHA1 f28bddb80b64293a20b4de025aa3353ee26ecdf7 SHA256 aab75a1509147af1f54fa6ceb38daeec6573236f1fc673b615e50b1b07b9dc85
+MD5 f6d742551d90f224096958b1a303ba14 moc-2.5.0_alpha2.ebuild 2025
+RMD160 8130680b961e65c00e95bc0e6871d82434063401 moc-2.5.0_alpha2.ebuild 2025
+SHA256 aab75a1509147af1f54fa6ceb38daeec6573236f1fc673b615e50b1b07b9dc85 moc-2.5.0_alpha2.ebuild 2025
+MISC ChangeLog 5690 RMD160 a087763d0ec3d8402869b6272201b2bfae882b59 SHA1 733576d7ec9786518fe4a9a137e9757c4a13ed0e SHA256 db8265ebddaf73fd8819c96919884957d69501d87893dc42148f879d57cc9174
+MD5 872eae1a9ad107a039c0ab5818c95b16 ChangeLog 5690
+RMD160 a087763d0ec3d8402869b6272201b2bfae882b59 ChangeLog 5690
+SHA256 db8265ebddaf73fd8819c96919884957d69501d87893dc42148f879d57cc9174 ChangeLog 5690
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
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) \