GCC 4.4 fix

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 62 insertions, 4 deletions

diff --git a/media-sound/wavpack/ChangeLog b/media-sound/wavpack/ChangeLog
index bf30291dd83c..520fd25e070c 100644
--- a/media-sound/wavpack/ChangeLog
+++ b/media-sound/wavpack/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2008/11/14 09:24:05 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.46 2009/05/10 14:58:32 ssuominen Exp $
+
+*wavpack-4.50.1-r1 (10 May 2009)
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +wavpack-4.50.1-r1.ebuild, +files/wavpack-4.50.1-gcc44.patch:
+  Fix compile with GCC 4.4 wrt #265322, thanks to Daniel J.
 
   14 Nov 2008; Alexis Ballier <aballier@gentoo.org>
   -files/wavpack-4.41.0-constant.patch, -wavpack-4.41.0.ebuild,
@@ -63,7 +69,7 @@
   11 Nov 2007; Dawid Węgliński <cla@gentoo.org> wavpack-4.41.0.ebuild:
   Stable on x86 (bug #198823)
 
-  11 Nov 2007; Samuli Suominen <drac@gentoo.org> wavpack-4.41.0.ebuild:
+  11 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> wavpack-4.41.0.ebuild:
   amd64 stable wrt #198823
 
   16 Jun 2007; Joshua Kinard <kumba@gentoo.org> wavpack-4.40.0.ebuild:
diff --git a/media-sound/wavpack/files/wavpack-4.50.1-gcc44.patch b/media-sound/wavpack/files/wavpack-4.50.1-gcc44.patch
new file mode 100644
index 000000000000..8d28fcca37ba
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-4.50.1-gcc44.patch
@@ -0,0 +1,23 @@
+--- src/wavpack_local.h.orig	2009-04-07 10:34:58.000000000 -0400
++++ src/wavpack_local.h	2009-04-07 11:03:45.000000000 -0400
+@@ -745,9 +745,17 @@
+ 
+ #define _m_paddd(m1, m2) __builtin_ia32_paddd (m1, m2)
+ #define _m_pcmpeqd(m1, m2) __builtin_ia32_pcmpeqd (m1, m2)
+-#define _m_pslldi(m1, m2) __builtin_ia32_pslld (m1, m2)
+-#define _m_psradi(m1, m2) __builtin_ia32_psrad (m1, m2)
+-#define _m_psrldi(m1, m2) __builtin_ia32_psrld (m1, m2)
++
++#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4
++#	define _m_pslldi(m1, m2) __builtin_ia32_pslldi ((__m64)m1, m2)
++#	define _m_psradi(m1, m2) __builtin_ia32_psradi ((__m64)m1, m2)
++#	define _m_psrldi(m1, m2) __builtin_ia32_psrldi ((__m64)m1, m2)
++#else
++#	define _m_pslldi(m1, m2) __builtin_ia32_pslld (m1, m2)
++#	define _m_psradi(m1, m2) __builtin_ia32_psrad (m1, m2)
++#	define _m_psrldi(m1, m2) __builtin_ia32_psrld (m1, m2)
++#endif
++
+ #define _m_psubd(m1, m2) __builtin_ia32_psubd (m1, m2)
+ #define _m_punpckhdq(m1, m2) __builtin_ia32_punpckhdq (m1, m2)
+ #define _m_punpckldq(m1, m2) __builtin_ia32_punpckldq (m1, m2)
diff --git a/media-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/wavpack/metadata.xml
+++ b/media-sound/wavpack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/wavpack/wavpack-4.50.1-r1.ebuild b/media-sound/wavpack/wavpack-4.50.1-r1.ebuild
new file mode 100644
index 000000000000..0508f99d29a6
--- /dev/null
+++ b/media-sound/wavpack/wavpack-4.50.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.50.1-r1.ebuild,v 1.1 2009/05/10 14:58:32 ssuominen Exp $
+
+EAPI=2
+inherit eutils libtool
+
+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_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable mmx)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README
+}