1 |
ssuominen 11/10/31 17:12:00 |
2 |
|
3 |
Modified: ChangeLog mplayer-9999.ebuild |
4 |
mplayer-1.0_rc4_p20110322-r1.ebuild |
5 |
Log: |
6 |
Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241 |
7 |
|
8 |
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.808 media-video/mplayer/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.808&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.808&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.807&r2=1.808 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
20 |
retrieving revision 1.807 |
21 |
retrieving revision 1.808 |
22 |
diff -u -r1.807 -r1.808 |
23 |
--- ChangeLog 15 Oct 2011 00:24:38 -0000 1.807 |
24 |
+++ ChangeLog 31 Oct 2011 17:12:00 -0000 1.808 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for media-video/mplayer |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.807 2011/10/15 00:24:38 radhermit Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.808 2011/10/31 17:12:00 ssuominen Exp $ |
30 |
+ |
31 |
+ 31 Oct 2011; Samuli Suominen <ssuominen@g.o> |
32 |
+ mplayer-1.0_rc4_p20110322-r1.ebuild, mplayer-9999.ebuild: |
33 |
+ Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt |
34 |
+ #385241 |
35 |
|
36 |
15 Oct 2011; Tim Harder <radhermit@g.o> |
37 |
-mplayer-1.0_rc4_p20101114.ebuild, -mplayer-1.0_rc4_p20110322.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.106 media-video/mplayer/mplayer-9999.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.106&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.106&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.105&r2=1.106 |
46 |
|
47 |
Index: mplayer-9999.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
50 |
retrieving revision 1.105 |
51 |
retrieving revision 1.106 |
52 |
diff -u -r1.105 -r1.106 |
53 |
--- mplayer-9999.ebuild 8 Jul 2011 10:10:07 -0000 1.105 |
54 |
+++ mplayer-9999.ebuild 31 Oct 2011 17:12:00 -0000 1.106 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2011 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.105 2011/07/08 10:10:07 ssuominen Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.106 2011/10/31 17:12:00 ssuominen Exp $ |
60 |
|
61 |
EAPI=4 |
62 |
|
63 |
@@ -20,7 +20,7 @@ |
64 |
libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas |
65 |
+network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
66 |
radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 |
67 |
-tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix |
68 |
+tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix |
69 |
+vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc |
70 |
zoran" |
71 |
|
72 |
@@ -364,12 +364,13 @@ |
73 |
myconf+=" --disable-tv-bsdbt848" |
74 |
# broken upstream, won't work with recent kernels |
75 |
myconf+=" --disable-ivtv" |
76 |
- if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then |
77 |
+ # gone since linux-headers-2.6.38 |
78 |
+ myconf+=" --disable-tv-v4l1" |
79 |
+ if { use dvb || use v4l || use pvr || use radio; }; then |
80 |
use dvb || myconf+=" --disable-dvb" |
81 |
use pvr || myconf+=" --disable-pvr" |
82 |
- use v4l || myconf+=" --disable-tv-v4l1" |
83 |
- use v4l2 || myconf+=" --disable-tv-v4l2" |
84 |
- if use radio && { use dvb || use v4l || use v4l2; }; then |
85 |
+ use v4l || myconf+=" --disable-tv-v4l2" |
86 |
+ if use radio && { use dvb || use v4l; }; then |
87 |
myconf+=" |
88 |
--enable-radio |
89 |
$(use_enable encode radio-capture) |
90 |
@@ -383,7 +384,6 @@ |
91 |
else |
92 |
myconf+=" |
93 |
--disable-tv |
94 |
- --disable-tv-v4l1 |
95 |
--disable-tv-v4l2 |
96 |
--disable-radio |
97 |
--disable-radio-v4l2 |
98 |
|
99 |
|
100 |
|
101 |
1.8 media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild |
102 |
|
103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild?rev=1.8&view=markup |
104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild?rev=1.8&content-type=text/plain |
105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild?r1=1.7&r2=1.8 |
106 |
|
107 |
Index: mplayer-1.0_rc4_p20110322-r1.ebuild |
108 |
=================================================================== |
109 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v |
110 |
retrieving revision 1.7 |
111 |
retrieving revision 1.8 |
112 |
diff -u -r1.7 -r1.8 |
113 |
--- mplayer-1.0_rc4_p20110322-r1.ebuild 12 Oct 2011 15:26:05 -0000 1.7 |
114 |
+++ mplayer-1.0_rc4_p20110322-r1.ebuild 31 Oct 2011 17:12:00 -0000 1.8 |
115 |
@@ -1,6 +1,6 @@ |
116 |
# Copyright 1999-2011 Gentoo Foundation |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v 1.7 2011/10/12 15:26:05 armin76 Exp $ |
119 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v 1.8 2011/10/31 17:12:00 ssuominen Exp $ |
120 |
|
121 |
EAPI=4 |
122 |
|
123 |
@@ -21,7 +21,7 @@ |
124 |
libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas |
125 |
+network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
126 |
radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 |
127 |
-tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix |
128 |
+tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix |
129 |
+vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc |
130 |
zoran" |
131 |
[[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" |
132 |
@@ -368,12 +368,13 @@ |
133 |
myconf+=" --disable-tv-bsdbt848" |
134 |
# broken upstream, won't work with recent kernels |
135 |
myconf+=" --disable-ivtv" |
136 |
- if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then |
137 |
+ # gone since linux-headers-2.6.38 |
138 |
+ myconf+=" --disable-tv-v4l1" |
139 |
+ if { use dvb || use v4l || use pvr || use radio; }; then |
140 |
use dvb || myconf+=" --disable-dvb" |
141 |
use pvr || myconf+=" --disable-pvr" |
142 |
- use v4l || myconf+=" --disable-tv-v4l1" |
143 |
- use v4l2 || myconf+=" --disable-tv-v4l2" |
144 |
- if use radio && { use dvb || use v4l || use v4l2; }; then |
145 |
+ use v4l || myconf+=" --disable-tv-v4l2" |
146 |
+ if use radio && { use dvb || use v4l; }; then |
147 |
myconf+=" |
148 |
--enable-radio |
149 |
$(use_enable encode radio-capture) |
150 |
@@ -387,7 +388,6 @@ |
151 |
else |
152 |
myconf+=" |
153 |
--disable-tv |
154 |
- --disable-tv-v4l1 |
155 |
--disable-tv-v4l2 |
156 |
--disable-radio |
157 |
--disable-radio-v4l2 |