summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-12-21 14:46:40 +0000
committerChristoph Mende <angelos@gentoo.org>2009-12-21 14:46:40 +0000
commite1e58dbf3cb5f7de5aeb4f7230c59d0ba1f47d92 (patch)
tree7559d6427b790d3c1cef13a010d95516d9fc4b54 /media-sound
parentFix building with -Wl,--no-as-needed wrt #248417 by Kevin Pyle. (diff)
downloadgentoo-2-e1e58dbf3cb5f7de5aeb4f7230c59d0ba1f47d92.tar.gz
gentoo-2-e1e58dbf3cb5f7de5aeb4f7230c59d0ba1f47d92.tar.bz2
gentoo-2-e1e58dbf3cb5f7de5aeb4f7230c59d0ba1f47d92.zip
Added patch to fix compilation with USE=wavpack (bug #297599), thanks to Darren Smith
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/mpd/ChangeLog7
-rw-r--r--media-sound/mpd/files/mpd-0.15.6-wavpack-uchar.patch12
-rw-r--r--media-sound/mpd/mpd-0.15.6.ebuild5
3 files changed, 21 insertions, 3 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/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() {