diff options
author | 2011-05-10 13:22:49 +0000 | |
---|---|---|
committer | 2011-05-10 13:22:49 +0000 | |
commit | 56eebd1c796dee2827882df09ee6c8777eed5d5e (patch) | |
tree | 62f86eeff4360d25ac4603fde6d98069a4c2a88b /media-video | |
parent | x86 stable wrt bug #363245 (diff) | |
download | gentoo-2-56eebd1c796dee2827882df09ee6c8777eed5d5e.tar.gz gentoo-2-56eebd1c796dee2827882df09ee6c8777eed5d5e.tar.bz2 gentoo-2-56eebd1c796dee2827882df09ee6c8777eed5d5e.zip |
Drop xvmc support same as upstream did in git.
(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mplayer2/ChangeLog | 5 | ||||
-rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 22 |
2 files changed, 7 insertions, 20 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 53fce2bbd8b8..f56ec561d131 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,9 @@ # 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.16 2011/05/03 14:57:25 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.17 2011/05/10 13:22:49 scarabeus Exp $ + + 10 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild: + Drop xvmc support same as upstream did in git. 03 May 2011; Jeremy Olexa <darkside@gentoo.org> mplayer2-2.0.ebuild, mplayer2-9999.ebuild: diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index 1e68c5d47257..215e31915063 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.13 2011/05/03 14:57:25 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.14 2011/05/10 13:22:49 scarabeus Exp $ EAPI=4 @@ -37,7 +37,7 @@ 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 -+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc" ++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid" VIDEO_CARDS="s3virge mga tdfx vesa" for x in ${VIDEO_CARDS}; do @@ -77,7 +77,6 @@ RDEPEND+=" xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv - xvmc? ( x11-libs/libXvMC ) ) ) a52? ( media-libs/a52dec ) @@ -478,7 +477,7 @@ src_configure() { # X enabled configuration # ########################### if use X; then - uses="dxr3 ggi xinerama" + uses="dxr3 ggi xinerama xv" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -488,20 +487,6 @@ src_configure() { use vdpau || myconf+=" --disable-vdpau" use video_cards_vesa || myconf+=" --disable-vesa" use xscreensaver || myconf+=" --disable-xss" - - if use xv; then - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - else - myconf+=" - --disable-xv - --disable-xvmc - " - use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled." - fi else myconf+=" --disable-dga1 @@ -513,7 +498,6 @@ src_configure() { --disable-xinerama --disable-xss --disable-xv - --disable-xvmc --disable-x11 " uses="dga dxr3 ggi opengl osdmenu vdpau xinerama xscreensaver xv" |