public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
Date: Fri, 11 Nov 2022 00:47:21 +0000 (UTC)	[thread overview]
Message-ID: <1668127558.7fb1614a93bdb50808a6de8cec2da308184bb85c.ionen@gentoo> (raw)

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


             reply	other threads:[~2022-11-11  0:47 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-11  0:47 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-18  7:02 [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/ Ionen Wolkens
2025-06-25 15:25 Ionen Wolkens
2024-04-05  3:13 Ionen Wolkens
2023-11-09 15:49 Ionen Wolkens
2023-08-03  6:45 Ionen Wolkens
2023-07-23 19:09 Ionen Wolkens
2023-07-23 15:22 Ionen Wolkens
2022-07-09  2:41 Sam James
2018-02-05 22:21 Thomas Deutschmann
2017-12-17  3:30 Lars Wendler
2017-02-04 21:25 David Seifert
2016-12-28  0:18 Patrice Clement
2016-07-25 13:04 Patrice Clement
2016-04-25  7:45 Patrice Clement
2016-04-12 18:47 Patrice Clement
2016-03-10 21:51 Patrice Clement
2016-01-21  9:16 Patrice Clement
2015-12-28 13:27 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1668127558.7fb1614a93bdb50808a6de8cec2da308184bb85c.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox