Revision bump. Add patch to make libmad use the system CFLAGS rather than adding it's own optimization flags. Based on the patch by Ryan Hill in bug #123215.

Package-Manager: portage-2.1_pre5-r4

5 files changed, 226 insertions, 14 deletions

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index 50ab73e6a1ca..6f41706b928f 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libmad
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.33 2006/03/06 15:34:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.34 2006/03/10 20:30:17 chutzpah Exp $
+
+*libmad-0.15.1b-r1 (10 Mar 2006)
+
+  10 Mar 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/libmad-0.15.1b-cflags.patch, +libmad-0.15.1b-r1.ebuild:
+  Revision bump. Add patch to make libmad use the system CFLAGS rather than
+  adding it's own optimization flags. Based on the patch by Ryan Hill in
+  bug #123215.
 
   06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   libmad-0.15.0b-r1.ebuild:
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 48fc36b658b9..36706dcec303 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -1,31 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1deaff6d9ab0d4f4775777150240b5a0 ChangeLog 3894
-RMD160 52ce45cd7199189de1d76d6f6f3939819f3b9c60 ChangeLog 3894
-SHA256 42ea2c5ad9d11b3fc78501ff57504341496165ba2a9792ac91f1ed23f9ad3833 ChangeLog 3894
+MD5 b2d55ad45bb5dee5d2064f836e756314 ChangeLog 4209
+RMD160 5e805251404aac208beea7748bea5e628e5d9728 ChangeLog 4209
+SHA256 2729a2a0e293b167e8489f232b180c65c5ccdf475913894c1ef91a279c9040b1 ChangeLog 4209
 MD5 905a86a6acbc90a60d520e923afcdc07 files/digest-libmad-0.15.0b-r1 138
 RMD160 62138f0666b2f73417ff8ad2bb1630c343342f51 files/digest-libmad-0.15.0b-r1 138
 SHA256 e8abd7a8fee85d9d79f8b7e5ac35ed6310799f69cd77ec056d22081eb81cf635 files/digest-libmad-0.15.0b-r1 138
 MD5 c1a4593204aded75376de13dcd311f36 files/digest-libmad-0.15.1b 66
 RMD160 67adcb57777ffda201c46320bbbd1b630f7c1bdc files/digest-libmad-0.15.1b 66
 SHA256 067328754d605b63f3ca69c11d222320ef033a670f172587aa60e158a04d2e07 files/digest-libmad-0.15.1b 66
+MD5 3cddcde24c345af3f67f1c4ffd65b3d2 files/digest-libmad-0.15.1b-r1 244
+RMD160 eaeda17d3affb5ade8c671365344cc4571e2eaf0 files/digest-libmad-0.15.1b-r1 244
+SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/digest-libmad-0.15.1b-r1 244
+MD5 67e8dfa6117377e3535104eab60a22c6 files/libmad-0.15.1b-cflags.patch 4765
+RMD160 3f19584260e5399c2dea9d7b2865697a44bf71e7 files/libmad-0.15.1b-cflags.patch 4765
+SHA256 b11f816fdf5fdd2e22cfdadfc3dcfd053b80272c2a71426b72bad5ac3fbf7be7 files/libmad-0.15.1b-cflags.patch 4765
 MD5 89806934195402446d21d1a83f523b11 files/mad.pc 211
 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c files/mad.pc 211
 SHA256 821918a6be761d7b8a697af951e4a9a5d2e48920cd80c9b6b9fa19d78afcf3b3 files/mad.pc 211
 MD5 75833eb687f961291f7130b4df12ba48 libmad-0.15.0b-r1.ebuild 1324
 RMD160 2e6ffb171e8ae6183cc82c62a2cc9cc4752f5969 libmad-0.15.0b-r1.ebuild 1324
 SHA256 4c6fe54bf4cee6b87f2e1430942af5ec5ca55b2919fd45ba2bb6359a6b8097cc libmad-0.15.0b-r1.ebuild 1324
