Removed 15 second wait and warning message using unspeakable means.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 83 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 43d28ffd7410..eab3ed49da2d 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.85 2008/06/23 22:34:46 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.86 2008/06/25 20:13:38 loki_val Exp $
+
+  25 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/0.10.4/system-ffmpeg-warning.patch,
+  gst-plugins-ffmpeg-0.10.4-r1.ebuild:
+  Removed 15 second wait and warning message using unspeakable means.
 
 *gst-plugins-ffmpeg-0.10.4-r1 (23 Jun 2008)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index a0a905e60b2f..85b4d05b4b9f 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -2,6 +2,7 @@ AUX 0.10.4/01_new-codec-ids.patch 480 RMD160 6d104574a160609adbc4ebc709710a08421
 AUX 0.10.4/02_av_picture_copy.patch 4524 RMD160 38e0b4d994c1aea01073d61e363d2fa6d9830a12 SHA1 dbf0be37aeb7c8e7e592bdc81df70a5fab2a4831 SHA256 63c67fdd9a22cd69050bfa29b85e7c51c77a211967a18db57c9c60f99a07594f
 AUX 0.10.4/03_disable-aac.patch 578 RMD160 008bfffd264a0d7548f5ee311608970fbfa43db3 SHA1 134444d6c95bd18e240b2cf9ae41acce53f809cd SHA256 9c863f17c037efb9ac2093a743a080503863c7ed414e334816f842cf3010a0cc
 AUX 0.10.4/04_disable-mpegts.patch 1578 RMD160 42bbaf4583503cdfc989281eddcbb3b79bf7b898 SHA1 d8f97ac2e0d605847a422f266aa0d01a9076fd96 SHA256 e5e47a154cc60ef4379627ec0a4c42deafeab490106962ff735fbdfbe98ac057
+AUX 0.10.4/system-ffmpeg-warning.patch 3438 RMD160 1b71038b113e67d08b574b8a5ccd3e973996496d SHA1 643519922214d1cc375a9309d2c400e5b9f05048 SHA256 8b06b08ffda983965b8dcc61f5ddadf418b8ffee6daccd38d82b5cd80e1ede45
 DIST gst-ffmpeg-0.10.1.tar.bz2 2246682 RMD160 8106a431926c14411ce252f440ec6d1fbdd127d9 SHA1 a3bafaf83db1aadc14abc94c7d89cd7d2f739f0a SHA256 a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
 DIST gst-ffmpeg-0.10.2.tar.bz2 2515373 RMD160 844552e90da1b9b156042151722ec1b7a1c002ea SHA1 95ca222351a543c9a1f45e89e0695a3b709ec2f6 SHA256 ffa7c89bccab5d1be53b6fcedcf7a5c071d585cf522fee5864add05d350f5842
 DIST gst-ffmpeg-0.10.3.tar.bz2 2529034 RMD160 0a56e2c896fb14d000c734c75bd5f64a35a2efc3 SHA1 dd40cc38f7581412e5e23d2bf401cc66c9ba1f55 SHA256 b85899ac1c792db2e12d7063c45c0c6638dc8cc234d3ac6786b739cc6486439f
@@ -9,6 +10,6 @@ DIST gst-ffmpeg-0.10.4.tar.bz2 3011048 RMD160 efcea2a3953c147eabd2aaa7ff5a3656e1
 EBUILD gst-plugins-ffmpeg-0.10.1-r1.ebuild 1356 RMD160 e22b14cde21d4e69929205316d44ca10dce838a5 SHA1 64049ec884f036ea04367657367271e7682ab43f SHA256 baed3556c3628b5c209549af8489bb235dac2b355e92ad7a2f9d77e7dd8ceb99
 EBUILD gst-plugins-ffmpeg-0.10.2.ebuild 1395 RMD160 aa185e9e2bf0c22b46b821275f8cac8710fc73f4 SHA1 379825085337ac83d2d3b980d55bfb81cc805b81 SHA256 9d73dc90af87057b0eff9470fe0c19c7e8339d3213d673e9aae2294d40b23b62
 EBUILD gst-plugins-ffmpeg-0.10.3.ebuild 1429 RMD160 81608e0491265454d913a219163e8b8e90504a9a SHA1 bab3afa6bf58d1cc1c3a4ea28c99c35874690007 SHA256 84701d6c49f483e2dca32520ed17704766a508f91447680d71a32846fc89053c
-EBUILD gst-plugins-ffmpeg-0.10.4-r1.ebuild 2038 RMD160 f5a51f77d141c875e71468b473bf49be9e244670 SHA1 51c4f42f89ee559e6163f7ffa8553c32da1c78f6 SHA256 e622d53bf6a4a44f68c9c087cf71c57628d042da5a0bf6cf9e7b6f3ea8a07087
-MISC ChangeLog 12702 RMD160 8bcaf2c93fccc1e5303c55e69f591981b591fa09 SHA1 ee8ef86c2249f00aa00daab74d1ea40447496fbf SHA256 bf35c658d74b309c469ed894cde7b02e0f22b126b42e16e220bcda916083b22d
+EBUILD gst-plugins-ffmpeg-0.10.4-r1.ebuild 2077 RMD160 d911a70e6eeb35ede57a4137f9a422ea51ecbf16 SHA1 415730b82b79c13e85ec3389936c9b675f038d49 SHA256 6ba114011e94ebd80f039990e976b4889c2e49cdc9359a3908abf01a713b281b
+MISC ChangeLog 12910 RMD160 86b37ca4edfd54c4545073dea78193e425fbf409 SHA1 ead7d19b4f071cc814c8c5884bc6d61a6907133d SHA256 3b2e631860a684d35f3e35f37677180cb57ac31d055a0d6a0cf01bce8f3b4e96
 MISC metadata.xml 181 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d SHA1 faf40c45bd66b0072b95556cf7ab097d3be19511 SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch
new file mode 100644
index 000000000000..0a0ec05811fb
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch
@@ -0,0 +1,71 @@
+--- configure.old	2008-06-25 22:04:10.000000000 +0200
++++ configure	2008-06-25 22:04:44.000000000 +0200
+@@ -25559,68 +25559,11 @@
+ _ACEOF
+ 
+   HAVE_FFMPEG_UNINSTALLED=0
+   { echo "$as_me:$LINENO: Using system-installed FFMpeg code" >&5
+ echo "$as_me: Using system-installed FFMpeg code" >&6;}
+-  { echo "$as_me:$LINENO: WARNING:
+-  ======================================================================
+-   WARNING: you have chosen to build gst-ffmpeg against a random
+-   external version of ffmpeg instead of building it against the tested
+-   internal ffmpeg snapshot that is included with gst-ffmpeg.
+-
+-   This is a very bad idea.  So bad in fact that words cannot express
+-   just how bad it is.  Suffice to say that it is BAD.
+-
+-   The GStreamer developers cannot and will not support a gst-ffmpeg
+-   built this way.  Any bug reports that indicate there is an external
+-   version of ffmpeg involved will be closed immediately without further
+-   investigation.
+-
+-   The reason such a setup can't be supported is that the ffmpeg API
+-   and ABI is in constant flux, yet there aren't any official releases
+-   of the ffmpeg library to develop against.  This makes it impossible
+-   to guarantee that gst-ffmpeg will work reliably, or even compile,
+-   with a randomly picked version ffmpeg.  Even if gst-ffmpeg compiles
+-   and superficially appears to work fine against your chosen external
+-   ffmpeg version, that might just not be the case on other systems, or
+-   even the same system at a later time, or when using decoders,
+-   encoders, demuxers or muxers that have not been tested.
+-
+-   Please do not create or distribute binary packages of gst-ffmpeg
+-   that link against an external ffmpeg. Thank you!
+-  ======================================================================
+-  " >&5
+-echo "$as_me: WARNING:
+-  ======================================================================
+-   WARNING: you have chosen to build gst-ffmpeg against a random
+-   external version of ffmpeg instead of building it against the tested
+-   internal ffmpeg snapshot that is included with gst-ffmpeg.
+-
+-   This is a very bad idea.  So bad in fact that words cannot express
+-   just how bad it is.  Suffice to say that it is BAD.
+-
+-   The GStreamer developers cannot and will not support a gst-ffmpeg
+-   built this way.  Any bug reports that indicate there is an external
+-   version of ffmpeg involved will be closed immediately without further
+-   investigation.
+-
+-   The reason such a setup can't be supported is that the ffmpeg API
+-   and ABI is in constant flux, yet there aren't any official releases
+-   of the ffmpeg library to develop against.  This makes it impossible
+-   to guarantee that gst-ffmpeg will work reliably, or even compile,
+-   with a randomly picked version ffmpeg.  Even if gst-ffmpeg compiles
+-   and superficially appears to work fine against your chosen external
+-   ffmpeg version, that might just not be the case on other systems, or
+-   even the same system at a later time, or when using decoders,
+-   encoders, demuxers or muxers that have not been tested.
+-
+-   Please do not create or distribute binary packages of gst-ffmpeg
+-   that link against an external ffmpeg. Thank you!
+-  ======================================================================
+-  " >&2;}
+ 
+-    sleep 15
+ else
+ 
+   source "$srcdir/ffmpegrev"
+ 
+   { echo "$as_me:$LINENO: Using ffmpeg revision $FFMPEG_REVISION" >&5
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild
index 7495c0ca263c..70eab77b1ad0 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild,v 1.1 2008/06/23 22:34:46 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild,v 1.2 2008/06/25 20:13:38 loki_val Exp $
 
 inherit flag-o-matic eutils base
 
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
 PATCHES=(	"${PD}/01_new-codec-ids.patch"
 		"${PD}/02_av_picture_copy.patch"
 		"${PD}/03_disable-aac.patch"
-		"${PD}/04_disable-mpegts.patch" )
+		"${PD}/04_disable-mpegts.patch"
+		"${PD}/system-ffmpeg-warning.patch"	 )
 
 src_unpack() {
 	unpack ${A}