Revision bump. Use 64bit fixed-point math routines on ppc64 to prevent

high-pitched noise during playback. Remove fstrict-aliasing conditional.
Drop ppc64 keyword from -r3. Thanks to Chainsaw for reporting and testing.
Package-Manager: portage-2.1.3.3

5 files changed, 94 insertions, 11 deletions

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index 037d26b24232..964e1fc06584 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libmad
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.52 2007/07/01 19:14:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.53 2007/08/06 20:26:40 dirtyepic Exp $
+
+*libmad-0.15.1b-r4 (06 Aug 2007)
+
+  06 Aug 2007; Ryan Hill <dirtyepic@gentoo.org> libmad-0.15.1b-r3.ebuild,
+  +libmad-0.15.1b-r4.ebuild:
+  Revision bump. Use 64bit fixed-point math routines on ppc64 to prevent
+  high-pitched noise during playback. Remove fstrict-aliasing conditional.
+  Drop ppc64 keyword from -r3. Thanks to Chainsaw for reporting and testing.
 
   01 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
   files/libmad-0.15.1b-cflags.patch, +files/libmad-0.15.1b-cflags-O2.patch,
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 8ffb0fdda8ef..2c88e3662991 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -15,18 +15,22 @@ EBUILD libmad-0.15.1b-r2.ebuild 1840 RMD160 c3038b885ad3aa7312c09f5a54fc1ef93bcc
 MD5 f599954685bb7179ae3ae6368b16069b libmad-0.15.1b-r2.ebuild 1840
 RMD160 c3038b885ad3aa7312c09f5a54fc1ef93bcceee6 libmad-0.15.1b-r2.ebuild 1840
 SHA256 4ccecf883c860e1c3e152c14287980fe38d17085004d5d823465284e5e5c6a5e libmad-0.15.1b-r2.ebuild 1840
-EBUILD libmad-0.15.1b-r3.ebuild 1904 RMD160 faeabfffe8144650e1b0641e5a97e906a0bd9c16 SHA1 8e0c7e607e1acd1f0c599cc82ce2850dae444ad4 SHA256 9bf486b26b11c2f1e81796a891f06ff905d2e78ed89c70cf0e5284758f76e4ce
-MD5 f9adf4f4c68c737a806fb4002cea582e libmad-0.15.1b-r3.ebuild 1904
-RMD160 faeabfffe8144650e1b0641e5a97e906a0bd9c16 libmad-0.15.1b-r3.ebuild 1904
-SHA256 9bf486b26b11c2f1e81796a891f06ff905d2e78ed89c70cf0e5284758f76e4ce libmad-0.15.1b-r3.ebuild 1904
+EBUILD libmad-0.15.1b-r3.ebuild 1897 RMD160 72fae917a838706796340c899443a373d4c98d9e SHA1 cc92ca73768b9740a467454a4bce414c85ed08f2 SHA256 57e2be41f5a63af4530b86a4a75601e18b08ded1930cd4bc1733504dd874d03a
+MD5 f766489a3d695a97413109fdba1eb8cd libmad-0.15.1b-r3.ebuild 1897
+RMD160 72fae917a838706796340c899443a373d4c98d9e libmad-0.15.1b-r3.ebuild 1897
+SHA256 57e2be41f5a63af4530b86a4a75601e18b08ded1930cd4bc1733504dd874d03a libmad-0.15.1b-r3.ebuild 1897
+EBUILD libmad-0.15.1b-r4.ebuild 1927 RMD160 93def51ba2f09847752fe8913a94bb5872b8d750 SHA1 f4b3cb71dae276c024eb138e169ca8a155e580cb SHA256 8cc7631580d0ed32d2e6e79e04eb64c3b696ce005d69e8fb10db155e17663ff1
+MD5 1bbc1f7e935fd5013700ba9b1d03d833 libmad-0.15.1b-r4.ebuild 1927
+RMD160 93def51ba2f09847752fe8913a94bb5872b8d750 libmad-0.15.1b-r4.ebuild 1927
+SHA256 8cc7631580d0ed32d2e6e79e04eb64c3b696ce005d69e8fb10db155e17663ff1 libmad-0.15.1b-r4.ebuild 1927
 EBUILD libmad-0.15.1b.ebuild 1525 RMD160 91cc057032f76dc8d3f9e2461d6b4cd1ae2bc8b6 SHA1 4414a6c6006e2f32c022c7406764d4a8cbe03209 SHA256 81b82fdf8dd7cd4aaf9cfebc6e6b468a2b0ba290e38ea162ae061ddd1d0d680d
 MD5 66122c91d4a73f5612805f3e0e20315f libmad-0.15.1b.ebuild 1525
 RMD160 91cc057032f76dc8d3f9e2461d6b4cd1ae2bc8b6 libmad-0.15.1b.ebuild 1525
 SHA256 81b82fdf8dd7cd4aaf9cfebc6e6b468a2b0ba290e38ea162ae061ddd1d0d680d libmad-0.15.1b.ebuild 1525