+MD5 ae7046c40a7b2776644b34c8866b5dfe libmad-0.15.1b-r1.ebuild 1589
+RMD160 4785246e9d754d7d40e7cec0420da2435d7f199f libmad-0.15.1b-r1.ebuild 1589
+SHA256 eebbc727287fa337706d5274e8df61b091bb7dc0df2da25660432c62dedc856d libmad-0.15.1b-r1.ebuild 1589
 MD5 1916147b360315ffa0285791f9fdb50f libmad-0.15.1b.ebuild 1499
 RMD160 51eb919293d4a39e5ee45476cbbabc1fe48ed70b libmad-0.15.1b.ebuild 1499
 SHA256 3d0e5695b5c0d72e3e1e9a2b106366f3ac8974568b5b0934bba350736e5683b6 libmad-0.15.1b.ebuild 1499
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata.xml 252
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDFZwAiZjviIA2XgRAiQcAKDL4kV/+tuqSdgeNj6IcaznreVtsACgxt69
-nm9ltx95fzf8dh/gIync0+c=
-=rlzN
------END PGP SIGNATURE-----
diff --git a/media-libs/libmad/files/digest-libmad-0.15.1b-r1 b/media-libs/libmad/files/digest-libmad-0.15.1b-r1
new file mode 100644
index 000000000000..e475d46a8d95
--- /dev/null
+++ b/media-libs/libmad/files/digest-libmad-0.15.1b-r1
@@ -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/files/libmad-0.15.1b-cflags.patch b/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
new file mode 100644
index 000000000000..2e4eced4f969
--- /dev/null
+++ b/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
@@ -0,0 +1,145 @@
+--- configure.ac.orig	2006-03-10 15:10:24.000000000 -0500
++++ configure.ac	2006-03-10 15:14:10.000000000 -0500
+@@ -122,74 +122,74 @@
+     esac
+ done
+ 
+-if test "$GCC" = yes
+-then
+-    if test -z "$arch"
+-    then
+-	case "$host" in
+-	    i386-*)           ;;
+-	    i?86-*)           arch="-march=i486" ;;
+-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
+-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
+-	    powerpc-*)        ;;
+-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
+-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+-	esac
+-    fi
+-
+-    case "$optimize" in
+-	-O|"-O "*)
+-	    optimize="-O"
+-	    optimize="$optimize -fforce-mem"
+-	    optimize="$optimize -fforce-addr"
+-	    : #x optimize="$optimize -finline-functions"
+-	    : #- optimize="$optimize -fstrength-reduce"
+-	    optimize="$optimize -fthread-jumps"
+-	    optimize="$optimize -fcse-follow-jumps"
+-	    optimize="$optimize -fcse-skip-blocks"
+-	    : #x optimize="$optimize -frerun-cse-after-loop"
+-	    : #x optimize="$optimize -frerun-loop-opt"
+-	    : #x optimize="$optimize -fgcse"
+-	    optimize="$optimize -fexpensive-optimizations"
+-	    optimize="$optimize -fregmove"
+-	    : #* optimize="$optimize -fdelayed-branch"
+-	    : #x optimize="$optimize -fschedule-insns"
+-	    optimize="$optimize -fschedule-insns2"
+-	    : #? optimize="$optimize -ffunction-sections"
+-	    : #? optimize="$optimize -fcaller-saves"
+-	    : #> optimize="$optimize -funroll-loops"
+-	    : #> optimize="$optimize -funroll-all-loops"
+-	    : #x optimize="$optimize -fmove-all-movables"
+-	    : #x optimize="$optimize -freduce-all-givs"
+-	    : #? optimize="$optimize -fstrict-aliasing"
+-	    : #* optimize="$optimize -fstructure-noalias"
+-
+-	    case "$host" in
+-		arm*-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    ;;
+-		mips*-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    optimize="$optimize -finline-functions"
+-		    ;;
+-		i?86-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    ;;
+-		powerpc-apple-*)
+-		    # this triggers an internal compiler error with gcc2
+-		    : #optimize="$optimize -fstrength-reduce"
+-
+-		    # this is really only beneficial with gcc3
+-		    : #optimize="$optimize -finline-functions"
+-		    ;;
+-		*)
+-		    # this sometimes provokes bugs in gcc 2.95.2
+-		    : #optimize="$optimize -fstrength-reduce"
+-		    ;;
+-	    esac
+-	    ;;
+-    esac
+-fi
++#if test "$GCC" = yes
++#then
++#    if test -z "$arch"
++#    then
++#	case "$host" in
++#	    i386-*)           ;;
++#	    i?86-*)           arch="-march=i486" ;;
++#	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
++#	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
++#	    powerpc-*)        ;;
++#	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
++#	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
++#	esac
++#    fi
++#
++#    case "$optimize" in
++#	-O|"-O "*)
++#	    optimize="-O"
++#	    optimize="$optimize -fforce-mem"
++#	    optimize="$optimize -fforce-addr"
++#	    : #x optimize="$optimize -finline-functions"
++#	    : #- optimize="$optimize -fstrength-reduce"
++#	    optimize="$optimize -fthread-jumps"
++#	    optimize="$optimize -fcse-follow-jumps"
++#	    optimize="$optimize -fcse-skip-blocks"
++#	    : #x optimize="$optimize -frerun-cse-after-loop"
++#	    : #x optimize="$optimize -frerun-loop-opt"
++#	    : #x optimize="$optimize -fgcse"
++#	    optimize="$optimize -fexpensive-optimizations"
++#	    optimize="$optimize -fregmove"
++#	    : #* optimize="$optimize -fdelayed-branch"
++#	    : #x optimize="$optimize -fschedule-insns"
++#	    optimize="$optimize -fschedule-insns2"
++#	    : #? optimize="$optimize -ffunction-sections"
++#	    : #? optimize="$optimize -fcaller-saves"
++#	    : #> optimize="$optimize -funroll-loops"
++#	    : #> optimize="$optimize -funroll-all-loops"
++#	    : #x optimize="$optimize -fmove-all-movables"
++#	    : #x optimize="$optimize -freduce-all-givs"
++#	    : #? optimize="$optimize -fstrict-aliasing"
++#	    : #* optimize="$optimize -fstructure-noalias"
++#
++#	    case "$host" in
++#		arm*-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    ;;
++#		mips*-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    optimize="$optimize -finline-functions"
++#		    ;;
++#		i?86-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    ;;
++#		powerpc-apple-*)
++#		    # this triggers an internal compiler error with gcc2
++#		    : #optimize="$optimize -fstrength-reduce"
++#
++#		    # this is really only beneficial with gcc3
++#		    : #optimize="$optimize -finline-functions"
++#		    ;;
++#		*)
++#		    # this sometimes provokes bugs in gcc 2.95.2
++#		    : #optimize="$optimize -fstrength-reduce"
++#		    ;;
++#	    esac
++#	    ;;
++#    esac
++#fi
+ 
+ case "$host" in
+     mips*-agenda-*)
diff --git a/media-libs/libmad/libmad-0.15.1b-r1.ebuild b/media-libs/libmad/libmad-0.15.1b-r1.ebuild
new file mode 100644
index 000000000000..9fbabd7c2eaf
--- /dev/null
+++ b/media-libs/libmad/libmad-0.15.1b-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/03/10 20:30:17 chutzpah Exp $
+
+inherit eutils autotools
+
+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 ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epunt_cxx #74490
+
+	epatch "${FILESDIR}/libmad-0.15.1b-cflags.patch"
+
+	eautoreconf
+}
+
+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"
+
+	econf \
+		$(use_enable debug debugging) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make 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
+}