media-video/mpv: add more Mac OS X fixes wrt bug 577332 to 9999

Plus some minor style fixes.

Closes: https://github.com/gentoo/gentoo/pull/1145
Gentoo-Bug: https://bugs.gentoo.org/577332
Package-Manager: portage-2.2.28

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 84a4fdee765c66a60df805eece8247b7eb4e03eb..82049712200e80f361619d1d8560a4626854b777 100644 (file)
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -36,6 +36,7 @@ IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb +dvd +egl +enca
 
 REQUIRED_USE="
        || ( cli libmpv )
+       aqua? ( opengl )
        egl? ( || ( gbm X wayland ) )
        enca? ( iconv )
        gbm? ( drm egl )
@@ -87,7 +88,7 @@ COMMON_DEPEND="
                luajit? ( dev-lang/luajit:2 )
        )
        openal? ( >=media-libs/openal-1.13 )
-       opengl? ( virtual/opengl )
+       opengl? ( !aqua? ( virtual/opengl ) )
        pulseaudio? ( media-sound/pulseaudio )
        rubberband? ( >=media-libs/rubberband-1.8.0 )
        samba? ( net-fs/samba )
@@ -138,7 +139,7 @@ src_configure() {
                --confdir="${EPREFIX}"/etc/${PN}
                --docdir="${EPREFIX}"/usr/share/doc/${PF}
 
-               --disable-gpl3          # Unclear license info. See Gentoo bug 571728.
+               --disable-gpl3                  # Unclear license info. See Gentoo bug 571728.
 
                $(usex cli '' '--disable-cplayer')
                $(use_enable libmpv libmpv-shared)
@@ -215,7 +216,7 @@ src_configure() {
                $(use_enable jpeg)
                --disable-android
                $(use_enable raspberry-pi rpi)
-               $(use_enable opengl desktop-gl)
+               $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
 
                # HWaccels
                # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
@@ -229,8 +230,8 @@ src_configure() {
                $(use_enable v4l audio-input)
                $(use_enable dvb dvbin)
 
-               # OS-specific features
-               --disable-apple-remote
+               # Miscellaneous features
+               --disable-apple-remote  # Needs testing first. See Gentoo bug 577332.
        )
 
        if use vaapi && use X; then