diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2014-01-29 19:43:01 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2014-01-29 19:43:01 +0000 |
| commit | 348df6aa4b8841ed8f06a510e233274e5bf08867 (patch) | |
| tree | f5b492c989a2231ac3d89049d9e054331dd46f85 /media-plugins/vdr-markad | |
| parent | clean old, unused, and gtk+:1-using slot (diff) | |
| download | gentoo-2-348df6aa4b8841ed8f06a510e233274e5bf08867.tar.gz gentoo-2-348df6aa4b8841ed8f06a510e233274e5bf08867.tar.bz2 gentoo-2-348df6aa4b8841ed8f06a510e233274e5bf08867.zip | |
fixed libav9 patch; fixed some ffmpeg issues
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'media-plugins/vdr-markad')
4 files changed, 22 insertions, 3 deletions
diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog index 7f9255fd6a93..6b20cfe4d22f 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.13 2014/01/08 02:32:04 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.14 2014/01/29 19:43:00 hd_brummy Exp $ + + 29 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-markad-0.1.4.ebuild, + files/vdr-markad-0.1.4-libav9.patch, +files/vdr-markad-0.1.4_ffmpeg-2.patch: + fixed libav9 patch; fixed some ffmpeg issues 08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-markad-0.1.2.ebuild, -files/vdr-markad-0.1.2-ffmpeg.patch, diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch index fca9cbb49e35..f11fc6137000 100644 --- a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch +++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch @@ -5,7 +5,7 @@ diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp #include <sys/types.h> #include <string.h> #include <cstdlib> -+#include <stdio.h> ++#include <cstdio> #include "decoder.h" diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch new file mode 100644 index 000000000000..c94d54ea7aef --- /dev/null +++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch @@ -0,0 +1,13 @@ +diff -Naur markad-0.1.4.orig/command/decoder.cpp markad-0.1.4/command/decoder.cpp +--- markad-0.1.4.orig/command/decoder.cpp 2014-01-29 20:16:23.000000000 +0100 ++++ markad-0.1.4/command/decoder.cpp 2014-01-29 20:17:49.000000000 +0100 +@@ -152,7 +152,8 @@ + } + + video_codec=NULL; +- CodecID video_codecid; ++// CodecID video_codecid; ++ AVCodecID video_codecid; + + if (useH264) + { diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild index 403b011afff4..9fe202b0adf2 100644 --- a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild +++ b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.4.ebuild,v 1.3 2014/01/08 02:32:04 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild,v 1.4 2014/01/29 19:43:00 hd_brummy Exp $ EAPI=5 @@ -40,6 +40,8 @@ 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-2.patch" } src_compile() { |