From 14dec956799c2054559612e963fe0abdcd7448ad Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Tue, 22 Dec 2015 22:33:40 +0300 Subject: [PATCH] media-video/mpv: update vaapi USE dependencies and configure options VAAPI in mpv is now available for Wayland and for EGL and GLX on X11 as opposed to GLX only before. A newer libva version is required, though. Package-Manager: portage-2.2.24 --- media-video/mpv/mpv-9999.ebuild | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 3c748518e9dd..38b675a2e365 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -45,7 +45,7 @@ REQUIRED_USE=" pvr? ( v4l ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) - vaapi? ( X ) + vaapi? ( || ( X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) @@ -92,6 +92,7 @@ COMMON_DEPEND=" samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) + vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 @@ -104,7 +105,6 @@ COMMON_DEPEND=" x11-libs/libXdamage virtual/opengl ) - vaapi? ( >=x11-libs/libva-1.2.0[X] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) @@ -227,7 +227,9 @@ src_configure() { $(use_enable wayland gl-wayland) $(use_enable vdpau) $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) + $(use_enable vaapi) # See below for vaapi-x-egl + $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') + $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') $(use_enable libcaca caca) $(use_enable drm) @@ -246,6 +248,13 @@ src_configure() { $(use_enable pvr) $(use_enable dvb dvbin) ) + + if use vaapi && use X && use egl; then + mywafargs+=(--enable-vaapi-x-egl) + else + mywafargs+=(--disable-vaapi-x-egl) + fi + waf-utils_src_configure "${mywafargs[@]}" } -- 2.26.2