| 1 |
commit: c0f16e5f3d40f029d729b08140532e31acaffbf0 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Apr 27 20:20:13 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 4 16:27:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f16e5f |
| 7 |
|
| 8 |
media-video/mpv: map opengl USE to 'opengl' video output in 9999 |
| 9 |
|
| 10 |
Pros: |
| 11 |
- mapping is clear for everyone w/o getting into technical details; |
| 12 |
- wayland users are very happy by default. |
| 13 |
|
| 14 |
Cons: |
| 15 |
- you cannot build X11 backend with EGL, but without GLX. |
| 16 |
|
| 17 |
Cons are very minor and ebuild complexity stays at about the same level, |
| 18 |
but wayland users should be much happier with the default configuration. |
| 19 |
|
| 20 |
Previous opengl USE behaviour is described in Gentoo commit 411d5bb4746. |
| 21 |
As one can see it was somewhat unnecessarily complex. |
| 22 |
|
| 23 |
Gentoo-Bug: 608858 |
| 24 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 25 |
|
| 26 |
media-video/mpv/metadata.xml | 1 + |
| 27 |
media-video/mpv/mpv-9999.ebuild | 21 ++++++++++----------- |
| 28 |
2 files changed, 11 insertions(+), 11 deletions(-) |
| 29 |
|
| 30 |
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml |
| 31 |
index 06d939fb5de..d0442905890 100644 |
| 32 |
--- a/media-video/mpv/metadata.xml |
| 33 |
+++ b/media-video/mpv/metadata.xml |
| 34 |
@@ -29,6 +29,7 @@ |
| 35 |
<flag name="libmpv">Build mpv shared library</flag> |
| 36 |
<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag> |
| 37 |
<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag> |
| 38 |
+ <flag name="opengl" restrict=">=media-video/mpv-0.25.0">Enable the recommended 'opengl' video output</flag> |
| 39 |
<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> |
| 40 |
<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> |
| 41 |
<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs |
| 42 |
|
| 43 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
| 44 |
index d49580361cb..6db8024521a 100644 |
| 45 |
--- a/media-video/mpv/mpv-9999.ebuild |
| 46 |
+++ b/media-video/mpv/mpv-9999.ebuild |
| 47 |
@@ -37,19 +37,21 @@ IUSE+=" cpu_flags_x86_sse4_1" |
| 48 |
REQUIRED_USE=" |
| 49 |
|| ( cli libmpv ) |
| 50 |
aqua? ( opengl ) |
| 51 |
- cuda? ( !libav || ( opengl egl ) ) |
| 52 |
+ cuda? ( !libav opengl ) |
| 53 |
egl? ( || ( gbm X wayland ) ) |
| 54 |
- gbm? ( drm egl ) |
| 55 |
- lcms? ( || ( opengl egl ) ) |
| 56 |
+ gbm? ( drm egl opengl ) |
| 57 |
+ lcms? ( opengl ) |
| 58 |
luajit? ( lua ) |
| 59 |
- opengl? ( || ( aqua X !cli? ( libmpv ) ) ) |
| 60 |
- test? ( || ( opengl egl ) ) |
| 61 |
+ opengl? ( || ( aqua egl X raspberry-pi !cli? ( libmpv ) ) ) |
| 62 |
+ raspberry-pi? ( opengl ) |
| 63 |
+ test? ( opengl ) |
| 64 |
tools? ( cli ) |
| 65 |
uchardet? ( iconv ) |
| 66 |
v4l? ( || ( alsa oss ) ) |
| 67 |
vaapi? ( || ( gbm X wayland ) ) |
| 68 |
vdpau? ( X ) |
| 69 |
wayland? ( egl ) |
| 70 |
+ X? ( egl? ( opengl ) ) |
| 71 |
xv? ( X ) |
| 72 |
zsh-completion? ( cli ) |
| 73 |
${PYTHON_REQUIRED_USE} |
| 74 |
@@ -139,7 +141,7 @@ mpv_check_compiler() { |
| 75 |
( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ) ]]; then |
| 76 |
die "${PN} requires GCC>=4.5." |
| 77 |
fi |
| 78 |
- if ( use opengl || use egl ) && ! tc-has-tls; then |
| 79 |
+ if use opengl && ! tc-has-tls; then |
| 80 |
die "Your compiler lacks C++11 TLS support. Use GCC>=4.8 or Clang>=3.3." |
| 81 |
fi |
| 82 |
if ! tc-is-gcc && use vaapi && use cpu_flags_x86_sse4_1 && \ |
| 83 |
@@ -238,7 +240,7 @@ src_configure() { |
| 84 |
$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') |
| 85 |
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') |
| 86 |
$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') |
| 87 |
- $(use_enable wayland gl-wayland) |
| 88 |
+ $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') |
| 89 |
$(use_enable vdpau) |
| 90 |
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') |
| 91 |
$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. |
| 92 |
@@ -251,6 +253,7 @@ src_configure() { |
| 93 |
$(use_enable raspberry-pi rpi) |
| 94 |
$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') |
| 95 |
--disable-mali-fbdev # Only available in overlays. |
| 96 |
+ $(usex opengl '' '--disable-gl') |
| 97 |
|
| 98 |
# HWaccels: |
| 99 |
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. |
| 100 |
@@ -276,10 +279,6 @@ src_configure() { |
| 101 |
) |
| 102 |
fi |
| 103 |
|
| 104 |
- if ! use egl && ! use opengl && ! use raspberry-pi; then |
| 105 |
- mywafargs+=(--disable-gl) |
| 106 |
- fi |
| 107 |
- |
| 108 |
# Create reproducible non-live builds. |
| 109 |
[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) |
Archives