[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/

[Ionen Wolkens]

commit:     7fb1614a93bdb50808a6de8cec2da308184bb85c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 00:36:01 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 00:45:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb1614a

media-video/mpv: fix build when gnustep-gui is installed

quick fix by ensuring macos_touchbar['deps'].found()
('and' check is fine there, right? .. well it works)

Closes: https://bugs.gentoo.org/880737
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch | 8 ++++++++
 media-video/mpv/mpv-0.34.1_p20221105.ebuild                     | 4 ++++
 media-video/mpv/mpv-9999.ebuild                                 | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch 
b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
new file mode 100644
index 000000000000..bbf931167b2b
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/880737
+--- a/meson.build
++++ b/meson.build
+@@ -1538,3 +1538,3 @@
+ }
+-features += {'macos-touchbar': cc.compiles(macos_touchbar['fragment'], name: 
'macos-touchbar check')}
++features += {'macos-touchbar': macos_touchbar['deps'].found() and 
cc.compiles(macos_touchbar['fragment'], name: 'macos-touchbar check')}
+ if features['macos-touchbar']

diff --git a/media-video/mpv/mpv-0.34.1_p20221105.ebuild 
b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
index 44b6c139ad77..a7f3bb4b505f 100644
--- a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
+++ b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
@@ -125,6 +125,10 @@ BDEPEND="
        cli? ( dev-python/docutils )
        wayland? ( dev-util/wayland-scanner )"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-macos-touchbar.patch
+)
+
 pkg_setup() {
        use lua && lua-single_pkg_setup
        python-single-r1_pkg_setup

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 44b6c139ad77..210b3b42bc51 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -125,6 +125,10 @@ BDEPEND="
        cli? ( dev-python/docutils )
        wayland? ( dev-util/wayland-scanner )"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.34.1_p20221105-macos-touchbar.patch
+)
+
 pkg_setup() {
        use lua && lua-single_pkg_setup
        python-single-r1_pkg_setup