7 files changed, 33 insertions, 12 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 11f6e09fb7f8..11255a7881bd 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.47 2004/12/16 10:32:45 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.48 2005/02/06 18:30:56 luckyduck Exp $
+
+  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ffmpeg-0.4.7.ebuild,
+  ffmpeg-0.4.8.20040222.ebuild, ffmpeg-0.4.8.20040322-r1.ebuild,
+  ffmpeg-0.4.8.20040322.ebuild, ffmpeg-0.4.8.ebuild, ffmpeg-0.4.9_pre1.ebuild:
+  added dummy src_test() to fix #77212
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org> ffmpeg-0.4.9_pre1.ebuild:
   Stable on ppc64
diff --git a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
index cb65f698fe0a..93159adb042b 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.10 2004/12/14 12:16:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.11 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic
 
@@ -66,3 +66,5 @@ src_install() {
 	insinto /etc
 	doins doc/ffserver.conf
 }
+
+src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
index 1abf983ffbf8..8658da518a8d 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild,v 1.8 2004/12/14 12:16:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild,v 1.9 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic
 
@@ -104,3 +104,6 @@ src_install() {
 
 	preplib /usr
 }
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
index 751ed7d44523..e67528d2ee47 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.12 2004/12/14 12:16:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.13 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -115,3 +115,6 @@ src_install() {
 
 	preplib /usr
 }
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
index b6c504599902..a7b8c4d6600b 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild,v 1.12 2004/12/14 12:16:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild,v 1.13 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic
 
@@ -103,3 +103,6 @@ src_install() {
 
 	preplib /usr
 }
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
index 3abcc6b3a9e9..2240831ae0e6 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.13 2005/01/03 03:12:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.14 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic
 
@@ -26,6 +26,8 @@ src_unpack() {
 	unpack ${A} || die
 	cd ${S}
 
+	epatch ${FILESDIR}/${P}.diff
+
 	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
 	cd ${S}
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
index d2614149ab9b..995e7318b1fa 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild,v 1.8 2005/01/03 03:12:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild,v 1.9 2005/02/06 18:30:56 luckyduck Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -114,3 +114,6 @@ src_install() {
 
 	preplib /usr
 }
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }