From: Sebastian Pipping Date: Wed, 7 Sep 2011 14:53:56 +0000 (+0000) Subject: media-video/mplayer2: Fix compilation (bug #380881) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ca2ec8ec2332107ba9ada0be153ca838f489401c;p=gentoo.git media-video/mplayer2: Fix compilation (bug #380881) Package-Manager: portage-2.1.10.14/cvs/Linux x86_64 --- diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 1049a0ccc947..8bfef232e5d0 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.22 2011/08/24 10:35:36 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.23 2011/09/07 14:53:55 sping Exp $ + + 07 Sep 2011; Sebastian Pipping + +files/2.0-fmt-conversion.patch, mplayer2-2.0.ebuild: + Fix compilation against libav 0.8_pre20110818 with patch extracted from + upstream Git repo (bug #380881) 24 Aug 2011; Tony Vroon mplayer2-2.0.ebuild: Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney in bug diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest index e1e9f9129aad..eadf57e8e44a 100644 --- a/media-video/mplayer2/Manifest +++ b/media-video/mplayer2/Manifest @@ -2,18 +2,19 @@ Hash: SHA1 AUX 2.0-ffmpeg.patch 9606 RMD160 bf4c21ed7b524c7865abfb0763754dce9b3603cc SHA1 b9964b34dd21a6ed43d1d98bba7f50b8faca3fe0 SHA256 22657481184ccb2940f9b4b9dab091fe8d42ed6051a2dda1f9bf6a851f2b9d80 +AUX 2.0-fmt-conversion.patch 286 RMD160 c7d5d5ea5abef00d894b0fbc4499113bb08a7f70 SHA1 d28e79d1da18fb1c812d90c9aead37381055ad77 SHA256 98345175367a9190eb82371fee71439d9c6341dbc24ae2bef72481c5890500fb DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910 -EBUILD mplayer2-2.0.ebuild 17059 RMD160 097480ca041536c98ef621b187b43606a56d7de9 SHA1 3d24a4674e32f9180757fff9cb7d5c7c2529c8d0 SHA256 76d264386a502e026cbb1771d266893cedc27e4fa4be32d3405829b483ca6b8e +EBUILD mplayer2-2.0.ebuild 17098 RMD160 61c2dd0f81595c62cc75e563c9d86d5c73b5ce58 SHA1 10584ab0da746eecc935b6c1e7bf858027c9bde2 SHA256 4846568897eb482a346bf3c87c95c5627958d67d923904f87045bbf8767d91ca EBUILD mplayer2-9999.ebuild 16457 RMD160 4c7e980d1031663892ef452be0b6c9b96a6f4cc8 SHA1 48567a08ea9bf27f95c4795c73a4b33a166b965b SHA256 05741cf093077176f747a83552cfc2ca3035aa0c4804505ae7ef3954c13946ca -MISC ChangeLog 6670 RMD160 a87756ba7bf0b482f9f6b66d2a525482a16ff18e SHA1 9fbd3f6c00bdc9a157744e898694446077d58d03 SHA256 5386e1e55407392d6c67b309614f2bb405cb06d578b5e669aec109443769c0b6 +MISC ChangeLog 6884 RMD160 fa0e9c97bc67bcd7f22dc59d41355f22fc2e1b68 SHA1 17d16dc42a6b8b76284a7a2b83c4618fd16007ce SHA256 f92928fae00e274819ff321382ce7bc082a2845eca2466da5f436558affec69e MISC metadata.xml 3362 RMD160 92db76b2da1919db7ba1293c9ca665db2a2230dd SHA1 a5c3ca0b0dc0c1765a96f250e3ba4471926bec21 SHA256 3e1e3815b292a52c6215a97e38341460ce3d054d0b55dbd880a059c6b60f70de -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5U1AAACgkQp5vW4rUFj5q4BgCguJQAgaZ7DWQLbE4uHvTNfUjS -w14An0LcazbXX3bHa55cVri10tgivLmS -=35HE +iEYEARECAAYFAk5nhYEACgkQsAvGakAaFgCCGACgp1XxEW+PClTftuaZLjA+VPz3 +W18AoIRM10r1HxOAW4s4HIJhaNzH3/lY +=XLQ/ -----END PGP SIGNATURE----- diff --git a/media-video/mplayer2/files/2.0-fmt-conversion.patch b/media-video/mplayer2/files/2.0-fmt-conversion.patch new file mode 100644 index 000000000000..15e18d6b592f --- /dev/null +++ b/media-video/mplayer2/files/2.0-fmt-conversion.patch @@ -0,0 +1,10 @@ +--- fmt-conversion.c 2011-03-24 22:40:29.000000000 +0100 ++++ fmt-conversion.c 2011-09-07 16:14:35.712974663 +0200 +@@ -18,6 +18,7 @@ + + #include "mp_msg.h" + #include "libavutil/avutil.h" ++#include + #include "libmpcodecs/img_format.h" + #include "fmt-conversion.h" + diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild index 155033e04e10..432f1ca84405 100644 --- a/media-video/mplayer2/mplayer2-2.0.ebuild +++ b/media-video/mplayer2/mplayer2-2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.16 2011/08/24 10:35:36 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.17 2011/09/07 14:53:55 sping Exp $ EAPI=4 @@ -166,6 +166,7 @@ REQUIRED_USE="bindist? ( !win32codecs )" PATCHES=( "${FILESDIR}/${PV}-ffmpeg.patch" + "${FILESDIR}/${PV}-fmt-conversion.patch" ) pkg_setup() {