-MISC ChangeLog 6685 RMD160 8bffdadf438bfff8c2e5cc51a027c2bb51b472dc SHA1 55e8fca1aa810b583d882215e5309573b1044694 SHA256 cd5d40136b0014384adb73487923b900cef883dc4b933c02fbc81d80a519f2b7
-MD5 4ac4fe55f06462c59f9469460161d31e ChangeLog 6685
-RMD160 8bffdadf438bfff8c2e5cc51a027c2bb51b472dc ChangeLog 6685
-SHA256 cd5d40136b0014384adb73487923b900cef883dc4b933c02fbc81d80a519f2b7 ChangeLog 6685
+MISC ChangeLog 7048 RMD160 2c6f4695ea89d7c071653edb9e1f0e3b1e998a12 SHA1 d08c4673202d23992739f1773e657d8e4af801f8 SHA256 0b618cd3094c4c08251d6dea4e4932c1a6868a04793ca064e038e541067d4644
+MD5 65c61fd29896ae67b1525e0152bf12e7 ChangeLog 7048
+RMD160 2c6f4695ea89d7c071653edb9e1f0e3b1e998a12 ChangeLog 7048
+SHA256 0b618cd3094c4c08251d6dea4e4932c1a6868a04793ca064e038e541067d4644 ChangeLog 7048
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
@@ -40,3 +44,6 @@ SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/di
 MD5 3cddcde24c345af3f67f1c4ffd65b3d2 files/digest-libmad-0.15.1b-r3 244
 RMD160 eaeda17d3affb5ade8c671365344cc4571e2eaf0 files/digest-libmad-0.15.1b-r3 244
 SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/digest-libmad-0.15.1b-r3 244
+MD5 3cddcde24c345af3f67f1c4ffd65b3d2 files/digest-libmad-0.15.1b-r4 244
+RMD160 eaeda17d3affb5ade8c671365344cc4571e2eaf0 files/digest-libmad-0.15.1b-r4 244
+SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/digest-libmad-0.15.1b-r4 244
diff --git a/media-libs/libmad/files/digest-libmad-0.15.1b-r4 b/media-libs/libmad/files/digest-libmad-0.15.1b-r4
new file mode 100644
index 000000000000..e475d46a8d95
--- /dev/null
+++ b/media-libs/libmad/files/digest-libmad-0.15.1b-r4
@@ -0,0 +1,3 @@
+MD5 1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz 502379
+RMD160 0f3415ee10b188681e282ca69dec74c46ca73b0f libmad-0.15.1b.tar.gz 502379
+SHA256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz 502379
diff --git a/media-libs/libmad/libmad-0.15.1b-r3.ebuild b/media-libs/libmad/libmad-0.15.1b-r3.ebuild
index d1835717472d..d066cccc1f85 100644
--- a/media-libs/libmad/libmad-0.15.1b-r3.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r3.ebuild,v 1.2 2007/07/01 19:14:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r3.ebuild,v 1.3 2007/08/06 20:26:40 dirtyepic Exp $
 
 inherit eutils autotools libtool flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND=""
diff --git a/media-libs/libmad/libmad-0.15.1b-r4.ebuild b/media-libs/libmad/libmad-0.15.1b-r4.ebuild
new file mode 100644
index 000000000000..84fa57c0ecef
--- /dev/null
+++ b/media-libs/libmad/libmad-0.15.1b-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r4.ebuild,v 1.1 2007/08/06 20:26:40 dirtyepic Exp $
+
+inherit eutils autotools libtool flag-o-matic
+
+DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library"
+HOMEPAGE="http://mad.sourceforge.net"
+SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/libmad-0.15.1b-cflags.patch"
+	epatch "${FILESDIR}/libmad-0.15.1b-cflags-O2.patch"
+
+	eautoreconf
+
+	elibtoolize
+	epunt_cxx #74490
+}
+
+src_compile() {
+	local myconf="--enable-accuracy"
+	# --enable-speed		 optimize for speed over accuracy
+	# --enable-accuracy		 optimize for accuracy over speed
+	# --enable-experimental	 enable code using the EXPERIMENTAL
+	#						 preprocessor define
+
+	# Fix for b0rked sound on sparc64 (maybe also sparc32?)
+	# default/approx is also possible, uses less cpu but sounds worse
+	use sparc && myconf="${myconf} --enable-fpm=64bit"
+
+	[[ $(tc-arch) == "amd64" ]] && myconf="${myconf} --enable-fpm=64bit"
+	[[ $(tc-arch) == "x86" ]] && myconf="${myconf} --enable-fpm=intel"
+	[[ $(tc-arch) == "ppc" ]] && myconf="${myconf} --enable-fpm=ppc"
+	[[ $(tc-arch) == "ppc64" ]] && myconf="${myconf} --enable-fpm=64bit"
+
+	econf \
+		$(use_enable debug debugging) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	dodoc CHANGES CREDITS README TODO VERSION
+
+	# This file must be updated with each version update
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/mad.pc
+
+	# Use correct libdir in pkgconfig file
+	dosed "s:^libdir.*:libdir=/usr/$(get_libdir):" \
+		/usr/$(get_libdir)/pkgconfig/mad.pc
+}