public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/
@ 2015-09-05 14:49 Pacho Ramos
  0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2015-09-05 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1bbf8572cdc1aea88d4088f59b693f92957d2347
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 14:49:05 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 14:49:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbf8572

media-plugins/gst-plugins-libav: Drop old

Package-Manager: portage-2.2.20.1

 media-plugins/gst-plugins-libav/Manifest           |   1 -
 .../files/gst-plugins-libav-1.2.4-ffmpeg2.patch    | 120 ---------------------
 .../gst-plugins-libav-1.2.4-fix-memory-leak.patch  |  96 -----------------
 .../gst-plugins-libav-1.2.4-r1.ebuild              |  76 -------------
 .../gst-plugins-libav-1.2.4.ebuild                 |  74 -------------
 .../gst-plugins-libav-1.4.5.ebuild                 |  58 ----------
 6 files changed, 425 deletions(-)

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 1e99597..8ecd889 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,2 +1 @@
-DIST gst-libav-1.2.4.tar.xz 4580144 SHA256 2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037 SHA512 64b24f0995865bc736946ad0709b37d6557ce1b91359371c7aaf48d02a0cb486f3bf90b72f483c8ccb661cd5fb637564809bc92d070ad901576bae5b17db0273 WHIRLPOOL 94948887c9ff642ab7e87695acb19b2a210946dd1938776d7d653017fc5231c9144e48c3d467f8c893513a29976d4e8b88457ed44bb0849cdb6f721e1ea576b0
 DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2

diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch
deleted file mode 100644
index 3deeea0..0000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Index: gst-libav-1.2.0/ext/libav/gstavauddec.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavauddec.c
-+++ gst-libav-1.2.0/ext/libav/gstavauddec.c
-@@ -460,7 +460,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA
-     GstBuffer ** outbuf, GstFlowReturn * ret)
- {
-   gint len = -1;
--  gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+  gint have_data = 0;
-   AVPacket packet;
-   AVFrame frame;
- 
-Index: gst-libav-1.2.0/ext/libav/gstavaudenc.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavaudenc.c
-+++ gst-libav-1.2.0/ext/libav/gstavaudenc.c
-@@ -289,7 +289,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
-   ffmpegaudenc->context->coder_type = 0;
-   ffmpegaudenc->context->context_model = 0;
-   ffmpegaudenc->context->scenechange_threshold = 0;
--  ffmpegaudenc->context->inter_threshold = 0;
- 
-   /* fetch pix_fmt and so on */
-   gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context);
-Index: gst-libav-1.2.0/ext/libav/gstavcfg.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavcfg.c
-+++ gst-libav-1.2.0/ext/libav/gstavcfg.c
-@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void)
-       {FF_IDCT_INT, "JPEG reference Integer", "int"},
-       {FF_IDCT_SIMPLE, "Simple", "simple"},
-       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
--      {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"},
-       {FF_IDCT_ARM, "ARM", "arm"},
-       {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"},
-       {FF_IDCT_SH4, "SH4", "sh4"},
-       {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"},
--      {FF_IDCT_H264, "H264", "h264"},
--      {FF_IDCT_VP3, "VP3", "vp3"},
-       {FF_IDCT_IPP, "IPP", "ipp"},
-       {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"},
-       {0, NULL, NULL},
-@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void)
-           "global-headers"},
-       {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction",
-           "aic"},
--      {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"},
--      {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection",
--          "qp-rd"},
-       {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"},
-       {0, NULL, NULL},
-     };
-@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void)
-       -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-   gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL);
- 
--  pspec = g_param_spec_int ("luma-elim-threshold",
--      "Luma Elimination Threshold",
--      "Luma Single Coefficient Elimination Threshold",
--      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
--  gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL);
--
--  pspec = g_param_spec_int ("chroma-elim-threshold",
--      "Chroma Elimination Threshold",
--      "Chroma Single Coefficient Elimination Threshold",
--      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
--  gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
--
-   pspec = g_param_spec_float ("lumi-masking", "Luminance Masking",
-       "Luminance Masking", -1.0f, 1.0f, 0.0f,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-Index: gst-libav-1.2.0/ext/libav/gstavcodecmap.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavcodecmap.c
-+++ gst-libav-1.2.0/ext/libav/gstavcodecmap.c
-@@ -788,12 +788,10 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
-           break;
-       }
- 
--      /* FIXME: context->sub_id must be filled in during decoding */
-       caps =
-           gst_ff_vid_caps_new (context, NULL, codec_id, encode,
-           "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL);
-       if (context) {
--        gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
-         if (context->extradata_size >= 8) {
-           gst_caps_set_simple (caps,
-               "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
-@@ -2892,18 +2890,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod
-     }
-       break;
- 
--    case AV_CODEC_ID_RV10:
--    case AV_CODEC_ID_RV20:
--    case AV_CODEC_ID_RV30:
--    case AV_CODEC_ID_RV40:
--    {
--      gint format;
--
--      if (gst_structure_get_int (str, "format", &format))
--        context->sub_id = format;
--
--      break;
--    }
-     case AV_CODEC_ID_COOK:
-     case AV_CODEC_ID_RA_288:
-     case AV_CODEC_ID_RA_144:
-Index: gst-libav-1.2.0/ext/libav/gstavvidenc.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavvidenc.c
-+++ gst-libav-1.2.0/ext/libav/gstavvidenc.c
-@@ -338,7 +338,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc
-   ffmpegenc->context->coder_type = 0;
-   ffmpegenc->context->context_model = 0;
-   ffmpegenc->context->scenechange_threshold = 0;
--  ffmpegenc->context->inter_threshold = 0;
- 
-   /* and last but not least the pass; CBR, 2-pass, etc */
-   ffmpegenc->context->flags |= ffmpegenc->pass;

diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch
deleted file mode 100644
index 6745e80..0000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- ext/libav/gstavviddec.c
-+++ ext/libav/gstavviddec.c
-@@ -523,6 +523,7 @@ open_failed:
- 
- typedef struct
- {
-+  GstFFMpegVidDec *ffmpegdec;
-   GstVideoCodecFrame *frame;
-   gboolean mapped;
-   GstVideoFrame vframe;
-@@ -530,13 +531,17 @@ typedef struct
- } GstFFMpegVidDecVideoFrame;
- 
- static GstFFMpegVidDecVideoFrame *
--gst_ffmpegviddec_video_frame_new (GstVideoCodecFrame * frame)
-+gst_ffmpegviddec_video_frame_new (GstFFMpegVidDec * ffmpegdec,
-+    GstVideoCodecFrame * frame)
- {
-   GstFFMpegVidDecVideoFrame *dframe;
- 
-   dframe = g_slice_new0 (GstFFMpegVidDecVideoFrame);
-+  dframe->ffmpegdec = ffmpegdec;
-   dframe->frame = frame;
- 
-+  GST_DEBUG_OBJECT (ffmpegdec, "new video frame %p", dframe);
-+
-   return dframe;
- }
- 
-@@ -544,6 +549,8 @@ static void
- gst_ffmpegviddec_video_frame_free (GstFFMpegVidDec * ffmpegdec,
-     GstFFMpegVidDecVideoFrame * frame)
- {
-+  GST_DEBUG_OBJECT (ffmpegdec, "free video frame %p", frame);
-+
-   if (frame->mapped)
-     gst_video_frame_unmap (&frame->vframe);
-   gst_video_decoder_release_frame (GST_VIDEO_DECODER (ffmpegdec), frame->frame);
-@@ -551,6 +558,14 @@ gst_ffmpegviddec_video_frame_free (GstFFMpegVidDec * ffmpegdec,
-   g_slice_free (GstFFMpegVidDecVideoFrame, frame);
- }
- 
-+static void
-+dummy_free_buffer (void *opaque, uint8_t * data)
-+{
-+  GstFFMpegVidDecVideoFrame *frame = opaque;
-+
-+  gst_ffmpegviddec_video_frame_free (frame->ffmpegdec, frame);
-+}
-+
- /* called when ffmpeg wants us to allocate a buffer to write the decoded frame
-  * into. We try to give it memory from our pool */
- static int
-@@ -589,7 +604,8 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
-     goto duplicate_frame;
- 
-   /* GstFFMpegVidDecVideoFrame receives the frame ref */
--  picture->opaque = dframe = gst_ffmpegviddec_video_frame_new (frame);
-+  picture->opaque = dframe =
-+      gst_ffmpegviddec_video_frame_new (ffmpegdec, frame);
- 
-   GST_DEBUG_OBJECT (ffmpegdec, "storing opaque %p", dframe);
- 
-@@ -695,12 +711,20 @@ invalid_frame:
- fallback:
-   {
-     int c;
-+    gboolean first = TRUE;
-     int ret = avcodec_default_get_buffer (context, picture);
- 
-     GST_LOG_OBJECT (ffmpegdec, "performing fallback alloc");
--    for (c = 0; c < AV_NUM_DATA_POINTERS; c++)
-+    for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
-       ffmpegdec->stride[c] = picture->linesize[c];
- 
-+      if (picture->buf[c] == NULL && first) {
-+        picture->buf[c] =
-+            av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
-+        first = FALSE;
-+      }
-+    }
-+
-     return ret;
-   }
- duplicate_frame:
-@@ -1684,8 +1718,8 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-     avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
-         linesize_align);
-     edge =
--        ffmpegdec->context->
--        flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
-+        ffmpegdec->
-+        context->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
-     /* increase the size for the padding */
-     width += edge << 1;
-     height += edge << 1;

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
deleted file mode 100644
index 70482c1..0000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
-	libav? (
-		<media-video/libav-10:0=[${MULTILIB_USEDEP}]
-		>=media-video/libav-9.12:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# compatibility with recent releases
-	# TODO: likely apply them with libav-10 when it's out but there will
-	# probably be an upstream gst-libav release compatible at that time.
-	if has_version '>=media-video/ffmpeg-2.0' ; then
-		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-			   -e 's/ CodecID/ AVCodecID/g' \
-			   ext/libav/*.{c,h} || die
-		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
-		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
-	fi
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if ! use libav; 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
-}

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
deleted file mode 100644
index e8be69c..0000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]
-	!!>=media-video/libav-10
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# compatibility with recent releases
-	# TODO: likely apply them with libav-10 when it's out but there will
-	# probably be an upstream gst-libav release compatible at that time.
-	if has_version '>=media-video/ffmpeg-2.0' ; then
-		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-			   -e 's/ CodecID/ AVCodecID/g' \
-			   ext/libav/*.{c,h} || die
-		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
-		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
-	fi
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
-
-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
-}

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild
deleted file mode 100644
index e3453c2..0000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
-	|| ( >=media-video/ffmpeg-2.2:0[${MULTILIB_USEDEP}] >=media-video/libav-9[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=743984
-	epatch "${FILESDIR}/${PN}-1.4.5-libav9.patch"
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/
@ 2016-09-18 22:44 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2016-09-18 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3788c2aac921eaeb031b62d68163a41197909fdb
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 21:49:46 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 22:43:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3788c2aa

media-plugins/gst-plugins-libav: version bump 1.8.2 → 1.8.3

Package-Manager: portage-2.3.0

 media-plugins/gst-plugins-libav/Manifest           |  1 +
 .../gst-plugins-libav-1.8.3-ffmpeg-compat.patch    | 51 ++++++++++++++
 .../gst-plugins-libav-1.8.3.ebuild                 | 77 ++++++++++++++++++++++
 3 files changed, 129 insertions(+)

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index b1daa73..ef3a87a 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,3 +1,4 @@
 DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
 DIST gst-libav-1.6.3.tar.xz 7700700 SHA256 857b9c060a0337de38c6d26238c47352433c02eabf26c2f860c854dbc35bd4ab SHA512 8e5fde08921937f96814b7953e142fb9affa48b22f90ed5a5895ec2f7bdfe320c28f83a93c17c93ba933266a5163ce689c3ee803e78256b3d664516dffff7d08 WHIRLPOOL 12070c01d74bb512a62a755d77bc558b1d29d7ffefbeafc20ee193cf7ebe9b4411f6a09784f02a83ff749853e2a5cd6140a71e00631e247dccfd0cc005db98fd
 DIST gst-libav-1.8.2.tar.xz 7982640 SHA256 b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a SHA512 7224bc11b640f770864568262b0e21af2282d692e115148bb621405d350aa3c56c5ee23d542aaebd3729111e293b92aeacd4863b83d2f801fb9d59171eb9a61c WHIRLPOOL 8fc82f33d86b7c393408ba72d86a2ce906093e7699009edf1c954d82e3524e2a15f3ebf7e0cff863a77d757fc399cc781f377ea0d8f3bf66ae5a19dd2d1c8722
+DIST gst-libav-1.8.3.tar.xz 7958532 SHA256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 SHA512 49aa96197cd32ad31e280870495d64cdfe4bde67507e9cb166b80d0c394b510e734befa3ff13d6fe0711be0ffa24dd0a63a77fb62af91ab776d9844059cb839d WHIRLPOOL 0109f897ce7d42d21b467b42a661f02900896ea90c085f731b1c69de9c4913de36f3d48544db6fd44a5b828614947b6b9b1d851af2c5f739fbb537ac3022af88

diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch
new file mode 100644
index 00000000..d6c027e
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch
@@ -0,0 +1,51 @@
+From f48282d442689f7559bfefd70929634a0bde3b84 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain@orangesquash.org.uk>
+Date: Fri, 2 Sep 2016 16:55:46 +0100
+Subject: [PATCH] Only use AV_CODEC_ID_WRAPPED_AVFRAME on new enough
+ libavcodecs
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770753
+---
+ ext/libav/gstavviddec.c | 7 +++++--
+ ext/libav/gstavvidenc.c | 7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index 8aabcb1..71310ec 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -2044,8 +2044,11 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
+         || in_plugin->id == AV_CODEC_ID_Y41P
+         || in_plugin->id == AV_CODEC_ID_012V
+         || in_plugin->id == AV_CODEC_ID_YUV4
+-        || in_plugin->id == AV_CODEC_ID_ZLIB
+-        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) {
++#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \
++        AV_VERSION_INT (57,4,0)
++        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME
++#endif
++        || in_plugin->id == AV_CODEC_ID_ZLIB) {
+       goto next;
+     }
+ 
+diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
+index 9fb7f64..2ec32d8 100644
+--- a/ext/libav/gstavvidenc.c
++++ b/ext/libav/gstavvidenc.c
+@@ -966,8 +966,11 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
+         || in_plugin->id == AV_CODEC_ID_Y41P
+         || in_plugin->id == AV_CODEC_ID_012V
+         || in_plugin->id == AV_CODEC_ID_YUV4
+-        || in_plugin->id == AV_CODEC_ID_ZLIB
+-        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) {
++#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \
++        AV_VERSION_INT (57,4,0)
++        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME
++#endif
++        || in_plugin->id == AV_CODEC_ID_ZLIB) {
+       goto next;
+     }
+ 
+-- 
+2.7.4
+

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild
new file mode 100644
index 00000000..91f7eea
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+# XXX: bzip2/lzma are automagic
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.8.5:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	# Fix compatibility with ffmpeg-2.8, by the fine Debian folks
+	"${FILESDIR}"/${PN}-1.8.3-ffmpeg-compat.patch
+)
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf
+
+	if use libav; then
+		ewarn "Using internal ffmpeg copy as upstream dropped the"
+		ewarn "the support for compiling against system libav"
+		ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"
+	else
+		myconf="--with-system-libav"
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/
@ 2017-09-02  4:19 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-09-02  4:19 UTC (permalink / raw
  To: gentoo-commits

commit:     fd34912a20515fbc9f11993403ce641e915f4985
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 20:36:23 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 04:18:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd34912a

media-plugins/gst-plugins-libav: remove old, dropping all sparc keywords

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-plugins/gst-plugins-libav/Manifest           |  1 -
 .../gst-plugins-libav-1.8.3-ffmpeg-compat.patch    | 51 ---------------
 .../gst-plugins-libav-1.8.3.ebuild                 | 76 ----------------------
 3 files changed, 128 deletions(-)

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index db4c18637f4..5c5c19eae05 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,4 +1,3 @@
 DIST gst-libav-1.10.3.tar.xz 8535624 SHA256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9 SHA512 9f394fc5a23fa887e65c851836d338f9eb55be2a981429cfa7175e1112465696b1326386ef45d675bf1186cf8f1fec50dd0861273c763aa20ab97aaa257a1907 WHIRLPOOL 0833598516fd5f71a7cc105a4508f9301aee8c5db3569010ceabd270a8059679661508e8e2ae4e6e9147212f1454868e3244d631fbaff9bdde22ca865247331a
 DIST gst-libav-1.10.4.tar.xz 8535052 SHA256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b SHA512 4037c4651c9f4c0e677f1f8136194c16319507dec3992270c1f98d461a69a55653d261ade45add833103872455e09c30695318181e81242ce78d1c2a2b95ca9c WHIRLPOOL 441ed31e9886a71bace9fadd9edcf8102db621cffa9185c087535e7fa4daedb14dd2cbf3a067868f821d36b58982b482c0c37d82907e079cbe0f3e48bb8a27f3
 DIST gst-libav-1.10.5.tar.xz 8545300 SHA256 e4d2f315f478d47281fbfdfbd590a63d23704ca37911d7142d5992616f4b28d3 SHA512 a0636a3b32a5c20eba69a0002fc549facebb0211774e13dd526a3a1eb710f3342662179af6275d619d5075ad0f6dc7068b9950cfb0c60e3ad48249475b39216b WHIRLPOOL 3b3ed00516ab8c4599ec249619390f4c4d478299bb5e14c2bbf532ab67d57881cf0584d33c78a6c5839008179b7815add6bf95437c7f2c65408469f9c4167457
-DIST gst-libav-1.8.3.tar.xz 7958532 SHA256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 SHA512 49aa96197cd32ad31e280870495d64cdfe4bde67507e9cb166b80d0c394b510e734befa3ff13d6fe0711be0ffa24dd0a63a77fb62af91ab776d9844059cb839d WHIRLPOOL 0109f897ce7d42d21b467b42a661f02900896ea90c085f731b1c69de9c4913de36f3d48544db6fd44a5b828614947b6b9b1d851af2c5f739fbb537ac3022af88

diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch
deleted file mode 100644
index d6c027ecb68..00000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.8.3-ffmpeg-compat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f48282d442689f7559bfefd70929634a0bde3b84 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Fri, 2 Sep 2016 16:55:46 +0100
-Subject: [PATCH] Only use AV_CODEC_ID_WRAPPED_AVFRAME on new enough
- libavcodecs
-
-https://bugzilla.gnome.org/show_bug.cgi?id=770753
----
- ext/libav/gstavviddec.c | 7 +++++--
- ext/libav/gstavvidenc.c | 7 +++++--
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 8aabcb1..71310ec 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -2044,8 +2044,11 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
-         || in_plugin->id == AV_CODEC_ID_Y41P
-         || in_plugin->id == AV_CODEC_ID_012V
-         || in_plugin->id == AV_CODEC_ID_YUV4
--        || in_plugin->id == AV_CODEC_ID_ZLIB
--        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) {
-+#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \
-+        AV_VERSION_INT (57,4,0)
-+        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME
-+#endif
-+        || in_plugin->id == AV_CODEC_ID_ZLIB) {
-       goto next;
-     }
- 
-diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
-index 9fb7f64..2ec32d8 100644
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -966,8 +966,11 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
-         || in_plugin->id == AV_CODEC_ID_Y41P
-         || in_plugin->id == AV_CODEC_ID_012V
-         || in_plugin->id == AV_CODEC_ID_YUV4
--        || in_plugin->id == AV_CODEC_ID_ZLIB
--        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) {
-+#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \
-+        AV_VERSION_INT (57,4,0)
-+        || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME
-+#endif
-+        || in_plugin->id == AV_CODEC_ID_ZLIB) {
-       goto next;
-     }
- 
--- 
-2.7.4
-

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild
deleted file mode 100644
index 035231ead80..00000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-# XXX: bzip2/lzma are automagic
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-2.8.5:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	# Fix compatibility with ffmpeg-2.8, by the fine Debian folks
-	"${FILESDIR}"/${PN}-1.8.3-ffmpeg-compat.patch
-)
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf
-
-	if use libav; then
-		ewarn "Using internal ffmpeg copy as upstream dropped the"
-		ewarn "the support for compiling against system libav"
-		ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"
-	else
-		myconf="--with-system-libav"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/
@ 2018-11-25 23:24 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-11-25 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     cb222dd95881897798eb4d0e9f6de1b8625dddb2
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 23:13:44 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 23:23:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb222dd9

media-plugins/gst-plugins-libav: add ffmpeg-4 compatibility patches, other tweaks

* Pull a selective patchset from git master, that brings in ffmpeg-4
  compatibility and some bug fixes; patchset tarball README has further details.
* Add a debian-inspired patch to tell gstreamer registry that the libav plugin
  supported features may change, when the system ffmpeg library files change.
  This should hopefully ensure that gstreamer sees new codecs immediately after
  system-ffmpeg is recompiled to add them. Compared to Debian, we conditionalize
  it based on USE=libav, so it's only actually done if system-ffmpeg is used, as
  for us it's a choice, not always system-ffmpeg; this is achieved via #ifndef,
  thus no conditional patching.
* Make bundled ffmpeg builds verbose for better build.log
* Try harder to honor user choices for bundled ffmpeg builds with USE=libav by
  always disabling debug and passing CFLAGS as optflags; courtesy of
  Arfrever Frehtes Taifersar Arahesis

Closes: https://bugs.gentoo.org/654628
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 media-plugins/gst-plugins-libav/Manifest           |   2 +
 .../files/external-ffmpeg4-dep.patch               |  20 ++++
 .../gst-plugins-libav-1.14.4.4.1_p20181115.ebuild  | 102 +++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 5582f7fc472..cfb18165022 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,4 +1,6 @@
 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
+DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
 DIST gst-libav-1.14.1.tar.xz 9031916 BLAKE2B 4f8426fd0c91ca9dd99d4d3820cee852610e957b4836b248f285a0d89b202af907f5f5f0ddb0cf2562eca6fb032a45ebe7fe3e6cbe5198f6d6852297cfd08091 SHA512 368d794d88b20fc879178c1984186a9dda7f8717e2e6bc17bd2dcd67be6d9dd55220da617f9872c40a63f5c9b3d11713ff96c8dbb0e4ffffb196f9464aae43d2
 DIST gst-libav-1.14.2.tar.xz 9036096 BLAKE2B 68000c35a1c582c93ad1113941ce17e1c4212e79a5eae627a1c41fb22a9d8fe2d5bb5165abb3ee81e36938b8c0485e2b7ac5f4a4d59199e28cbe0b35d3d85ef3 SHA512 ce8e7eba57b14d522b90c94f933987659b7d6e58e66513b4b3f41a70354a3d0065bb6d077285ed56074aaddff65c3d1f1fa7fb17fb2f75e94fbe814dffa790de
+DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717

diff --git a/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch b/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
new file mode 100644
index 00000000000..c264507102f
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
@@ -0,0 +1,20 @@
+diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c
+index 2a88230..f6a6303 100644
+--- a/ext/libav/gstav.c
++++ b/ext/libav/gstav.c
+@@ -155,6 +155,15 @@ plugin_init (GstPlugin * plugin)
+   /* build global ffmpeg param/property info */
+   gst_ffmpeg_cfg_init ();
+ 
++#ifndef HAVE_LIBAV_UNINSTALLED
++  /* Not using bundled ffmpeg - add a feature rescan dependency for system-ffmpeg */
++  gst_plugin_add_dependency_simple (plugin, NULL,
++      GIO_LIBDIR,
++      "libavcodec.so.58,"
++      "libavformat.so.58",
++      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
++#endif
++
+   gst_ffmpegaudenc_register (plugin);
+   gst_ffmpegvidenc_register (plugin);
+   gst_ffmpegauddec_register (plugin);

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
new file mode 100644
index 00000000000..8f541e0486a
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver multilib-minimal
+
+MY_PN="gst-libav"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${MY_PV}"
+FFMPEG_PV="$(ver_cut 4- ${PV%_*})"
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz
+	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] )
+	libav? (
+		app-arch/bzip2[${MULTILIB_USEDEP}]
+		app-arch/xz-utils[${MULTILIB_USEDEP}]
+	)
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
+	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
+)
+
+RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
+
+src_unpack() {
+	default
+
+	if use libav; then
+		# Use newer version of bundled FFmpeg.
+		rm -r "${S}/gst-libs/ext/libav" || die
+		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf # remove with a proper release without build system touching patchset
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf=()
+
+	if use libav; then
+		ewarn "Using bundled ffmpeg copy as upstream dropped"
+		ewarn "the support for compiling against system libav"
+		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
+
+		myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"")
+	else
+		myconf+=("--with-system-libav")
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror; verbose build
+	emake ERROR_CFLAGS= V=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/
@ 2021-02-19 23:03 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2021-02-19 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     30dcb6077b6ff408f0d8707f461fa01d55bf2c8c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 23:01:10 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 23:01:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30dcb607

media-plugins/gst-plugins-libav: remove old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 media-plugins/gst-plugins-libav/Manifest           |   4 -
 .../files/AVOptionsRanges-leak-fix.patch           |  34 -------
 .../gst-plugins-libav/files/fix-negative-pts.patch |  40 --------
 ...gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild | 104 ---------------------
 .../gst-plugins-libav-1.16.2-r1.ebuild             |  60 ------------
 media-plugins/gst-plugins-libav/metadata.xml       |   4 -
 6 files changed, 246 deletions(-)

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 9c0c950788b..d47fa3044c9 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1 @@
-DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
-DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
-DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
-DIST gst-libav-1.16.2.tar.xz 9466288 BLAKE2B c14f3921bf357541b6ae4b5095dbff963fec90aa9ae3ef59e7b52c1d1f68fce8f497de017a6654f293d7b489ff5a880896018f5de0412456668f60bae1b2a32a SHA512 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d
 DIST gst-libav-1.16.3.tar.xz 9472760 BLAKE2B 3e98381244d74aa695c737a898711b311518749c6f949af7bd03d08cdf383cbe1a78cea8e3f0268fdb2132bec930803f8fa31e919c6c268b6f8d58092f01fd04 SHA512 37fe621a8d45ac6bf51383a776f3091cc114faaf84b0097e86f33eb4e8c0b70b4cc6fa467aad63daca9b1b24db24c10a067c973ef8232c2965eedeba3d251b0b

diff --git a/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch b/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch
deleted file mode 100644
index 5594dbc1ab8..00000000000
--- a/media-plugins/gst-plugins-libav/files/AVOptionsRanges-leak-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a2c88ec9dadf4a6d7f5f7b16feb2c5c2e155d72d Mon Sep 17 00:00:00 2001
-From: Seungha Yang <seungha.yang@navercorp.com>
-Date: Sun, 13 Jan 2019 00:46:50 +0900
-Subject: [PATCH] avcfg: Fix AVOptionRanges leak
-
-It must be freed with av_opt_freep_ranges as documented.
----
- ext/libav/gstavcfg.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
-index 9236078..9d34462 100644
---- a/ext/libav/gstavcfg.c
-+++ b/ext/libav/gstavcfg.c
-@@ -252,10 +252,12 @@ install_opts (GObjectClass * gobject_class, const AVClass ** obj, guint prop_id,
-     if (g_object_class_find_property (gobject_class, name))
-       continue;
- 
--    if (av_opt_query_ranges (&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0
--        && r->nb_ranges == 1) {
--      min = r->range[0]->value_min;
--      max = r->range[0]->value_max;
-+    if (av_opt_query_ranges (&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) {
-+      if (r->nb_ranges == 1) {
-+        min = r->range[0]->value_min;
-+        max = r->range[0]->value_max;
-+      }
-+      av_opt_freep_ranges (&r);
-     }
- 
-     help = g_strdup_printf ("%s%s", opt->help, extra_help);
--- 
-2.17.0
-

diff --git a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch
deleted file mode 100644
index d5be422e781..00000000000
--- a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1d293764e55fb9c3901c9dfa903fa5ae0021ab10 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.com>
-Date: Thu, 21 Feb 2019 08:48:31 +0100
-Subject: [PATCH] avdemux: fix negative pts if start_time is bigger than the ts
-
-The start time is supposed to be the ts of the first frame.
-FFmpeg uses fractions to represent timestamps and the start time may use a
-different base than the frame pts. So we may end up having the start
-time bigger than the pts because of rounding when converting to gst ts.
-
-See https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/51
-for details.
----
- ext/libav/gstavdemux.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
-index 30e0360..3b74f92 100644
---- a/ext/libav/gstavdemux.c
-+++ b/ext/libav/gstavdemux.c
-@@ -1473,8 +1473,14 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux)
-     goto drop;
- #endif
- 
--  if (GST_CLOCK_TIME_IS_VALID (timestamp))
--    timestamp -= demux->start_time;
-+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
-+    /* start_time should be the ts of the first frame but it may actually be
-+     * higher because of rounding when converting to gst ts. */
-+    if (demux->start_time >= timestamp)
-+      timestamp = 0;
-+    else
-+      timestamp -= demux->start_time;
-+  }
- 
-   /* check if we ran outside of the segment */
-   if (demux->segment.stop != -1 && timestamp > demux->segment.stop)
--- 
-2.17.0
-

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
deleted file mode 100644
index 612b7bd335d..00000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver multilib-minimal
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_PV}"
-FFMPEG_PV="$(ver_cut 4- ${PV%_*})"
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz
-	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] )
-	libav? (
-		app-arch/bzip2[${MULTILIB_USEDEP}]
-		app-arch/xz-utils[${MULTILIB_USEDEP}]
-	)
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
-	"${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix
-	"${FILESDIR}"/fix-negative-pts.patch # extra patch from Feb 2019 to fix negative pts if start_time is bigger than the ts
-	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
-)
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-src_unpack() {
-	default
-
-	if use libav; then
-		# Use newer version of bundled FFmpeg.
-		rm -r "${S}/gst-libs/ext/libav" || die
-		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf # remove with a proper release without build system touching patchset
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf=()
-
-	if use libav; then
-		ewarn "Using bundled ffmpeg copy as upstream dropped"
-		ewarn "the support for compiling against system libav"
-		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
-
-		myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"")
-	else
-		myconf+=("--with-system-libav")
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror; verbose build
-	emake ERROR_CFLAGS= V=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
deleted file mode 100644
index 3c2fb1c94da..00000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver multilib-minimal
-
-MY_PN="gst-libav"
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-PATCHES=(
-	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
-)
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror; verbose build
-	emake ERROR_CFLAGS= V=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml
index 6653b2dae6f..42b76fdc5c1 100644
--- a/media-plugins/gst-plugins-libav/metadata.xml
+++ b/media-plugins/gst-plugins-libav/metadata.xml
@@ -5,8 +5,4 @@
 		<email>gstreamer@gentoo.org</email>
 		<name>GStreamer package maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="libav">Use bundled ffmpeg to support systems using
-			libav globally instead of <pkg>media-video/ffmpeg</pkg></flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-02-19 23:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-02  4:19 [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-libav/, media-plugins/gst-plugins-libav/files/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2021-02-19 23:03 Mart Raudsepp
2018-11-25 23:24 Mart Raudsepp
2016-09-18 22:44 Gilles Dartiguelongue
2015-09-05 14:49 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox