From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB0EB158020 for ; Fri, 11 Nov 2022 00:47:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11A02E09BD; Fri, 11 Nov 2022 00:47:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3E36E09BD for ; Fri, 11 Nov 2022 00:47:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D200B340E23 for ; Fri, 11 Nov 2022 00:47:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A5D76E9 for ; Fri, 11 Nov 2022 00:47:21 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1668127558.7fb1614a93bdb50808a6de8cec2da308184bb85c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch media-video/mpv/mpv-0.34.1_p20221105.ebuild media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ media-video/mpv/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 7fb1614a93bdb50808a6de8cec2da308184bb85c X-VCS-Branch: master Date: Fri, 11 Nov 2022 00:47:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6879a919-8caf-4381-b654-2dd52618feea X-Archives-Hash: 141712649ea161a2bbfbabe431555da6 commit: 7fb1614a93bdb50808a6de8cec2da308184bb85c Author: Ionen Wolkens gentoo org> AuthorDate: Fri Nov 11 00:36:01 2022 +0000 Commit: Ionen Wolkens gentoo 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 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