4 files changed, 104 insertions, 3 deletions
diff --git a/media-sound/wavpack/ChangeLog b/media-sound/wavpack/ChangeLog
index 589994aca84e..889b7f94fd92 100644
--- a/media-sound/wavpack/ChangeLog
+++ b/media-sound/wavpack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/wavpack
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.35 2008/03/07 07:39:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.36 2008/04/20 21:43:29 flameeyes Exp $
+
+*wavpack-4.41.0-r1 (20 Apr 2008)
+
+  20 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/wavpack-4.41.0-constant.patch, wavpack-4.41.0.ebuild,
+  +wavpack-4.41.0-r1.ebuild:
+  Fix building with GCC 4.3, thanks to Peter Alfredsen in bug #217828. Also
+  add a new revision with a patch to mark more stuff constant in a new
+  revision.
 
   16 Nov 2007; nixnut <nixnut@gentoo.org> wavpack-4.41.0.ebuild:
   Stable on ppc wrt bug 198823
diff --git a/media-sound/wavpack/files/wavpack-4.41.0-constant.patch b/media-sound/wavpack/files/wavpack-4.41.0-constant.patch
new file mode 100644
index 000000000000..8591f1dc8b5f
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-4.41.0-constant.patch
@@ -0,0 +1,53 @@
+Index: wavpack-4.41.0/src/pack.c
+===================================================================
+--- wavpack-4.41.0.orig/src/pack.c
++++ wavpack-4.41.0/src/pack.c
+@@ -38,7 +38,7 @@ int32_t dump_alloc (void);
+ // 17 & 18 are special functions using the previous 2 samples, and negative
+ // values indicate cross channel decorrelation (in stereo only).
+ 
+-static WavpackDecorrSpec fast_specs [] = {
++static const WavpackDecorrSpec fast_specs [] = {
+         { 1, 2,18,17 },  // 0
+         { 1, 1,17,17 },  // 1
+         { 0, 2,18,17 },  // 2
+@@ -297,7 +297,7 @@ static WavpackDecorrSpec fast_specs [] =
+         { 0, 2,18,17 },  // 255
+ };
+ 
+-static WavpackDecorrSpec default_specs [] = {
++static const WavpackDecorrSpec default_specs [] = {
+         { 1, 2,18,18, 2,17, 3 },         // 0
+         { 0, 2,18,17,-1, 3, 2 },         // 1
+         { 1, 1,17,18,18,-2, 2 },         // 2
+@@ -556,7 +556,7 @@ static WavpackDecorrSpec default_specs [
+         { 0, 2,18,18,-2,18, 2 },         // 255
+ };
+ 
+-static WavpackDecorrSpec high_specs [] = {
++static const WavpackDecorrSpec high_specs [] = {
+         { 1, 2,18,18,18,-2, 2, 3, 5,-1,17, 4 },  // 0
+         { 0, 1,18,17,-2, 2,18, 3, 7, 2, 5, 4 },  // 1
+         { 1, 2, 1,18, 3, 6,-2,18, 2, 3, 4, 5 },  // 2
+@@ -815,7 +815,7 @@ static WavpackDecorrSpec high_specs [] =
+         { 0, 1,-1,18,18, 2,18, 3, 5,18, 2, 8 },  // 255
+ };
+ 
+-static WavpackDecorrSpec very_high_specs [] = {
++static const WavpackDecorrSpec very_high_specs [] = {
+         { 1, 2,18,18, 2, 3,-2,18, 2, 4, 7, 5, 3, 6, 8,-1,18, 2 },        // 0
+         { 0, 1,18,18,-1,18, 2, 3, 4, 6, 5, 7,18,-3, 8, 2,-1, 3 },        // 1
+         { 1, 2, 1,18,-2, 4,18, 2, 3, 6,-1, 7, 5,-2,18, 8, 2, 4 },        // 2
+Index: wavpack-4.41.0/src/wputils.c
+===================================================================
+--- wavpack-4.41.0.orig/src/wputils.c
++++ wavpack-4.41.0/src/wputils.c
+@@ -126,7 +126,7 @@ static int32_t write_bytes (void *id, vo
+     return (int32_t) fwrite (data, 1, bcount, (FILE*) id);
+ }
+ 
+-static WavpackStreamReader freader = {
++static const WavpackStreamReader freader = {
+     read_bytes, get_pos, set_pos_abs, set_pos_rel, push_back_byte, get_length, can_seek,
+     write_bytes
+ };
diff --git a/media-sound/wavpack/wavpack-4.41.0-r1.ebuild b/media-sound/wavpack/wavpack-4.41.0-r1.ebuild
new file mode 100644
index 000000000000..26f9d0bb9be2
--- /dev/null
+++ b/media-sound/wavpack/wavpack-4.41.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.41.0-r1.ebuild,v 1.1 2008/04/20 21:43:29 flameeyes Exp $
+
+inherit libtool eutils flag-o-matic
+
+DESCRIPTION="WavPack audio compression tools"
+HOMEPAGE="http://www.wavpack.com"
+SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="mmx"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-constant.patch"
+
+	elibtoolize
+}
+
+src_compile() {
+	test-flags-CC -flax-vector-conversions && \
+		append-flags -flax-vector-conversions
+
+	econf $(use_enable mmx)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog README
+}
diff --git a/media-sound/wavpack/wavpack-4.41.0.ebuild b/media-sound/wavpack/wavpack-4.41.0.ebuild
index c8754dc952cb..a2b849fed979 100644
--- a/media-sound/wavpack/wavpack-4.41.0.ebuild
+++ b/media-sound/wavpack/wavpack-4.41.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.41.0.ebuild,v 1.12 2008/03/07 07:39:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.41.0.ebuild,v 1.13 2008/04/20 21:43:29 flameeyes Exp $
 
-inherit libtool
+inherit libtool flag-o-matic
 
 DESCRIPTION="WavPack audio compression tools"
 HOMEPAGE="http://www.wavpack.com"
@@ -20,6 +20,9 @@ src_unpack() {
 }
 
 src_compile() {
+	test-flags-CC -flax-vector-conversions && \
+		append-flags -flax-vector-conversions
+
 	econf $(use_enable mmx)
 	emake || die "emake failed."
 }