diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-31 17:12:00 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-31 17:12:00 +0000 |
| commit | 7f91e7e461b2381802d5f310803835b6cb291555 (patch) | |
| tree | 3b68d6ed0e7be86937048a714bdb19988b38b3f0 /media-video/mplayer | |
| parent | Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Elij... (diff) | |
| download | gentoo-2-7f91e7e461b2381802d5f310803835b6cb291555.tar.gz gentoo-2-7f91e7e461b2381802d5f310803835b6cb291555.tar.bz2 gentoo-2-7f91e7e461b2381802d5f310803835b6cb291555.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/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild | 14 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 14 |
3 files changed, 20 insertions, 15 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 26d7bb8b51e7..0a338be0eb96 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.807 2011/10/15 00:24:38 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.808 2011/10/31 17:12:00 ssuominen Exp $ + + 31 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> + mplayer-1.0_rc4_p20110322-r1.ebuild, mplayer-9999.ebuild: + Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt + #385241 15 Oct 2011; Tim Harder <radhermit@gentoo.org> -mplayer-1.0_rc4_p20101114.ebuild, -mplayer-1.0_rc4_p20110322.ebuild: diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild index 5ffe2e550ebd..8605a08a337a 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.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/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v 1.7 2011/10/12 15:26:05 armin76 Exp $ +# $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 $ EAPI=4 @@ -21,7 +21,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas +network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 -tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix +vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" @@ -368,12 +368,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 + # 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 $(use_enable encode radio-capture) @@ -387,7 +388,6 @@ src_configure() { else myconf+=" --disable-tv - --disable-tv-v4l1 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 650af434ba14..3de97adef8cb 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.105 2011/07/08 10:10:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.106 2011/10/31 17:12:00 ssuominen Exp $ EAPI=4 @@ -20,7 +20,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 -tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" @@ -364,12 +364,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 + # 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 $(use_enable encode radio-capture) @@ -383,7 +384,6 @@ src_configure() { else myconf+=" --disable-tv - --disable-tv-v4l1 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 |