diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-17 19:04:32 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-17 19:04:32 +0000 |
| commit | 9b1f335ab4d648922493d152599d4af7ca01046b (patch) | |
| tree | f2086a16376cf4bfcdb30e4227f68a7a4bec7afb /media-plugins/vdr-osdpip | |
| parent | Version bump (bug 470720), multilib build, preparations for netsurf eclass. (diff) | |
| download | gentoo-2-9b1f335ab4d648922493d152599d4af7ca01046b.tar.gz gentoo-2-9b1f335ab4d648922493d152599d4af7ca01046b.tar.bz2 gentoo-2-9b1f335ab4d648922493d152599d4af7ca01046b.zip | |
Apply libav patch to build with libav9. Fixes bug#443196.
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-plugins/vdr-osdpip')
| -rw-r--r-- | media-plugins/vdr-osdpip/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch | 40 | ||||
| -rw-r--r-- | media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild | 3 |
3 files changed, 47 insertions, 2 deletions
diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog index 221f66972cac..ff9173c649c3 100644 --- a/media-plugins/vdr-osdpip/ChangeLog +++ b/media-plugins/vdr-osdpip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-osdpip # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.21 2013/05/14 09:37:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.22 2013/06/17 19:04:32 scarabeus Exp $ + + 17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/vdr-osdpip-libav-9.patch, vdr-osdpip-0.1.2.ebuild: + Apply libav patch to build with libav9. Fixes bug#443196. 14 May 2013; Agostino Sarubbo <ago@gentoo.org> vdr-osdpip-0.1.1-r1.ebuild: Stable for x86, wrt bug #464542 diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch new file mode 100644 index 000000000000..d1f531b325ce --- /dev/null +++ b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch @@ -0,0 +1,40 @@ +diff -urN osdpip-0.1.2.old/decoder.c osdpip-0.1.2/decoder.c +--- osdpip-0.1.2.old/decoder.c 2013-06-17 21:01:31.795476861 +0200 ++++ osdpip-0.1.2/decoder.c 2013-06-17 21:01:57.153475959 +0200 +@@ -34,8 +34,8 @@ + printf("codec not found\n"); + return -1; + } +- m_Context = avcodec_alloc_context(); +- if (avcodec_open(m_Context, m_Codec) < 0) ++ m_Context = avcodec_alloc_context3(m_Codec); ++ if (avcodec_open2(m_Context, m_Codec, NULL) < 0) + { + printf("could not open codec\n"); + return -1; +@@ -106,17 +106,17 @@ + return -1; + } + +- av_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight)); +- av_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom)); +- av_set_int(context, "src_format", PIX_FMT_YUV420P); +- av_set_int(context, "dstw", m_Width); +- av_set_int(context, "dsth", m_Height); ++ av_opt_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight), 0); ++ av_opt_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), 0); ++ av_opt_set_int(context, "src_format", PIX_FMT_YUV420P, 0); ++ av_opt_set_int(context, "dstw", m_Width, 0); ++ av_opt_set_int(context, "dsth", m_Height, 0); + #ifdef USE_NEW_FFMPEG_HEADERS +- av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P); ++ av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, 0); + #else +- av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P); ++ av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, 0); + #endif +- av_set_int(context, "sws_flags", SWS_LANCZOS); ++ av_opt_set_int(context, "sws_flags", SWS_LANCZOS, 0); + + if (sws_init_context(context, NULL, NULL) < 0) { + printf("Error initializing conversion context.\n"); diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild index 3d56c9352a7f..1a62cce90091 100644 --- a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild +++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild,v 1.2 2013/04/04 09:28:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild,v 1.3 2013/06/17 19:04:32 scarabeus Exp $ EAPI="4" @@ -29,4 +29,5 @@ src_prepare() { append-cxxflags -D__STDC_CONSTANT_MACROS epatch "${FILESDIR}/${PN}-0.1.1-ffmpeg-1.patch" + epatch "${FILESDIR}/${PN}-libav-9.patch" } |