Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
Date: Mon, 28 Dec 2015 14:07:42
Message-Id: 1451306848.aed15a11bcf61902ffa978423e37915dc1b843b8.idella4@gentoo
1 commit: aed15a11bcf61902ffa978423e37915dc1b843b8
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 22 20:36:31 2015 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 12:47:28 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed15a11
7
8 media-video/mpv: add support for EGL video output via GBM
9
10 This allows to use EGL on top of a DRM device bypassing window
11 server/compositor.
12
13 Package-Manager: portage-2.2.24
14
15 media-video/mpv/metadata.xml | 1 +
16 media-video/mpv/mpv-9999.ebuild | 18 +++++++++++-------
17 2 files changed, 12 insertions(+), 7 deletions(-)
18
19 diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
20 index 949632e..d4ea40d 100644
21 --- a/media-video/mpv/metadata.xml
22 +++ b/media-video/mpv/metadata.xml
23 @@ -28,6 +28,7 @@
24 <flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
25 <flag name="egl">Enable support for various EGL-based video outputs</flag>
26 <flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
27 + <flag name="gbm">Enable Graphics Buffer Manager based EGL video output</flag>
28 <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
29 <flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag>
30 <flag name="libmpv">Build mpv shared library</flag>
31
32 diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
33 index 8b85075..760d760 100644
34 --- a/media-video/mpv/mpv-9999.ebuild
35 +++ b/media-video/mpv/mpv-9999.ebuild
36 @@ -29,15 +29,17 @@ DOCS+=( README.md etc/example.conf etc/input.conf )
37 LICENSE="GPL-2+ BSD ISC"
38 SLOT="0"
39 # Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
40 -IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv
41 - jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
42 - +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test
43 - uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
44 +IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode gbm
45 + +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
46 + openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
47 + test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
48 + xv"
49
50 REQUIRED_USE="
51 || ( cli libmpv )
52 - egl? ( || ( X wayland ) )
53 + egl? ( || ( gbm X wayland ) )
54 enca? ( iconv )
55 + gbm? ( drm egl )
56 lcms? ( || ( opengl egl ) )
57 libguess? ( iconv )
58 luajit? ( lua )
59 @@ -66,7 +68,7 @@ COMMON_DEPEND="
60 >=media-libs/libdvdnav-4.2.0
61 >=media-libs/libdvdread-4.1.0
62 )
63 - egl? ( media-libs/mesa[egl,wayland(-)?] )
64 + egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
65 iconv? (
66 virtual/libiconv
67 enca? ( app-i18n/enca )
68 @@ -218,6 +220,8 @@ src_configure() {
69
70 # Video outputs
71 --disable-cocoa
72 + $(use_enable drm)
73 + $(use_enable gbm)
74 $(use_enable wayland)
75 $(use_enable X x11)
76 $(use_enable xscreensaver xss)
77 @@ -227,6 +231,7 @@ src_configure() {
78 $(use_enable X xrandr)
79 $(use_enable opengl gl-x11)
80 $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
81 + $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
82 $(use_enable wayland gl-wayland)
83 $(use_enable vdpau)
84 $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
85 @@ -235,7 +240,6 @@ src_configure() {
86 $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
87 $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
88 $(use_enable libcaca caca)
89 - $(use_enable drm)
90 $(use_enable jpeg)
91 $(use_enable raspberry-pi rpi)