diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-26 14:44:11 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-26 14:44:11 +0000 |
| commit | 881949246a54b968195e99a6b6cec340eb28b7f8 (patch) | |
| tree | 0eb105d6375abd070f3b3b4e0df5e252186377eb /media-plugins/vdr-pcd | |
| parent | Add patch from upstream to fix build with ffmpeg-0.11, part of bug #443212 (diff) | |
| download | gentoo-2-881949246a54b968195e99a6b6cec340eb28b7f8.tar.gz gentoo-2-881949246a54b968195e99a6b6cec340eb28b7f8.tar.bz2 gentoo-2-881949246a54b968195e99a6b6cec340eb28b7f8.zip | |
Fix build with ffmpeg-0.11, part of bug #443208
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-plugins/vdr-pcd')
| -rw-r--r-- | media-plugins/vdr-pcd/ChangeLog | 8 | ||||
| -rw-r--r-- | media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch | 12 | ||||
| -rw-r--r-- | media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild | 13 |
3 files changed, 24 insertions, 9 deletions
diff --git a/media-plugins/vdr-pcd/ChangeLog b/media-plugins/vdr-pcd/ChangeLog index 883d052f7b77..b7ea9776661f 100644 --- a/media-plugins/vdr-pcd/ChangeLog +++ b/media-plugins/vdr-pcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-pcd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.4 2011/04/06 17:20:39 idl0r Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.5 2013/01/26 14:44:11 aballier Exp $ + + 26 Jan 2013; Alexis Ballier <aballier@gentoo.org> vdr-pcd-0.9.ebuild, + +files/vdr-pcd-0.9-ffmpeg-1.patch: + Fix build with ffmpeg-0.11, part of bug #443208 06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> vdr-pcd-0.9.ebuild: Use the new ffmpeg virtual, bug 362103. QA Fix: Assign RDEPEND. Switch to diff --git a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch new file mode 100644 index 000000000000..f1599bc918a9 --- /dev/null +++ b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch @@ -0,0 +1,12 @@ +Index: pcd-0.9/mpeg.c +=================================================================== +--- pcd-0.9.orig/mpeg.c ++++ pcd-0.9/mpeg.c +@@ -44,7 +44,6 @@ cMpegFrame::cMpegFrame(bool Pal) + bufferSize = 0; + mpegSize = 0; + +- avcodec_init(); + avcodec_register_all(); + + if (!(avCodec = avcodec_find_encoder(CODEC_ID_MPEG2VIDEO))) { diff --git a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild index e9619963f4e5..363d7290b804 100644 --- a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild +++ b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.6 2011/04/06 17:20:39 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.7 2013/01/26 14:44:11 aballier Exp $ EAPI="3" -inherit vdr-plugin flag-o-matic +inherit vdr-plugin flag-o-matic eutils DESCRIPTION="VDR Plugin: adds the functionality to view PhotoCDs" HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/pcd.html" @@ -16,15 +16,14 @@ KEYWORDS="~x86 ~amd64" IUSE="" DEPEND=">=media-video/vdr-1.4.4 - >=virtual/ffmpeg-0.4.9_p20070616" + >=virtual/ffmpeg-0.10" RDEPEND="${DEPEND}" src_prepare() { vdr-plugin_src_prepare - if has_version ">=virtual/ffmpeg-0.4.9_p20080326" ; then - sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h - fi + sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h + epatch "${FILESDIR}/${P}-ffmpeg-1.patch" # UINT64_C is needed by ffmpeg headers append-flags -D__STDC_CONSTANT_MACROS |