diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-12-17 14:26:49 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-12-17 14:26:49 +0000 |
| commit | 59039339b0236d7bfdf80dd5164daa7b3dfbf982 (patch) | |
| tree | 2c9b639a7d9a5fa25d57071b6dacbbf094275ac5 /media-plugins/vdr-markad | |
| parent | Fix building with USE=-ipv6 thanks to Andrey Grozin, patch by Andrew Savchenk... (diff) | |
| download | gentoo-2-59039339b0236d7bfdf80dd5164daa7b3dfbf982.tar.gz gentoo-2-59039339b0236d7bfdf80dd5164daa7b3dfbf982.tar.bz2 gentoo-2-59039339b0236d7bfdf80dd5164daa7b3dfbf982.zip | |
fix build with latest ffmpeg
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-markad')
| -rw-r--r-- | media-plugins/vdr-markad/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch | 40 | ||||
| -rw-r--r-- | media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild | 5 |
3 files changed, 48 insertions, 3 deletions
diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog index 913fa136c724..cd596e44d028 100644 --- a/media-plugins/vdr-markad/ChangeLog +++ b/media-plugins/vdr-markad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-markad # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.8 2011/04/06 17:13:37 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.9 2011/12/17 14:26:49 aballier Exp $ + + 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> vdr-markad-0.1.2.ebuild, + +files/vdr-markad-0.1.2-ffmpeg.patch: + fix build with latest ffmpeg 06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> vdr-markad-0.0.8-r1.ebuild, vdr-markad-0.0.9.ebuild, vdr-markad-0.1.0.ebuild, vdr-markad-0.1.1.ebuild, diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch new file mode 100644 index 000000000000..8934756ec99a --- /dev/null +++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: markad-0.1.2/command/decoder.cpp +=================================================================== +--- markad-0.1.2.orig/command/decoder.cpp ++++ markad-0.1.2/command/decoder.cpp +@@ -163,7 +163,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH + if (mp2_context) + { + mp2_context->codec_id = mp2_codecid; +- mp2_context->codec_type = CODEC_TYPE_AUDIO; ++ mp2_context->codec_type = AVMEDIA_TYPE_AUDIO; + if (avcodec_open(mp2_context, mp2_codec) < 0) + { + esyslog("could not open codec for MP2"); +@@ -198,7 +198,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH + if (ac3_context) + { + ac3_context->codec_id = ac3_codecid; +- ac3_context->codec_type = CODEC_TYPE_AUDIO; ++ ac3_context->codec_type = AVMEDIA_TYPE_AUDIO; + if (avcodec_open(ac3_context, ac3_codec) < 0) + { + esyslog("could not open codec for AC3"); +@@ -265,7 +265,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH + video_context->skip_frame=AVDISCARD_NONKEY; // just I-frames + } + video_context->codec_id = video_codecid; +- video_context->codec_type = CODEC_TYPE_VIDEO; ++ video_context->codec_type = AVMEDIA_TYPE_VIDEO; + int ret=avcodec_open(video_context, video_codec); + if ((ret < 0) && (video_codecid==CODEC_ID_MPEG2VIDEO_XVMC)) + { +@@ -274,7 +274,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH + video_codec=avcodec_find_decoder(video_codecid); + if (video_codec) + { +- video_context->codec_type=CODEC_TYPE_UNKNOWN; ++ video_context->codec_type=AVMEDIA_TYPE_UNKNOWN; + video_context->codec_id=CODEC_ID_NONE; + video_context->codec_tag=0; + memset(video_context->codec_name,0,sizeof(video_context->codec_name)); diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild index c9ce47699286..5a4219985740 100644 --- a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild +++ b/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild,v 1.2 2011/04/06 17:13:37 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild,v 1.3 2011/12/17 14:26:49 aballier Exp $ EAPI="3" -inherit vdr-plugin +inherit vdr-plugin eutils VERSION="578" # every bump, new version @@ -35,6 +35,7 @@ src_prepare() { if has_version ">=media-video/vdr-1.7.15"; then sed -e "s:2001:6419:" -i markad-standalone.cpp fi + epatch "${FILESDIR}/${P}-ffmpeg.patch" } src_compile() { |