summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-02 12:40:00 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-02 12:40:00 +0000
commit9c9a6659ebd89ff2229f6cad1e2cbe73806359ec (patch)
treeadf135a54bb86fe2c0d244137f2297baee319e52 /media-plugins
parentremove old (diff)
downloadgentoo-2-9c9a6659ebd89ff2229f6cad1e2cbe73806359ec.tar.gz
gentoo-2-9c9a6659ebd89ff2229f6cad1e2cbe73806359ec.tar.bz2
gentoo-2-9c9a6659ebd89ff2229f6cad1e2cbe73806359ec.zip
remove old
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/ChangeLog10
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch42
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch233
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch15
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch72
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch72
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild44
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild46
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild48
9 files changed, 9 insertions, 573 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index d19686ead127..45d2dd0e6a7d 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 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.164 2013/06/29 18:21:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.165 2013/07/02 12:40:00 aballier Exp $
+
+ 02 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+ -gst-plugins-ffmpeg-0.10.11-r1.ebuild, -gst-plugins-ffmpeg-0.10.13-r1.ebuild,
+ -gst-plugins-ffmpeg-0.10.13-r2.ebuild, -files/0.10.13-gcc-4.7.patch,
+ -files/0.10.5/lavc.patch, -files/0.10.5/offset.patch,
+ -files/0.10.5/system-ffmpeg-warning.patch,
+ -files/0.10.6/system-ffmpeg-warning.patch:
+ remove old
29 Jun 2013; Agostino Sarubbo <ago@gentoo.org>
gst-plugins-ffmpeg-0.10.13_p201211.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch
deleted file mode 100644
index 794495b01d2a..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
-+++ ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
-@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
- "2: \n\t"\
- \
- : "+a"(src), "+c"(dst)\
-- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
- : "memory"\
- );\
- src += 4-(h+5)*srcStride;\
-@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h264_qpel8or16_hv1_lowpass_ ## MMX(int16_
- QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
- "2: \n\t"\
- : "+a"(src)\
-- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
-+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
- : "memory"\
- );\
- tmp += 4;\
-@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
- "2: \n\t"\
- \
- : "+a"(src), "+c"(dst)\
-- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
- : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
- "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
- "memory"\
-@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, u
- QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
- "2: \n\t"
- : "+a"(src)
-- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
-+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
- : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
- "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
- "memory"
---
-1.7.9
-
-
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
deleted file mode 100644
index 9729ac9f37ac..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/lavc.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-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
deleted file mode 100644
index 63b8c2271bf8..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/offset.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index e44173737d73..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.5/system-ffmpeg-warning.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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/files/0.10.6/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch
deleted file mode 100644
index 6be9bb26ad3d..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.6/system-ffmpeg-warning.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -NrU5 gst-ffmpeg-0.10.6.orig/configure gst-ffmpeg-0.10.6/configure
---- gst-ffmpeg-0.10.6.orig/configure 2008-12-05 23:57:18.000000000 +0100
-+++ gst-ffmpeg-0.10.6/configure 2008-12-06 00:02:04.000000000 +0100
-@@ -17130,68 +17130,10 @@
- _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.11-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild
deleted file mode 100644
index 2a8238771868..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 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.11-r1.ebuild,v 1.10 2012/12/02 16:12:06 eva Exp $
-
-EAPI=1
-
-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 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+orc"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.25:0.10
- >=media-libs/gst-plugins-base-0.10.25:0.10
- orc? ( >=dev-lang/orc-0.4.5 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_compile() {
- append-flags -fno-strict-aliasing
-
- econf $(use_enable orc)
- 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/gst-plugins-ffmpeg-0.10.13-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
deleted file mode 100644
index e7239139b444..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 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.13-r1.ebuild,v 1.7 2012/12/02 23:08:35 eva Exp $
-
-EAPI=4
-
-inherit base eutils flag-o-matic
-
-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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+orc hardened"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.31
- >=media-libs/gst-plugins-base-0.10.31
- orc? ( >=dev-lang/orc-0.4.6 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch )
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- if ! use hardened; then
- econf $(use_enable orc)
- else
- # On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs
- econf $(use_enable orc) \
- --with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
- fi
-}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
deleted file mode 100644
index 9ecf7bd27e1c..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 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.13-r2.ebuild,v 1.14 2013/06/26 12:53:27 tetromino Exp $
-
-EAPI=4
-
-inherit base eutils flag-o-matic
-
-MY_PN=${PN/-plugins}
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-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 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+orc"
-
-S=${WORKDIR}/${MY_P}
-
-# the libpostproc dep should be cleaned in future
-RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
- >=media-libs/gst-plugins-base-0.10.31:0.10
- =virtual/ffmpeg-0.10*
- || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 )
- orc? ( >=dev-lang/orc-0.4.6 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- # always use system ffmpeg if possible
- econf \
- --with-system-ffmpeg \
- $(use_enable orc)
-}
-
-pkg_postinst() {
- if has_version "media-video/ffmpeg"; then
- elog "Please note that upstream uses media-video/libav"
- elog "rather than media-video/ffmpeg. If you encounter any"
- elog "issues try to move from ffmpeg to libav."
- fi
-}