bumping to 0.9.1 + adding patches to close 45736

6 files changed, 107 insertions, 4 deletions

diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog
index c3ac34089639..a244865433e3 100644
--- a/media-libs/libfame/ChangeLog
+++ b/media-libs/libfame/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libfame
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.20 2004/07/29 03:56:26 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.21 2004/09/27 02:02:27 morfic Exp $
+
+*libfame-0.9.1 (26 Sep 2004)
+
+  26 Sep 2004; Daniel Goller <morfic@gentoo.org>
+  +files/libfame-0.9.1-gcc34.patch, +files/libfame-0.9.1-mmx_configure.patch,
+  +libfame-0.9.1.ebuild:
+  Bump to 0.9.1 + adding of patches, closing bug #45736
+  Thanks to Bret Towe for supplying patches and Halcyon for testing
 
   28 Jul 2004; Tom Gall <tgall@gentoo.org> libfame-0.9.0-r1.ebuild:
   stable on ppc64, bug #55076
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index d8a872a506a7..4a321bc4c464 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -1,7 +1,11 @@
-MD5 95d0e85276a0e17f7dc8568669465fbc ChangeLog 2037
-MD5 e6eff5d97947f002068d42df3bf8ec65 libfame-0.8.10.ebuild 799
 MD5 da12d99d272fbcbee3c705fc4207bbd9 libfame-0.9.0-r1.ebuild 1062
 MD5 9027395205681c09733075c6c1bef251 libfame-0.9.0.ebuild 1019
+MD5 e6eff5d97947f002068d42df3bf8ec65 libfame-0.8.10.ebuild 799
+MD5 45eb2140aac34da1f74d1e345027f155 ChangeLog 2345
+MD5 0322367ad091fd0ced3ec6c239831b02 libfame-0.9.1.ebuild 1251
 MD5 c3a2bb99aa1812617fb10c1738955aad files/digest-libfame-0.8.10 66
-MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0 65
+MD5 1833e1c064e17bf9a9d0588a72aa9be6 files/libfame-0.9.1-gcc34.patch 629
+MD5 a51e496784f3b72b161e5b53f191f1f5 files/libfame-0.9.1-mmx_configure.patch 873
 MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0-r1 65
+MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0 65
+MD5 ee02d656f68ae66ef4fe16890e05e3ac files/digest-libfame-0.9.1 65
diff --git a/media-libs/libfame/files/digest-libfame-0.9.1 b/media-libs/libfame/files/digest-libfame-0.9.1
new file mode 100644
index 000000000000..42010349c39e
--- /dev/null
+++ b/media-libs/libfame/files/digest-libfame-0.9.1
@@ -0,0 +1 @@
+MD5 880085761e17a3b4fc41f4f6f198fd3b libfame-0.9.1.tar.gz 296837
diff --git a/media-libs/libfame/files/libfame-0.9.1-gcc34.patch b/media-libs/libfame/files/libfame-0.9.1-gcc34.patch
new file mode 100644
index 000000000000..0d340f4fdb5a
--- /dev/null
+++ b/media-libs/libfame/files/libfame-0.9.1-gcc34.patch
@@ -0,0 +1,17 @@
+--- libfame-0.9.1/src/half_mmx.h.old	2004-09-26 17:20:09.424203697 -0700
++++ libfame-0.9.1/src/half_mmx.h	2004-09-26 17:21:22.612577356 -0700
+@@ -28,10 +28,10 @@
+   short _mmx_rc[4]; /* rounding control */
+   register short *rc = _mmx_rc;
+ 
+-  _mmx_rc[0] = 1 - rounding;
+-  _mmx_rc[1] = 1 - rounding;
+-  _mmx_rc[2] = 1 - rounding;
+-  _mmx_rc[3] = 1 - rounding;
++  _mmx_rc[0] = _mmx_one[0] - rounding;
++  _mmx_rc[1] = _mmx_one[1] - rounding;
++  _mmx_rc[2] = _mmx_one[2] - rounding;
++  _mmx_rc[3] = _mmx_one[3] - rounding;
+ 
+   asm volatile ("movl (%0), %3\n"          /* %3 = ref[0] */
+ 		"pxor %%mm7, %%mm7\n"      /* mm7 = 0 */
diff --git a/media-libs/libfame/files/libfame-0.9.1-mmx_configure.patch b/media-libs/libfame/files/libfame-0.9.1-mmx_configure.patch
new file mode 100644
index 000000000000..2147f4a0a604
--- /dev/null
+++ b/media-libs/libfame/files/libfame-0.9.1-mmx_configure.patch
@@ -0,0 +1,18 @@
+--- libfame-0.9.1/configure.old	2004-09-26 16:07:59.695368069 -0700
++++ libfame-0.9.1/configure	2004-09-26 16:09:55.735276533 -0700
+@@ -4607,12 +4607,9 @@
+ if test x$ac_cv_c_compiler_gnu = xyes; then
+ 	CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math"
+ 
+-	gcc_major_version=`$CC --version | \
+-	   sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+-    	gcc_minor_version=`$CC --version | \
+-	   sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+-	gcc_micro_version=`$CC --version | \
+-	   sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++	gcc_major_version=`${CC} -dumpversion | cut -f1 -d.`
++    	gcc_minor_version=`${CC} -dumpversion | cut -f2 -d.`
++	gcc_micro_version=`${CC} -dumpversion | cut -f3 -d.`
+ 
+ 		if test $gcc_major_version -eq 2; then
+ 		if test $gcc_minor_version -gt 94; then
diff --git a/media-libs/libfame/libfame-0.9.1.ebuild b/media-libs/libfame/libfame-0.9.1.ebuild
new file mode 100644
index 000000000000..4f1093561538
--- /dev/null
+++ b/media-libs/libfame/libfame-0.9.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.1 2004/09/27 02:02:27 morfic Exp $
+
+inherit flag-o-matic gnuconfig gcc
+
+DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
+SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
+HOMEPAGE="http://fame.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ppc64"
+IUSE="mmx sse"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Do not add -march=i586, bug #41770.
+	sed -i -e 's:-march=i[345]86 ::g' configure
+
+	#closing bug #45736
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		epatch ${FILESDIR}/${P}-mmx_configure.patch
+		epatch ${FILESDIR}/${P}-gcc34.patch
+	fi
+
+	# This is needed for alpha and probably other newer arches (amd64)
+	# (13 Jan 2004 agriffis)
+	gnuconfig_update
+}
+
+src_compile() {
+#	filter-flags -fprefetch-loop-arrays
+	econf $(use_enable mmx) $(use_enable sse) || die
+	emake || die
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/lib
+
+	einstall install || die
+	dobin libfame-config
+
+	insinto /usr/share/aclocal
+	doins libfame.m4
+
+	dodoc CHANGES README
+	doman doc/*.3
+}