From 58b5f1323f61cbee81a564cbad43f82b6798591b Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Thu, 28 Apr 2005 23:47:08 +0000 Subject: add patch to stop some files taking up 100% cpu - fixes bug #86042 Package-Manager: portage-2.0.51.19 --- media-plugins/gst-plugins-ffmpeg/ChangeLog | 9 ++- media-plugins/gst-plugins-ffmpeg/Manifest | 15 ++-- .../files/digest-gst-plugins-ffmpeg-0.8.4-r1 | 1 + .../gst-plugins-ffmpeg-0.8.4-eoshangfix.patch | 26 +++++++ .../gst-plugins-ffmpeg-0.8.4-r1.ebuild | 79 ++++++++++++++++++++++ 5 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.4-r1 create mode 100644 media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch create mode 100644 media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.4-r1.ebuild (limited to 'media-plugins/gst-plugins-ffmpeg') diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog index cf17c380c1d8..488e8eada809 100644 --- a/media-plugins/gst-plugins-ffmpeg/ChangeLog +++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/gst-plugins-ffmpeg # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.21 2005/04/27 12:33:07 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.22 2005/04/28 23:47:08 zaheerm Exp $ + +*gst-plugins-ffmpeg-0.8.4-r1 (29 Apr 2005) + + 29 Apr 2005; Zaheer Abbas Merali + +files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch, + +gst-plugins-ffmpeg-0.8.4-r1.ebuild: + add patch to stop some files taking up 100% cpu - fixes bug #86042 27 Apr 2005; Jan Brinkmann gst-plugins-ffmpeg-0.8.4.ebuild: diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest index b20d214014f9..6d694ffed746 100644 --- a/media-plugins/gst-plugins-ffmpeg/Manifest +++ b/media-plugins/gst-plugins-ffmpeg/Manifest @@ -1,16 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 31046b18273d29b45a5f47c0c310714f gst-plugins-ffmpeg-0.8.4-r1.ebuild 1628 MD5 8ccb48a3ec5c83cc8ca7b1f154477ebe gst-plugins-ffmpeg-0.8.4.ebuild 1481 MD5 c6df16e12242d62555376bea35deb23b gst-plugins-ffmpeg-0.8.3.ebuild 1478 -MD5 b0ec069dd965753956bd9978d695540d ChangeLog 2952 +MD5 b94a4cb20cf7ece8404c835fc9a022c5 ChangeLog 3211 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181 MD5 b850e943e0aae6df3e751236cb339e0a files/digest-gst-plugins-ffmpeg-0.8.3 70 MD5 bca5ec805820433590977e10928cc8a3 files/digest-gst-plugins-ffmpeg-0.8.4 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCb4aU06ebR+OMO78RAsWSAJ47h8OreIAKXO4KSt5H6mNh/YGIngCfXdrY -JZ6sfpyZl1WZ3FZCOdJffqw= -=YX8a ------END PGP SIGNATURE----- +MD5 bca5ec805820433590977e10928cc8a3 files/digest-gst-plugins-ffmpeg-0.8.4-r1 70 +MD5 17bff3394f5317a370ff75f983c76d16 files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch 905 diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.4-r1 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.4-r1 new file mode 100644 index 000000000000..caca8ddbc7c4 --- /dev/null +++ b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.4-r1 @@ -0,0 +1 @@ +MD5 2260b732c563de7db984d9e5e440174d gst-ffmpeg-0.8.4.tar.bz2 1808120 diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch new file mode 100644 index 000000000000..a14fffe571ab --- /dev/null +++ b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch @@ -0,0 +1,26 @@ +=================================================================== +RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v +rcsdiff: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.94 +retrieving revision 1.95 +diff -u -r1.94 -r1.95 +--- gstffmpegdec.c 2005/04/02 10:01:20 1.94 ++++ gstffmpegdec.c 2005/04/14 10:50:15 1.95 +@@ -778,14 +778,15 @@ + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_EOS: { +- gint have_data, len; ++ gint have_data, len, try = 0; + ++ /* max. 10 times, for safety (see e.g. #300200) */ + do { + len = gst_ffmpegdec_frame (ffmpegdec, NULL, 0, &have_data, + &ffmpegdec->next_ts); + if (len < 0 || have_data == 0) + break; +- } while (1); ++ } while (try++ < 10); + goto forward; + } + case GST_EVENT_FLUSH: diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.4-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.4-r1.ebuild new file mode 100644 index 000000000000..16263bebb4d5 --- /dev/null +++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.4-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2005 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.8.4-r1.ebuild,v 1.1 2005/04/28 23:47:08 zaheerm Exp $ + +inherit flag-o-matic +inherit eutils + +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="~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="" + +S=${WORKDIR}/${MY_P} + +DEPEND=">=media-libs/gstreamer-0.8.4 + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + + # fixes hang on eos (bug #86042) + cd ${S}/ext/ffmpeg + epatch ${FILESDIR}/${P}-eoshangfix.patch +} + +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 + # ugly optimizations cause MPlayer to cry on x86 systems! + if use x86 ; then + replace-flags -O0 -O2 + replace-flags -O3 -O2 + fi + + econf || die + emake || die + +} + +src_install() { + + make DESTDIR=${D} install || die + + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO + +} + +# ripped from the gst-plugins eclass +update_registry() { + + einfo "Updating gstreamer plugins registry for gstreamer ${SLOT}..." + gst-register-${SLOT} + +} + +pkg_postinst() { + + update_registry + +} + +pkg_postrm() { + + update_registry + +} -- cgit v1.2.3-65-gdbad