Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Date: Tue, 01 Nov 2011 01:05:18
Message-Id: 20111101010508.8150B2004B@flycatcher.gentoo.org
1 ssuominen 11/11/01 01:05:08
2
3 Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
4 Log:
5 Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241
6
7 (Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.27 media-video/mplayer2/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.27&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.27&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.26&r2=1.27
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
19 retrieving revision 1.26
20 retrieving revision 1.27
21 diff -u -r1.26 -r1.27
22 --- ChangeLog 31 Oct 2011 12:25:43 -0000 1.26
23 +++ ChangeLog 1 Nov 2011 01:05:08 -0000 1.27
24 @@ -1,6 +1,11 @@
25 # ChangeLog for media-video/mplayer2
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.26 2011/10/31 12:25:43 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.27 2011/11/01 01:05:08 ssuominen Exp $
29 +
30 + 01 Nov 2011; Samuli Suominen <ssuominen@g.o> mplayer2-2.0.ebuild,
31 + mplayer2-9999.ebuild:
32 + Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
33 + #385241
34
35 31 Oct 2011; Tomáš Chvátal <scarabeus@g.o> mplayer2-9999.ebuild:
36 Drop the osdmenu useflag, as upstream dropped code for it.
37
38
39
40 1.17 media-video/mplayer2/mplayer2-9999.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.17&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.17&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.16&r2=1.17
45
46 Index: mplayer2-9999.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
49 retrieving revision 1.16
50 retrieving revision 1.17
51 diff -u -r1.16 -r1.17
52 --- mplayer2-9999.ebuild 31 Oct 2011 12:25:43 -0000 1.16
53 +++ mplayer2-9999.ebuild 1 Nov 2011 01:05:08 -0000 1.17
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.16 2011/10/31 12:25:43 scarabeus Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.17 2011/11/01 01:05:08 ssuominen Exp $
59
60 EAPI=4
61
62 @@ -320,12 +320,13 @@
63 myconf+=" --disable-tv-bsdbt848"
64 # broken upstream, won't work with recent kernels
65 myconf+=" --disable-ivtv"
66 - if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
67 + # v4l1 is gone since linux-headers-2.6.38
68 + myconf+=" --disable-tv-v4l1"
69 + if { use dvb || use v4l || use pvr || use radio; }; then
70 use dvb || myconf+=" --disable-dvb"
71 use pvr || myconf+=" --disable-pvr"
72 - use v4l || myconf+=" --disable-tv-v4l1"
73 - use v4l2 || myconf+=" --disable-tv-v4l2"
74 - if use radio && { use dvb || use v4l || use v4l2; }; then
75 + use v4l || myconf+=" --disable-tv-v4l2"
76 + if use radio && { use dvb || use v4l; }; then
77 myconf+="
78 --enable-radio
79 --disable-radio-capture
80 @@ -339,7 +340,6 @@
81 else
82 myconf+="
83 --disable-tv
84 - --disable-tv-v4l1
85 --disable-tv-v4l2
86 --disable-radio
87 --disable-radio-v4l2
88
89
90
91 1.20 media-video/mplayer2/mplayer2-2.0.ebuild
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.20&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.20&content-type=text/plain
95 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.19&r2=1.20
96
97 Index: mplayer2-2.0.ebuild
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
100 retrieving revision 1.19
101 retrieving revision 1.20
102 diff -u -r1.19 -r1.20
103 --- mplayer2-2.0.ebuild 9 Oct 2011 16:36:34 -0000 1.19
104 +++ mplayer2-2.0.ebuild 1 Nov 2011 01:05:08 -0000 1.20
105 @@ -1,6 +1,6 @@
106 # Copyright 1999-2011 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.19 2011/10/09 16:36:34 maekke Exp $
109 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.20 2011/11/01 01:05:08 ssuominen Exp $
110
111 EAPI=4
112
113 @@ -18,7 +18,7 @@
114 libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
115 +network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
116 radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
117 -tga +theora +truetype +unicode v4l v4l2 vdpau
118 +tga +theora +truetype +unicode v4l vdpau
119 +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
120
121 VIDEO_CARDS="s3virge mga tdfx vesa"
122 @@ -342,12 +342,13 @@
123 myconf+=" --disable-tv-bsdbt848"
124 # broken upstream, won't work with recent kernels
125 myconf+=" --disable-ivtv"
126 - if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
127 + # v4l1 is gone since linux-headers-2.6.38
128 + myconf+=" --disable-tv-v4l1"
129 + if { use dvb || use v4l || use pvr || use radio; }; then
130 use dvb || myconf+=" --disable-dvb"
131 use pvr || myconf+=" --disable-pvr"
132 - use v4l || myconf+=" --disable-tv-v4l1"
133 - use v4l2 || myconf+=" --disable-tv-v4l2"
134 - if use radio && { use dvb || use v4l || use v4l2; }; then
135 + use v4l || myconf+=" --disable-tv-v4l2"
136 + if use radio && { use dvb || use v4l; }; then
137 myconf+="
138 --enable-radio
139 --disable-radio-capture
140 @@ -361,7 +362,6 @@
141 else
142 myconf+="
143 --disable-tv
144 - --disable-tv-v4l1
145 --disable-tv-v4l2
146 --disable-radio
147 --disable-radio-v4l2