Added patch to fix compilation with USE=wavpack (bug #297599), thanks to Darren Smith

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 24 insertions, 5 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index adebed457861..a5414e2faf05 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.193 2009/12/09 14:54:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.194 2009/12/21 14:46:39 angelos Exp $
+
+  21 Dec 2009; Christoph Mende <angelos@gentoo.org> mpd-0.15.6.ebuild,
+  +files/mpd-0.15.6-wavpack-uchar.patch:
+  Added patch to fix compilation with USE=wavpack (bug #297599), thanks to
+  Darren Smith
 
   09 Dec 2009; Brent Baude <ranger@gentoo.org> mpd-0.15.5.ebuild:
   Marking mpd-0.15.5 ppc64 for bug 293975
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index be5a339085d0..b8b549f130d5 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,6 @@
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX 0.15_beta2-mpdconf.patch 3125 RMD160 4e48dfaee8d7fbb9b0615efb19b223c74f0b0b34 SHA1 45df89770e81e74eae18a8ae6f9ab66671320c95 SHA256 706ff3f0f46ab3d71fd29f1c16b781dfd44dee5cde8091b52ccd2f2fd9af0058
+AUX mpd-0.15.6-wavpack-uchar.patch 507 RMD160 2e361a66465bb796456e4294be0a2c3686791f02 SHA1 0c7ffad1aac32e551a2ddfe0cb31a39e230152b4 SHA256 31dfd5198ef564efde3f84305f83a1f3cb3e4bda9d61fe3c4ed4a4abc7ce95d3
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
 DIST mpd-0.15.3.tar.bz2 386521 RMD160 9d33e2ad3cd524428e1e786276f70a50a6c08456 SHA1 f53f984d8ffcc58d83268f30afb11b8342118d22 SHA256 b829b592667ec29da050b44da5fa343c3f008ea9c721a84150110f68d83e6584
 DIST mpd-0.15.5.tar.bz2 388223 RMD160 fcf0007952a09a1c4f711af87eaffc86d7d9ef31 SHA1 11dd020363d0c1ba1aa883d074a6c0e1d9df09fd SHA256 c1ccbc7976d923b46ebf2c1d4a8eaca2694fac04fc343228184a168d65978dbf
@@ -7,7 +8,7 @@ DIST mpd-0.15.6.tar.bz2 389017 RMD160 613623e9c886e4205cd06fd76cb46d35352a8b26 S
 DIST mpd-0.15.tar.bz2 385833 RMD160 abb0fb12aa0d8c0f7e6f13f3ec9cba24e1f6e09e SHA1 05707b007a2fd51885aa301922c0ac15dcbf9c86 SHA256 38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
 EBUILD mpd-0.15.3.ebuild 4924 RMD160 9a24531367191eafa37a6b01f4355c73aad0cf76 SHA1 50e2d8284e26d83cabb52c8615d404543e61b94f SHA256 2b25fd6348b7a14dbbccf950f204a449bd42500e000aaaba68e6c3ec39c54b90
 EBUILD mpd-0.15.5.ebuild 4914 RMD160 c30a08467d44c445440bb178e998d0e61a80efd5 SHA1 127b2cd16e3800395e1cfbd64138d3e7afc205d2 SHA256 ea0911ddd82449ed15b7c75f9af000ae7d2c189fe8ddf746f3aac246ee88413f
-EBUILD mpd-0.15.6.ebuild 4922 RMD160 91219f464a869615c150a089c3c5950442122a5d SHA1 675752e29f8789abff5e42a9197bc10ec7827d19 SHA256 a79337102a90efe89cd64665a7759efaf8fe0f0bcb93ed89968af723eb3ebb69
+EBUILD mpd-0.15.6.ebuild 4965 RMD160 edd6e2576e32cd6b8a1bcab9481fc25a3e634544 SHA1 e3390c8fcead5b2134c6710243d16a0bd265c056 SHA256 ff1b331f03ec9697fdce542ae4e3141a658c8c25913b7fe9a66912c6f10d89ce
 EBUILD mpd-0.15.ebuild 4920 RMD160 5520d170bfd917380571306aa0dd7cb5d910c8e8 SHA1 86d32184850f893c3420e8be727e527a1b993b50 SHA256 9109705734c8abeb241eedce9d244fc686d59239738d86c4f4f12adf0431b81f
-MISC ChangeLog 28743 RMD160 b781e4a593df1e7761c46408a5eaf19aff54ffab SHA1 e4132ca0ac4f37dd1122781d912e0d5567ba07d7 SHA256 c59a68d114cbbdddc6d764ccb39db774aa14263930f5144facd7c3871f845630
+MISC ChangeLog 28947 RMD160 c22b818c5593989ccf445c1c9735c95d075af99d SHA1 36da2f42899ee294f80fcea71f3d2afaf95a9d0e SHA256 447e56894cd9a31f319bd0271d43fb9677a29e2646201cf055ad8c1df90641e3
 MISC metadata.xml 1102 RMD160 88cdb7b7217f759eb993ff82589c74115213add4 SHA1 3ddf0689c3e5d2afc7371cad27c7f873aab5cb9f SHA256 4fe3d580f53a860190580caad66ed95ca02f05ea21228983d83ca26418410206
diff --git a/media-sound/mpd/files/mpd-0.15.6-wavpack-uchar.patch b/media-sound/mpd/files/mpd-0.15.6-wavpack-uchar.patch
new file mode 100644
index 000000000000..7450033dde75
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.15.6-wavpack-uchar.patch
@@ -0,0 +1,12 @@
+diff -ru mpd-0.15.6.orig/src/decoder/wavpack_plugin.c mpd-0.15.6/src/decoder/wavpack_plugin.c
+--- mpd-0.15.6.orig/src/decoder/wavpack_plugin.c	2009-11-18 20:47:54.000000000 -0600
++++ mpd-0.15.6/src/decoder/wavpack_plugin.c	2009-12-19 19:52:20.567325999 -0600
+@@ -72,7 +72,7 @@
+ 
+ 	switch (bytes_per_sample) {
+ 	case 1: {
+-		uchar *dst = buffer;
++		unsigned char *dst = buffer;
+ 		/*
+ 		 * The asserts like the following one are because we do the
+ 		 * formatting of samples within a single buffer. The size
diff --git a/media-sound/mpd/mpd-0.15.6.ebuild b/media-sound/mpd/mpd-0.15.6.ebuild
index 2136a9374e86..ffb5f8ee7383 100644
--- a/media-sound/mpd/mpd-0.15.6.ebuild
+++ b/media-sound/mpd/mpd-0.15.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.6.ebuild,v 1.1 2009/11/21 19:20:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.6.ebuild,v 1.2 2009/12/21 14:46:39 angelos Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -61,7 +61,8 @@ pkg_setup() {
 
 src_prepare() {
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/0.15.1-mpdconf.patch
+	epatch "${FILESDIR}"/0.15.1-mpdconf.patch \
+		"${FILESDIR}"/${P}-wavpack-uchar.patch
 }
 
 src_configure() {