| 1 |
commit: 849e1c5905a056523091fc58a045124a4bb73e33 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 27 00:08:25 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 08:13:36 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849e1c59 |
| 7 |
|
| 8 |
media-video/mpv: add more Mac OS X fixes wrt bug 577332 to 9999 |
| 9 |
|
| 10 |
Plus some minor style fixes. |
| 11 |
|
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/1145 |
| 13 |
Gentoo-Bug: https://bugs.gentoo.org/577332 |
| 14 |
Package-Manager: portage-2.2.28 |
| 15 |
|
| 16 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 17 |
|
| 18 |
media-video/mpv/mpv-9999.ebuild | 11 ++++++----- |
| 19 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
| 22 |
index 84a4fde..8204971 100644 |
| 23 |
--- a/media-video/mpv/mpv-9999.ebuild |
| 24 |
+++ b/media-video/mpv/mpv-9999.ebuild |
| 25 |
@@ -36,6 +36,7 @@ IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb +dvd +egl +enca |
| 26 |
|
| 27 |
REQUIRED_USE=" |
| 28 |
|| ( cli libmpv ) |
| 29 |
+ aqua? ( opengl ) |
| 30 |
egl? ( || ( gbm X wayland ) ) |
| 31 |
enca? ( iconv ) |
| 32 |
gbm? ( drm egl ) |
| 33 |
@@ -87,7 +88,7 @@ COMMON_DEPEND=" |
| 34 |
luajit? ( dev-lang/luajit:2 ) |
| 35 |
) |
| 36 |
openal? ( >=media-libs/openal-1.13 ) |
| 37 |
- opengl? ( virtual/opengl ) |
| 38 |
+ opengl? ( !aqua? ( virtual/opengl ) ) |
| 39 |
pulseaudio? ( media-sound/pulseaudio ) |
| 40 |
rubberband? ( >=media-libs/rubberband-1.8.0 ) |
| 41 |
samba? ( net-fs/samba ) |
| 42 |
@@ -138,7 +139,7 @@ src_configure() { |
| 43 |
--confdir="${EPREFIX}"/etc/${PN} |
| 44 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} |
| 45 |
|
| 46 |
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728. |
| 47 |
+ --disable-gpl3 # Unclear license info. See Gentoo bug 571728. |
| 48 |
|
| 49 |
$(usex cli '' '--disable-cplayer') |
| 50 |
$(use_enable libmpv libmpv-shared) |
| 51 |
@@ -215,7 +216,7 @@ src_configure() { |
| 52 |
$(use_enable jpeg) |
| 53 |
--disable-android |
| 54 |
$(use_enable raspberry-pi rpi) |
| 55 |
- $(use_enable opengl desktop-gl) |
| 56 |
+ $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') |
| 57 |
|
| 58 |
# HWaccels |
| 59 |
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. |
| 60 |
@@ -229,8 +230,8 @@ src_configure() { |
| 61 |
$(use_enable v4l audio-input) |
| 62 |
$(use_enable dvb dvbin) |
| 63 |
|
| 64 |
- # OS-specific features |
| 65 |
- --disable-apple-remote |
| 66 |
+ # Miscellaneous features |
| 67 |
+ --disable-apple-remote # Needs testing first. See Gentoo bug 577332. |
| 68 |
) |
| 69 |
|
| 70 |
if use vaapi && use X; then |
Archives