Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-2.0_p20131009.ebuild mplayer2-9999.ebuild ChangeLog
Date: Mon, 09 Jun 2014 19:28:00
Message-Id: 20140609192756.F389C2004E@flycatcher.gentoo.org
1 maksbotan 14/06/09 19:27:56
2
3 Modified: mplayer2-2.0_p20131009.ebuild mplayer2-9999.ebuild
4 ChangeLog
5 Log:
6 Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
9
10 Revision Changes Path
11 1.2 media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild?r1=1.1&r2=1.2
16
17 Index: mplayer2-2.0_p20131009.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- mplayer2-2.0_p20131009.ebuild 2 May 2014 19:28:40 -0000 1.1
24 +++ mplayer2-2.0_p20131009.ebuild 9 Jun 2014 19:27:56 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.1 2014/05/02 19:28:40 maksbotan Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.2 2014/06/09 19:27:56 maksbotan Exp $
30
31 EAPI=5
32
33 @@ -106,7 +106,10 @@
34 quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
35 samba? ( net-fs/samba )
36 selinux? ( sec-policy/selinux-mplayer )
37 - >=virtual/ffmpeg-9[threads?,vdpau?]
38 + || (
39 + >=media-video/libav-9.12:=[threads?,vdpau?]
40 + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?]
41 + )
42 symlink? ( !media-video/mplayer )
43 "
44 DEPEND="${RDEPEND}
45
46
47
48 1.67 media-video/mplayer2/mplayer2-9999.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.67&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.67&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.66&r2=1.67
53
54 Index: mplayer2-9999.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
57 retrieving revision 1.66
58 retrieving revision 1.67
59 diff -u -r1.66 -r1.67
60 --- mplayer2-9999.ebuild 1 May 2014 20:17:09 -0000 1.66
61 +++ mplayer2-9999.ebuild 9 Jun 2014 19:27:56 -0000 1.67
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2014 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.66 2014/05/01 20:17:09 maksbotan Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.67 2014/06/09 19:27:56 maksbotan Exp $
67
68 EAPI=5
69
70 @@ -16,12 +16,12 @@
71 DESCRIPTION="Media Player for Linux"
72 HOMEPAGE="http://www.mplayer2.org/"
73 [[ ${PV} == *9999* ]] || \
74 -SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
75 +SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.xz"
76
77 LICENSE="GPL-3"
78 SLOT="0"
79 [[ ${PV} == *9999* ]] || \
80 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
81 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
82 IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
83 +dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
84 lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
85 @@ -106,7 +106,10 @@
86 quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
87 samba? ( net-fs/samba )
88 selinux? ( sec-policy/selinux-mplayer )
89 - >=virtual/ffmpeg-9[threads?,vdpau?]
90 + || (
91 + >=media-video/libav-9.12:=[threads?,vdpau?]
92 + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?]
93 + )
94 symlink? ( !media-video/mplayer )
95 "
96 DEPEND="${RDEPEND}
97
98
99
100 1.121 media-video/mplayer2/ChangeLog
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.121&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.121&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.120&r2=1.121
105
106 Index: ChangeLog
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
109 retrieving revision 1.120
110 retrieving revision 1.121
111 diff -u -r1.120 -r1.121
112 --- ChangeLog 2 May 2014 19:28:40 -0000 1.120
113 +++ ChangeLog 9 Jun 2014 19:27:56 -0000 1.121
114 @@ -1,6 +1,10 @@
115 # ChangeLog for media-video/mplayer2
116 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
117 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.120 2014/05/02 19:28:40 maksbotan Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.121 2014/06/09 19:27:56 maksbotan Exp $
119 +
120 + 09 Jun 2014; Maxim Koltsov <maksbotan@g.o>
121 + mplayer2-2.0_p20131009.ebuild, mplayer2-9999.ebuild:
122 + Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli.
123
124 *mplayer2-2.0_p20131009 (02 May 2014)
Report Message
Find on MARC Find on Google Groups