| 1 |
commit: 14dec956799c2054559612e963fe0abdcd7448ad |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 22 19:33:40 2015 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 12:47:25 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dec956 |
| 7 |
|
| 8 |
media-video/mpv: update vaapi USE dependencies and configure options |
| 9 |
|
| 10 |
VAAPI in mpv is now available for Wayland and for EGL and GLX on X11 as |
| 11 |
opposed to GLX only before. A newer libva version is required, though. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.24 |
| 14 |
|
| 15 |
media-video/mpv/mpv-9999.ebuild | 15 ++++++++++++--- |
| 16 |
1 file changed, 12 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
| 19 |
index 3c74851..38b675a 100644 |
| 20 |
--- a/media-video/mpv/mpv-9999.ebuild |
| 21 |
+++ b/media-video/mpv/mpv-9999.ebuild |
| 22 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 23 |
pvr? ( v4l ) |
| 24 |
uchardet? ( iconv ) |
| 25 |
v4l? ( || ( alsa oss ) ) |
| 26 |
- vaapi? ( X ) |
| 27 |
+ vaapi? ( || ( X wayland ) ) |
| 28 |
vdpau? ( X ) |
| 29 |
wayland? ( egl ) |
| 30 |
xinerama? ( X ) |
| 31 |
@@ -92,6 +92,7 @@ COMMON_DEPEND=" |
| 32 |
samba? ( net-fs/samba ) |
| 33 |
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) |
| 34 |
v4l? ( media-libs/libv4l ) |
| 35 |
+ vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] ) |
| 36 |
wayland? ( |
| 37 |
>=dev-libs/wayland-1.6.0 |
| 38 |
>=x11-libs/libxkbcommon-0.3.0 |
| 39 |
@@ -104,7 +105,6 @@ COMMON_DEPEND=" |
| 40 |
x11-libs/libXdamage |
| 41 |
virtual/opengl |
| 42 |
) |
| 43 |
- vaapi? ( >=x11-libs/libva-1.2.0[X] ) |
| 44 |
vdpau? ( >=x11-libs/libvdpau-0.2 ) |
| 45 |
xinerama? ( x11-libs/libXinerama ) |
| 46 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
| 47 |
@@ -227,7 +227,9 @@ src_configure() { |
| 48 |
$(use_enable wayland gl-wayland) |
| 49 |
$(use_enable vdpau) |
| 50 |
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') |
| 51 |
- $(use_enable vaapi) |
| 52 |
+ $(use_enable vaapi) # See below for vaapi-x-egl |
| 53 |
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') |
| 54 |
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') |
| 55 |
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') |
| 56 |
$(use_enable libcaca caca) |
| 57 |
$(use_enable drm) |
| 58 |
@@ -246,6 +248,13 @@ src_configure() { |
| 59 |
$(use_enable pvr) |
| 60 |
$(use_enable dvb dvbin) |
| 61 |
) |
| 62 |
+ |
| 63 |
+ if use vaapi && use X && use egl; then |
| 64 |
+ mywafargs+=(--enable-vaapi-x-egl) |
| 65 |
+ else |
| 66 |
+ mywafargs+=(--disable-vaapi-x-egl) |
| 67 |
+ fi |
| 68 |
+ |
| 69 |
waf-utils_src_configure "${mywafargs[@]}" |
| 70 |
} |
Archives