| 1 |
commit: df57b763a376e8a20cc3a3f8ef183d9333f8840c |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Apr 27 19:51:01 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 4 16:27:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df57b763 |
| 7 |
|
| 8 |
media-video/mpv: merge xinerama and xscreensaver with X in 9999 |
| 9 |
|
| 10 |
Gentoo-Bug: 617088 |
| 11 |
Upstream-commit: 927afa311d4a89b022305508acbf4e7325fe3928 |
| 12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 13 |
|
| 14 |
media-video/mpv/mpv-9999.ebuild | 16 +++++----------- |
| 15 |
1 file changed, 5 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
| 18 |
index 9d23b6c88d5..41442124e0b 100644 |
| 19 |
--- a/media-video/mpv/mpv-9999.ebuild |
| 20 |
+++ b/media-video/mpv/mpv-9999.ebuild |
| 21 |
@@ -30,8 +30,8 @@ SLOT="0" |
| 22 |
IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb |
| 23 |
dvd +egl encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua |
| 24 |
luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl |
| 25 |
- selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama |
| 26 |
- +xscreensaver +xv zsh-completion" |
| 27 |
+ selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X +xv |
| 28 |
+ zsh-completion" |
| 29 |
IUSE+=" cpu_flags_x86_sse4_1" |
| 30 |
|
| 31 |
REQUIRED_USE=" |
| 32 |
@@ -50,8 +50,6 @@ REQUIRED_USE=" |
| 33 |
vaapi? ( || ( gbm X wayland ) ) |
| 34 |
vdpau? ( X ) |
| 35 |
wayland? ( egl ) |
| 36 |
- xinerama? ( X ) |
| 37 |
- xscreensaver? ( X ) |
| 38 |
xv? ( X ) |
| 39 |
zsh-completion? ( cli ) |
| 40 |
${PYTHON_REQUIRED_USE} |
| 41 |
@@ -107,11 +105,11 @@ COMMON_DEPEND=" |
| 42 |
) |
| 43 |
X? ( |
| 44 |
x11-libs/libX11 |
| 45 |
+ x11-libs/libXScrnSaver |
| 46 |
x11-libs/libXext |
| 47 |
- >=x11-libs/libXrandr-1.2.0 |
| 48 |
+ x11-libs/libXinerama |
| 49 |
+ x11-libs/libXrandr |
| 50 |
opengl? ( x11-libs/libXdamage ) |
| 51 |
- xinerama? ( x11-libs/libXinerama ) |
| 52 |
- xscreensaver? ( x11-libs/libXScrnSaver ) |
| 53 |
xv? ( x11-libs/libXv ) |
| 54 |
) |
| 55 |
" |
| 56 |
@@ -236,11 +234,7 @@ src_configure() { |
| 57 |
$(use_enable gbm) |
| 58 |
$(use_enable wayland) |
| 59 |
$(use_enable X x11) |
| 60 |
- $(use_enable xscreensaver xss) |
| 61 |
- $(use_enable X xext) |
| 62 |
$(use_enable xv) |
| 63 |
- $(use_enable xinerama) |
| 64 |
- $(use_enable X xrandr) |
| 65 |
$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') |
| 66 |
$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') |
| 67 |
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') |
Archives