diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-11-01 01:05:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-11-01 01:05:08 +0000 |
| commit | 1239b0057fde6b37135d6d243013d39c53a1a68d (patch) | |
| tree | fd3fb7bfb55de7e79d3362232e3bd229607cc51b /media-video | |
| parent | old, uncompatible with libpng15 (diff) | |
| download | gentoo-2-1239b0057fde6b37135d6d243013d39c53a1a68d.tar.gz gentoo-2-1239b0057fde6b37135d6d243013d39c53a1a68d.tar.bz2 gentoo-2-1239b0057fde6b37135d6d243013d39c53a1a68d.zip | |
Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0.ebuild | 14 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 12 |
3 files changed, 19 insertions, 14 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index a06dd0bc0781..8701a4ba7cfb 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.26 2011/10/31 12:25:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.27 2011/11/01 01:05:08 ssuominen Exp $ + + 01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> mplayer2-2.0.ebuild, + mplayer2-9999.ebuild: + Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt + #385241 31 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild: Drop the osdmenu useflag, as upstream dropped code for it. diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild index c5edfefa4d64..226b392c49fd 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.19 2011/10/09 16:36:34 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.20 2011/11/01 01:05:08 ssuominen Exp $ EAPI=4 @@ -18,7 +18,7 @@ ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 -tga +theora +truetype +unicode v4l v4l2 vdpau +tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc" VIDEO_CARDS="s3virge mga tdfx vesa" @@ -342,12 +342,13 @@ src_configure() { myconf+=" --disable-tv-bsdbt848" # broken upstream, won't work with recent kernels myconf+=" --disable-ivtv" - if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then + # v4l1 is gone since linux-headers-2.6.38 + myconf+=" --disable-tv-v4l1" + if { use dvb || use v4l || use pvr || use radio; }; then use dvb || myconf+=" --disable-dvb" use pvr || myconf+=" --disable-pvr" - use v4l || myconf+=" --disable-tv-v4l1" - use v4l2 || myconf+=" --disable-tv-v4l2" - if use radio && { use dvb || use v4l || use v4l2; }; then + use v4l || myconf+=" --disable-tv-v4l2" + if use radio && { use dvb || use v4l; }; then myconf+=" --enable-radio --disable-radio-capture @@ -361,7 +362,6 @@ src_configure() { else myconf+=" --disable-tv - --disable-tv-v4l1 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index 3ec9246ac8c4..d17e33cd3daf 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-9999.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-9999.ebuild,v 1.16 2011/10/31 12:25:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.17 2011/11/01 01:05:08 ssuominen Exp $ EAPI=4 @@ -320,12 +320,13 @@ src_configure() { myconf+=" --disable-tv-bsdbt848" # broken upstream, won't work with recent kernels myconf+=" --disable-ivtv" - if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then + # v4l1 is gone since linux-headers-2.6.38 + myconf+=" --disable-tv-v4l1" + if { use dvb || use v4l || use pvr || use radio; }; then use dvb || myconf+=" --disable-dvb" use pvr || myconf+=" --disable-pvr" - use v4l || myconf+=" --disable-tv-v4l1" - use v4l2 || myconf+=" --disable-tv-v4l2" - if use radio && { use dvb || use v4l || use v4l2; }; then + use v4l || myconf+=" --disable-tv-v4l2" + if use radio && { use dvb || use v4l; }; then myconf+=" --enable-radio --disable-radio-capture @@ -339,7 +340,6 @@ src_configure() { else myconf+=" --disable-tv - --disable-tv-v4l1 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 |