diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-11-08 11:49:17 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-11-08 11:49:17 +0000 |
| commit | 672b4211d4ca711cccd0baba254b12cf55c9cd57 (patch) | |
| tree | 3e1222603407687b27ec42a7c806200ef28bb729 /media-video | |
| parent | stable ppc ppc64, bug #430206 (diff) | |
| download | gentoo-2-672b4211d4ca711cccd0baba254b12cf55c9cd57.tar.gz gentoo-2-672b4211d4ca711cccd0baba254b12cf55c9cd57.tar.bz2 gentoo-2-672b4211d4ca711cccd0baba254b12cf55c9cd57.zip | |
add upstream fix to build with recent ffmpeg versions, bug #439604
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch | 18 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20120828.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 39661628d1a5..b07b70aafc2f 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.70 2012/09/30 15:26:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.71 2012/11/08 11:49:17 aballier Exp $ + + 08 Nov 2012; Alexis Ballier <aballier@gentoo.org> + mplayer2-2.0_p20120828.ebuild, +files/mplayer2-2.0_p20120828-ffmpeg.patch: + add upstream fix to build with recent ffmpeg versions, bug #439604 30 Sep 2012; Sebastian Pipping <sping@gentoo.org> mplayer2-2.0_p20120828.ebuild: diff --git a/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch b/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch new file mode 100644 index 000000000000..29ec168ef8fc --- /dev/null +++ b/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch @@ -0,0 +1,18 @@ +http://devel.mplayer2.org/changeset/f5e0365c8e76e2ef797027134f1819e613764d7e/
+http://devel.mplayer2.org/ticket/202
+https://bugs.gentoo.org/show_bug.cgi?id=439604
+
+Index: libmpcodecs/vf_lavc.c
+===================================================================
+--- libmpcodecs/vf_lavc.c (revision db8cdc73e38c3490389212d94ae9b92dfddd5975)
++++ libmpcodecs/vf_lavc.c (revision f5e0365c8e76e2ef797027134f1819e613764d7e)
+@@ -74,9 +74,4 @@
+ if (avcodec_open2(&lavc_venc_context, vf->priv->codec, NULL) != 0) {
+ mp_tmsg(MSGT_VFILTER,MSGL_ERR,"Could not open codec.\n");
+- return 0;
+- }
+-
+- if (lavc_venc_context.codec->encode == NULL) {
+- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n");
+ return 0;
+ }
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild index bcac147ca3ae..471a6f609c78 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.4 2012/09/30 15:26:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.5 2012/11/08 11:49:17 aballier Exp $ EAPI=4 @@ -173,6 +173,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-py2compat.patch" + "${FILESDIR}/${PN}-2.0_p20120828-ffmpeg.patch" ) pkg_setup() { |