Add fix for gcc-4.3 warning, bug 256799. Thanks to Gene Seto <geneseto@hotmail.com> for patch. Drop old version.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 47 insertions, 49 deletions

diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog
index 421e58a138e8..82d0bdc08ad7 100644
--- a/media-libs/libfame/ChangeLog
+++ b/media-libs/libfame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libfame
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.51 2007/02/22 01:53:39 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.52 2009/02/15 00:08:23 loki_val Exp $
+
+  15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libfame-0.9.1-gcc43.patch, -libfame-0.9.0.ebuild,
+  libfame-0.9.1-r1.ebuild:
+  Add fix for gcc-4.3 warning, bug 256799. Thanks to Gene Seto
+  <geneseto@hotmail.com> for patch. Drop old version.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 798ba8f1a8f7..8e1301c21d44 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -1,7 +1,6 @@
-DIST libfame-0.9.0.tar.gz 236651 RMD160 0d5d502bf965f6d6adf5e7fdd70f90d058322003 SHA1 e572dab51ddaabf81b36e0a1ede8b4e3a5e9983f SHA256 200ddd4885dfd13c441a8d64faeb2fb888497e6f9ba11fd96ee6a2560ee25ace
+AUX libfame-0.9.1-gcc43.patch 1190 RMD160 d0ff369d2a4ef99f544f248589eecb0b08c9a996 SHA1 4b52f798b94d29762c74f186cbd95d391212a407 SHA256 383799415714250e2cfd4ff2ab8ff94ce30939ad198c54e15d4179d60f8a5083
 DIST libfame-0.9.1.tar.gz 296837 RMD160 04a31af52159619676fc4214d768e7ae3394687f SHA1 2b3c04f8be5ab715cda2bb6aef847e7d2d4709ee SHA256 7b2c5b883db98e99476ae07bbf4f3aa91615e74a4d7fc918cb79154dd4fc08e1
 DIST libfame-patches-2.tar.bz2 5324 RMD160 9447a9d2c4aa09c8c984bef3d8a9e08ecbde81cc SHA1 2e112412abe6bd7dea1c31cfe196042deed8ecc3 SHA256 abe183ef106198c0023de087a4597a5ef3b2784a456b14509c2c235d50d56a9e
-EBUILD libfame-0.9.0.ebuild 864 RMD160 43dc9bd360bc672eebd79717a8f46e546fbbeeca SHA1 fc1380f7df2dfdd8a7ec19a40b06212ff81db495 SHA256 87b959d99fb518262c92483f49812b833d66c05c9dca09522af23899cd7c33e5
-EBUILD libfame-0.9.1-r1.ebuild 1044 RMD160 36908bc3e7ffba7d39a944a82b10619a8e490514 SHA1 1136f146378a55ebe84a18ec701582b6d99b8278 SHA256 0ae277751b2c7fcc51a5e2c313525d9590ae4166cbc20daaf6d859c8fc2b2d02
-MISC ChangeLog 5844 RMD160 475a0094897e2f3d2c62418f21de2167ab2eecaf SHA1 16d06395a1d475f5f85d66b2be9ce0c0952c4521 SHA256 a61b8e88f0f5c2477c431cc10ef5aedfcbf7bc7a0a42eb6354ee4fb16404c1ef
+EBUILD libfame-0.9.1-r1.ebuild 1082 RMD160 f536fc3b646c7b8746b9ffdb45a2339e3fe1ba17 SHA1 50295556841a80df1af411182cf329f66a40f377 SHA256 c00cfac9a82ddb877e656449f6368e323d88ac75f80ac6ce7841bdfab7bd1df5
+MISC ChangeLog 6104 RMD160 53ac83f79a857e3e9bf5fdf36788a3533f9ee085 SHA1 8aa0c3f87e2777512a47eed63359b179ec6020c3 SHA256 e0c7dabc65a0376fc1c6dea59d6908329d2033e45f3833b3be7966bc43d34da3
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-libs/libfame/files/libfame-0.9.1-gcc43.patch b/media-libs/libfame/files/libfame-0.9.1-gcc43.patch
new file mode 100644
index 000000000000..71fdbf59c522
--- /dev/null
+++ b/media-libs/libfame/files/libfame-0.9.1-gcc43.patch
@@ -0,0 +1,33 @@
+diff -rupN libfame-0.9.1b/src/fame_motion_pmvfast.c libfame-0.9.1/src/fame_motion_pmvfast.c
+--- libfame-0.9.1b/src/fame_motion_pmvfast.c	2009-02-03 01:30:26.000000000 -0400
++++ libfame-0.9.1/src/fame_motion_pmvfast.c	2009-02-03 01:31:33.000000000 -0400
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "fame.h"
+ #include "fame_malloc.h"
+ #include "fame_motion.h"
+diff -rupN libfame-0.9.1b/src/fame_rate_1param.c libfame-0.9.1/src/fame_rate_1param.c
+--- libfame-0.9.1b/src/fame_rate_1param.c	2009-02-03 01:30:26.000000000 -0400
++++ libfame-0.9.1/src/fame_rate_1param.c	2009-02-03 01:31:15.000000000 -0400
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <math.h>
+ #include "fame.h"
+ #include "fame_rate_1param.h"
+diff -rupN libfame-0.9.1b/src/fame_rate_simple.c libfame-0.9.1/src/fame_rate_simple.c
+--- libfame-0.9.1b/src/fame_rate_simple.c	2009-02-03 01:30:26.000000000 -0400
++++ libfame-0.9.1/src/fame_rate_simple.c	2009-02-03 01:30:57.000000000 -0400
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <math.h>
+ #include "fame.h"
+ #include "fame_rate_simple.h"
diff --git a/media-libs/libfame/libfame-0.9.0.ebuild b/media-libs/libfame/libfame-0.9.0.ebuild
deleted file mode 100644
index 789959d29c97..000000000000
--- a/media-libs/libfame/libfame-0.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.0.ebuild,v 1.24 2006/10/28 23:39:39 flameeyes Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
-HOMEPAGE="http://fame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="mmx"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	[[ "${ARCH}" == "amd64" ]] && libtoolize -c -f
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	econf $(use_enable mmx) || 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
-}
diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild
index 2b9b4812cc45..59d915689e0b 100644
--- a/media-libs/libfame/libfame-0.9.1-r1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 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-r1.ebuild,v 1.25 2006/10/28 23:39:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.26 2009/02/15 00:08:23 loki_val Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 
 	# Do not add -march=i586, bug #41770.
 	sed -i -e 's:-march=i[345]86 ::g' configure
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_compile() {