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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D37F215800A for ; Fri, 4 Aug 2023 01:29:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4B74E0D89; Fri, 4 Aug 2023 01:29:13 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7B37E0D89 for ; Fri, 4 Aug 2023 01:29:13 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAFE1340CB1 for ; Fri, 4 Aug 2023 01:29:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1A11E99 for ; Fri, 4 Aug 2023 01:29:10 +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: <1691112471.63d3591d9d03416e5a39e0020ecbb35f3be33ccb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch X-VCS-Directories: media-libs/libplacebo/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 63d3591d9d03416e5a39e0020ecbb35f3be33ccb X-VCS-Branch: master Date: Fri, 4 Aug 2023 01:29:10 +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: ef3e79fb-1314-48b4-984b-e71d41cd6dde X-Archives-Hash: 5a48440f0c9792ad5616147a633ccdd7 commit: 63d3591d9d03416e5a39e0020ecbb35f3be33ccb Author: Ionen Wolkens gentoo org> AuthorDate: Fri Aug 4 01:23:08 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Aug 4 01:27:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d3591d media-libs/libplacebo: adjust old interpreter patch Re-looking at this, it may be worth upstreaming sometime by using find_program() if really nothing that needs find_installation(). Fortunately setuptools issues hardly occured with 3.12 because we check for jinja which pulled setuptools. Signed-off-by: Ionen Wolkens gentoo.org> .../libplacebo/files/libplacebo-5.229.1-python-executable.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch index 35486262c992..181e281bfde1 100644 --- a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch @@ -1,5 +1,7 @@ -Upstream bundles python deps and uses same interpreter as meson, -but we don't and need this to use the eclass' python3 instead. +Ensure we get the interpreter from python-any-r1 rather than same +as meson. Plus find_program() is quicker than find_installation(), +and the latter also needs distutils that is unavailable with +python3_12 without setuptools. https://bugs.gentoo.org/731728 --- a/meson.build @@ -7,5 +9,5 @@ https://bugs.gentoo.org/731728 @@ -323,3 +323,3 @@ thirdparty = meson.project_source_root()/'3rdparty' -python = import('python').find_installation() -+python = import('python').find_installation('python3') ++python = find_program('python3') python_env = environment()