diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-17 17:48:55 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-17 17:48:55 +0000 |
| commit | 4241bc7307cd317312d1612ec2962ae1da72911e (patch) | |
| tree | 6a84f832161f10538e8be2587af899601cbd90f5 /media-video/mplayer | |
| parent | bikeshedding for now; 197 to mark the initial predicatable network support (diff) | |
| download | gentoo-2-4241bc7307cd317312d1612ec2962ae1da72911e.tar.gz gentoo-2-4241bc7307cd317312d1612ec2962ae1da72911e.tar.bz2 gentoo-2-4241bc7307cd317312d1612ec2962ae1da72911e.zip | |
Addendum to the planar formats support patch from upstream
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.1-missingbreak.patch | 18 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 5 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 2d06a9c7f14a..eeaf7411b4f7 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.872 2013/01/17 16:51:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.873 2013/01/17 17:48:55 aballier Exp $ + + 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild, + +files/mplayer-1.1-missingbreak.patch: + Addendum to the planar formats support patch from upstream 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild: we need ffmpeg-1.1 for the libav-9 patch diff --git a/media-video/mplayer/files/mplayer-1.1-missingbreak.patch b/media-video/mplayer/files/mplayer-1.1-missingbreak.patch new file mode 100644 index 000000000000..0dd7064e8f0c --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.1-missingbreak.patch @@ -0,0 +1,18 @@ +------------------------------------------------------------------------ +r35436 | upsuper | 2012-11-21 08:37:24 -0300 (Wed, 21 Nov 2012) | 2 lines + +Add missing break. + +------------------------------------------------------------------------ +Index: libmpcodecs/ad_ffmpeg.c +=================================================================== +--- libmpcodecs/ad_ffmpeg.c (revision 35435) ++++ libmpcodecs/ad_ffmpeg.c (revision 35436) +@@ -245,6 +245,7 @@ + case 4: + copy_samples_planar(4, frame->nb_samples, channels, + buf, frame->extended_data); ++ break; + default: + copy_samples_planar(sample_size, frame->nb_samples, channels, + buf, frame->extended_data); diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild index 3c9ed5aca965..13de82131e61 100644 --- a/media-video/mplayer/mplayer-1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1-r1.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-video/mplayer/mplayer-1.1-r1.ebuild,v 1.18 2013/01/17 16:51:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.19 2013/01/17 17:48:55 aballier Exp $ EAPI=4 @@ -270,7 +270,8 @@ src_prepare() { base_src_prepare if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1.1' ; then epatch "${FILESDIR}/${P}-libav-9.patch" \ - "${FILESDIR}/${P}-planaraudio.patch" + "${FILESDIR}/${P}-planaraudio.patch" \ + "${FILESDIR}/${P}-missingbreak.patch" fi } |