Bump to 0.10.5, take maintainership since it seems I'm stuck with it.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

7 files changed, 410 insertions, 3 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index eab3ed49da2d..3c3d54bf1505 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2008/06/25 20:13:38 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.87 2008/10/14 14:31:57 loki_val Exp $
+
+*gst-plugins-ffmpeg-0.10.5 (14 Oct 2008)
+
+  14 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/0.10.5/lavc.patch, +files/0.10.5/offset.patch,
+  +files/0.10.5/system-ffmpeg-warning.patch, metadata.xml,
+  +gst-plugins-ffmpeg-0.10.5.ebuild:
+  Bump to 0.10.5, take maintainership since it seems I'm stuck with it.
 
   25 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/0.10.4/system-ffmpeg-warning.patch,
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 85b4d05b4b9f..55cbd70f57bb 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -3,13 +3,18 @@ AUX 0.10.4/02_av_picture_copy.patch 4524 RMD160 38e0b4d994c1aea01073d61e363d2fa6
 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
+AUX 0.10.5/lavc.patch 8765 RMD160 fd4d4d6c0d9cea1202f511a071a8ebf4bb7bb80c SHA1 ba3b67eee7754122ca6adc49d899ad922355bd33 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad
+AUX 0.10.5/offset.patch 525 RMD160 bc69512dbd8cbf979bbcf88f07bb11ddc356ab04 SHA1 761f0c4fa50fb942b94996c52789b40558188ace SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33
+AUX 0.10.5/system-ffmpeg-warning.patch 3567 RMD160 a86a0b85d1b7972898ca775218fbab1e1897cbeb SHA1 5a06df62273146890585fc457f5bda9c2c77b13e SHA256 73c9cfa1006c6bca43d677a60ca8b2e30bca3b17c9855d11812afffa35542568
 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
 DIST gst-ffmpeg-0.10.4.tar.bz2 3011048 RMD160 efcea2a3953c147eabd2aaa7ff5a3656e1071ab9 SHA1 41977e74aed48154df2d831c652eef1bd42caf19 SHA256 840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2
+DIST gst-ffmpeg-0.10.5.tar.bz2 3031714 RMD160 ae314047c7a5feacc78dff4392f5e9989f88aac6 SHA1 795540b2277af922fd868b1ee62445274150f5ee SHA256 3316bf75739cbb36c9cd85b13026d09675fca349f29e9fdd29aa51712520c28b
 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 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
