From f2c7cf61f2079730bb671652d28ada7e21f35ebe Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Tue, 5 Mar 2013 08:21:08 +0000 Subject: Clean up old revisions. (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key C6085806) --- media-plugins/gst-plugins-mpeg2enc/ChangeLog | 8 ++++++- .../gst-plugins-mpeg2enc-0.10.22-compile-fix.patch | 26 ---------------------- .../gst-plugins-mpeg2enc-0.10.22-r1.ebuild | 20 ----------------- .../gst-plugins-mpeg2enc-1.0.3.ebuild | 14 ------------ 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch delete mode 100644 media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild delete mode 100644 media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.0.3.ebuild (limited to 'media-plugins/gst-plugins-mpeg2enc') diff --git a/media-plugins/gst-plugins-mpeg2enc/ChangeLog b/media-plugins/gst-plugins-mpeg2enc/ChangeLog index 2562f3dd8a09..051746ad1e62 100644 --- a/media-plugins/gst-plugins-mpeg2enc/ChangeLog +++ b/media-plugins/gst-plugins-mpeg2enc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/gst-plugins-mpeg2enc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mpeg2enc/ChangeLog,v 1.13 2013/02/21 16:51:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mpeg2enc/ChangeLog,v 1.14 2013/03/05 08:21:08 eva Exp $ + + 05 Mar 2013; Gilles Dartiguelongue + -gst-plugins-mpeg2enc-0.10.22-r1.ebuild, + -files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch, + -gst-plugins-mpeg2enc-1.0.3.ebuild: + Clean up old revisions. 21 Feb 2013; Agostino Sarubbo gst-plugins-mpeg2enc-1.0.5.ebuild: diff --git a/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch b/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch deleted file mode 100644 index 771d75743806..000000000000 --- a/media-plugins/gst-plugins-mpeg2enc/files/gst-plugins-mpeg2enc-0.10.22-compile-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001 -From: Götz Waschk -Date: Tue, 24 May 2011 13:42:44 +0000 -Subject: mpeg2enc: support mjpegtools 2.0 - -This adds conditional includes for the renamed headers in mjpegtools 2.0. -Fixes: #650970. ---- -diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc -index acfda50..31f1a30 100644 ---- a/ext/mpeg2enc/gstmpeg2encoder.cc -+++ b/ext/mpeg2enc/gstmpeg2encoder.cc -@@ -26,7 +26,10 @@ - - #include - #include --#if GST_MJPEGTOOLS_API >= 10900 -+#if GST_MJPEGTOOLS_API >= 10903 -+#include -+#include -+#elif GST_MJPEGTOOLS_API >= 10900 - #include - #include - #include --- -cgit v0.9.0.2-2-gbebe diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild deleted file mode 100644 index fa5fe5a01706..000000000000 --- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild +++ /dev/null @@ -1,20 +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-mpeg2enc/gst-plugins-mpeg2enc-0.10.22-r1.ebuild,v 1.2 2012/12/02 16:24:29 eva Exp $ - -EAPI=2 - -inherit gst-plugins-bad - -DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-video/mjpegtools-1.9.0 - >=media-libs/gst-plugins-base-0.10.33:0.10" -DEPEND="${RDEPEND}" - -src_prepare() { - # Upstream patch to build against mjpegtools 2.0 - epatch "${FILESDIR}/${P}-compile-fix.patch" -} diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.0.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.0.3.ebuild deleted file mode 100644 index 701ca28c6aae..000000000000 --- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.0.3.ebuild +++ /dev/null @@ -1,14 +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-mpeg2enc/gst-plugins-mpeg2enc-1.0.3.ebuild,v 1.1 2012/12/05 22:53:49 eva Exp $ - -EAPI="5" - -inherit gst-plugins-bad - -DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-video/mjpegtools-2" -DEPEND="${RDEPEND}" -- cgit v1.2.3-65-gdbad