diff options
| author |   Ilya Tumaykin <itumaykin@gmail.com> | 2017-04-27 22:51:01 +0300 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-05-04 18:27:24 +0200 |
| commit | df57b763a376e8a20cc3a3f8ef183d9333f8840c (patch) | |
| tree | c647575357867c9e437dc3e5ae9b3954961c195a | |
| parent | media-video/mpv: cleanup messy GCC check in 9999 (diff) | |
| download | gentoo-df57b763a376e8a20cc3a3f8ef183d9333f8840c.tar.gz gentoo-df57b763a376e8a20cc3a3f8ef183d9333f8840c.tar.bz2 gentoo-df57b763a376e8a20cc3a3f8ef183d9333f8840c.zip | |
media-video/mpv: merge xinerama and xscreensaver with X in 9999
Gentoo-Bug: 617088
Upstream-commit: 927afa311d4a89b022305508acbf4e7325fe3928
Package-Manager: Portage-2.3.5, Repoman-2.3.2
| -rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 9d23b6c88d54..41442124e0bf 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -30,8 +30,8 @@ SLOT="0" IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl - selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama - +xscreensaver +xv zsh-completion" + selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X +xv + zsh-completion" IUSE+=" cpu_flags_x86_sse4_1" REQUIRED_USE=" @@ -50,8 +50,6 @@ REQUIRED_USE=" vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) - xinerama? ( X ) - xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli ) ${PYTHON_REQUIRED_USE} @@ -107,11 +105,11 @@ COMMON_DEPEND=" ) X? ( x11-libs/libX11 + x11-libs/libXScrnSaver x11-libs/libXext - >=x11-libs/libXrandr-1.2.0 + x11-libs/libXinerama + x11-libs/libXrandr opengl? ( x11-libs/libXdamage ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) " @@ -236,11 +234,7 @@ src_configure() { $(use_enable gbm) $(use_enable wayland) $(use_enable X x11) - $(use_enable xscreensaver xss) - $(use_enable X xext) $(use_enable xv) - $(use_enable xinerama) - $(use_enable X xrandr) $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') |