+EBUILD gst-plugins-ffmpeg-0.10.5.ebuild 1985 RMD160 39e576a980f1d363209a0e31e79be8a1b3739020 SHA1 d4a5193a74952c3da0df81462461560d49c45d70 SHA256 ed08f6e0488b5d6e4c46e51b54061e79ac9bc94a90da090aea787399a985a0e2
+MISC ChangeLog 13230 RMD160 fb5f04e7301fa7a07c65e1ec3e65951df89b7078 SHA1 a71b98d7d55c6c4277be59c3b82e422d11415da1 SHA256 59d02524201f00da6e2f07a8330fe3d827b59e2a2afd55ae81fef55f9aadfa85
+MISC metadata.xml 274 RMD160 9e7d796fa8d047131efb7cc8999a61cdd0c17701 SHA1 4c38ff2cf1b2f808958850b6948b369894cfe6a7 SHA256 e155ca80f41677a5239a09e196761abc31395a16d39a462d7ec6b60dc96122cb
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch
new file mode 100644
index 000000000000..9729ac9f37ac
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch
@@ -0,0 +1,233 @@
+Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcfg.c
+===================================================================
+--- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegcfg.c
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcfg.c
+@@ -272,7 +272,9 @@ gst_ffmpeg_flags_get_type (void)
+       {CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"},
+       {CODEC_FLAG_NORMALIZE_AQP,
+           "Normalize Adaptive Quantization (masking, etc)", "aqp"},
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+       {CODEC_FLAG_TRELLIS_QUANT, "Trellis Quantization", "trellis"},
++#endif
+       {CODEC_FLAG_GLOBAL_HEADER,
+             "Global headers in extradata instead of every keyframe",
+           "global-headers"},
+@@ -669,6 +671,11 @@ gst_ffmpeg_cfg_init ()
+       "Prediction Method",
+       GST_TYPE_FFMPEG_PRED_METHOD, FF_PRED_LEFT, G_PARAM_READWRITE);
+   gst_ffmpeg_add_pspec (pspec, config.prediction_method, FALSE, huffyuv, NULL);
++#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0)
++  pspec = g_param_spec_int ("trellis", "Trellis Quantization",
++      "Trellis RD quantization", 0, 1, 1, G_PARAM_READWRITE);
++  gst_ffmpeg_add_pspec (pspec, config.trellis, FALSE, mpeg, NULL);
++#endif
+ }
+ 
+ /* ==== END CONFIGURATION SECTION ==== */
+Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c
+===================================================================
+--- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegcodecmap.c
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c
+@@ -332,7 +332,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+           NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "depth", G_TYPE_INT, context->bits_per_sample, NULL);
++#else
++            "depth", G_TYPE_INT, context->bits_per_coded_sample, NULL);
++#endif
+       }
+       break;
+ 
+@@ -511,7 +515,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+       caps = gst_ff_vid_caps_new (context, codec_id, "video/x-huffyuv", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "bpp", G_TYPE_INT, context->bits_per_sample, NULL);
++#else
++            "bpp", G_TYPE_INT, context->bits_per_coded_sample, NULL);
++#endif
+       }
+       break;
+ 
+@@ -627,7 +635,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+           "layout", G_TYPE_STRING, "microsoft", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL);
++#else
++            "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL);
++#endif
+       } else {
+         gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL);
+       }
+@@ -638,7 +650,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+           "layout", G_TYPE_STRING, "quicktime", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL);
++#else
++            "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL);
++#endif
+       } else {
+         gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL);
+       }
+@@ -688,7 +704,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+       caps = gst_ff_vid_caps_new (context, codec_id, "video/x-camtasia", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL);
++#else
++            "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL);
++#endif
+       } else {
+         gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 8, 32, NULL);
+       }
+@@ -1026,7 +1046,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-alac", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "samplesize", G_TYPE_INT, context->bits_per_sample, NULL);
++#else
++            "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL);
++#endif
+       }
+       break;
+ 
+@@ -1049,7 +1073,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID
+       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-tta", NULL);
+       if (context) {
+         gst_caps_set_simple (caps,
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+             "samplesize", G_TYPE_INT, context->bits_per_sample, NULL);
++#else
++            "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL);
++#endif
+       }
+       break;
+     case CODEC_ID_VORBIS:
+@@ -1416,7 +1444,11 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps
+ 
+   gst_structure_get_int (structure, "width", &context->width);
+   gst_structure_get_int (structure, "height", &context->height);
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   gst_structure_get_int (structure, "bpp", &context->bits_per_sample);
++#else
++  gst_structure_get_int (structure, "bpp", &context->bits_per_coded_sample);
++#endif
+ 
+   fps = gst_structure_get_value (structure, "framerate");
+   if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) {
+@@ -1647,7 +1679,11 @@ gst_ffmpeg_caps_with_codecid (enum Codec
+       gint depth;
+ 
+       if (gst_structure_get_int (str, "depth", &depth)) {
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         context->bits_per_sample = depth;
++#else
++        context->bits_per_coded_sample = depth;
++#endif
+       } else {
+         GST_WARNING ("No depth field in caps %" GST_PTR_FORMAT, caps);
+       }
+@@ -1680,7 +1716,11 @@ gst_ffmpeg_caps_with_codecid (enum Codec
+         context->bit_rate = bitrate;
+     }
+     case CODEC_ID_ALAC:
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+       gst_structure_get_int (str, "samplesize", &context->bits_per_sample);
++#else
++      gst_structure_get_int (str, "samplesize", &context->bits_per_coded_sample);
++#endif
+       break;
+ 
+     case CODEC_ID_DVVIDEO:
+Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c
+===================================================================
+--- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegdec.c
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c
+@@ -696,7 +696,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, Gst
+ 
+   /* workaround encoder bugs */
+   ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT;
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   ffmpegdec->context->error_resilience = 1;
++#else
++  ffmpegdec->context->error_recognition = 1;
++#endif
+ 
+   /* for slow cpus */
+   ffmpegdec->context->lowres = ffmpegdec->lowres;
+@@ -2423,7 +2427,7 @@ gst_ffmpegdec_register (GstPlugin * plug
+   AVCodec *in_plugin;
+   gint rank;
+ 
+-  in_plugin = first_avcodec;
++  in_plugin = av_codec_next(NULL);
+ 
+   GST_LOG ("Registering decoders");
+ 
+@@ -2545,7 +2549,7 @@ gst_ffmpegdec_register (GstPlugin * plug
+       gst_caps_unref (sinkcaps);
+     if (srccaps)
+       gst_caps_unref (srccaps);
+-    in_plugin = in_plugin->next;
++    in_plugin = av_codec_next(in_plugin);
+   }
+ 
+   GST_LOG ("Finished Registering decoders");
+Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegenc.c
+===================================================================
+--- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegenc.c
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegenc.c
+@@ -306,8 +306,8 @@ gst_ffmpegenc_getcaps (GstPad * pad)
+     /* set some default properties */
+     ctx->width = DEFAULT_WIDTH;
+     ctx->height = DEFAULT_HEIGHT;
+-    ctx->time_base.num = DEFAULT_FRAME_RATE_BASE;
+-    ctx->time_base.den = 25 * DEFAULT_FRAME_RATE_BASE;
++    ctx->time_base.num = 1;
++    ctx->time_base.den = 25;
+     ctx->bit_rate = DEFAULT_VIDEO_BITRATE;
+     /* makes it silent */
+     ctx->strict_std_compliance = -1;
+@@ -391,7 +391,9 @@ gst_ffmpegenc_setcaps (GstPad * pad, Gst
+ 
+   /* RTP payload used for GOB production (for Asterisk) */
+   if (ffmpegenc->rtp_payload_size) {
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     ffmpegenc->context->rtp_mode = 1;
++#endif
+     ffmpegenc->context->rtp_payload_size = ffmpegenc->rtp_payload_size;
+   }
+ 
+@@ -944,13 +946,13 @@ gst_ffmpegenc_register (GstPlugin * plug
+   GType type;
+   AVCodec *in_plugin;
+ 
+-  in_plugin = first_avcodec;
+ 
+   GST_LOG ("Registering encoders");
+ 
+   /* build global ffmpeg param/property info */
+   gst_ffmpeg_cfg_init ();
+ 
++  in_plugin = av_codec_next(NULL);
+   while (in_plugin) {
+     gchar *type_name;
+     GstCaps *srccaps = NULL, *sinkcaps = NULL;
+@@ -1027,7 +1029,7 @@ gst_ffmpegenc_register (GstPlugin * plug
+       gst_caps_unref (sinkcaps);
+     if (srccaps)
+       gst_caps_unref (srccaps);
+-    in_plugin = in_plugin->next;
++    in_plugin = av_codec_next(in_plugin);
+   }
+ 
+   GST_LOG ("Finished registering encoders");
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch
new file mode 100644
index 000000000000..63b8c2271bf8
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch
@@ -0,0 +1,15 @@
+Index: gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegprotocol.c
+===================================================================
+--- gst-ffmpeg-0.10.4.orig/ext/ffmpeg/gstffmpegprotocol.c
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegprotocol.c
+@@ -175,8 +175,8 @@ gst_ffmpegdata_write (URLContext * h, un
+   return size;
+ }
+ 
+-static offset_t
+-gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence)
++static int64_t
++gst_ffmpegdata_seek (URLContext * h, int64_t pos, int whence)
+ {
+   GstProtocolInfo *info;
+   guint64 newpos;
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch
new file mode 100644
index 000000000000..e44173737d73
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch
@@ -0,0 +1,72 @@
+diff -NrU5 gst-ffmpeg-0.10.5.orig/configure gst-ffmpeg-0.10.5/configure
+--- gst-ffmpeg-0.10.5.orig/configure	2008-10-14 15:37:05.000000000 +0200
++++ gst-ffmpeg-0.10.5/configure	2008-10-14 15:38:00.000000000 +0200
+@@ -17231,68 +17231,10 @@
+ _ACEOF
+ 
+   HAVE_FFMPEG_UNINSTALLED=0
+   { $as_echo "$as_me:$LINENO: Using system-installed FFMpeg code" >&5
+ $as_echo "$as_me: Using system-installed FFMpeg code" >&6;}
+-  { $as_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
+-$as_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"
+ 
+   { $as_echo "$as_me:$LINENO: Using ffmpeg revision $FFMPEG_REVISION" >&5
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.5.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.5.ebuild
new file mode 100644
index 000000000000..0c26cb1952e4
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.5.ebuild
@@ -0,0 +1,70 @@
+# 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.5.ebuild,v 1.1 2008/10/14 14:31:57 loki_val Exp $
+
+inherit flag-o-matic eutils base
+
+PD=${FILESDIR}/${PV}
+MY_PN=${PN/-plugins}
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+#SLOT=0.10
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.4
+	>=media-libs/gst-plugins-base-0.10.4
+	>=dev-libs/liboil-0.3.6
+	>=media-video/ffmpeg-0.4.9_p20081014"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=(	"${PD}/offset.patch"
+		"${PD}/lavc.patch"
+		"${PD}/system-ffmpeg-warning.patch"
+	)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	base_src_unpack autopatch
+	sed -i \
+		-e 's,ffmpeg/avformat.h,libavformat/avformat.h,'		\
+		-e 's,ffmpeg/avcodec.h,libavcodec/avcodec.h,'			\
+		-e 's,ffmpeg/swscale.h,libswscale/swscale.h,'			\
+		-e 's,postproc/postprocess.h,libpostproc/postprocess.h,'	\
+		ext/ffmpeg/gst*							\
+		ext/libpostproc/gstpostproc.c					\
+		|| die "404. No files found."
+}
+
+src_compile() {
+	# Restrictions taken from the mplayer ebuild
+	# See bug #64262 for more info
+	# let's play the filtration game!
+	filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -msse3 -falign-functions -fweb
+	# ugly optimizations cause MPlayer to cry on x86 systems!
+	if use x86 ; then
+		replace-flags -O0 -O2
+		replace-flags -O3 -O2
+	fi
+
+	econf --with-system-ffmpeg
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-plugins/gst-plugins-ffmpeg/metadata.xml b/media-plugins/gst-plugins-ffmpeg/metadata.xml
index 3abe2ca2733e..a8473f337e5b 100644
--- a/media-plugins/gst-plugins-ffmpeg/metadata.xml
+++ b/media-plugins/gst-plugins-ffmpeg/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>gstreamer</herd>
 <herd>gnome</herd>
+<maintainer>
+	<email>loki_val@gentoo.org</email>
+	<name>Peter Alfredsen</name>
+</maintainer>
 </pkgmetadata>