From a89a5cd12f2e2f63684df1790b8cf9162ce4d90b Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Tue, 25 Feb 2025 13:27:41 +1000 Subject: [PATCH] media-libs/mesa: bump meson and bindgen deps for Rust-related USE Due to a bug in Meson < 1.7.0, it is possible for bindgen to generate code that is not compatible with the compiler in use. This has the potential to cause build failures when e.g. edition 2024 bindings are generated for a compiler that only supports edition 2021 code. A patch has been submitted upstream to enforce this dependency in the Meson build scripts, however we can just enforce dependencies on appropriate bindgen and Meson versions if the USE flags that generate bindings are selected. Bug: https://bugs.gentoo.org/946913 Bug: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12680 Signed-off-by: Matt Jolly Signed-off-by: Matt Turner --- media-libs/mesa/mesa-25.0.0.ebuild | 6 ++++-- media-libs/mesa/mesa-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-25.0.0.ebuild b/media-libs/mesa/mesa-25.0.0.ebuild index f9f6f3778ffde..762af41772c10 100644 --- a/media-libs/mesa/mesa-25.0.0.ebuild +++ b/media-libs/mesa/mesa-25.0.0.ebuild @@ -160,8 +160,9 @@ DEPEND="${RDEPEND} BDEPEND=" ${PYTHON_DEPS} opencl? ( + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 ${RUST_DEPEND} - >=dev-util/bindgen-0.58.0 ) >=dev-build/meson-1.4.1 app-alternatives/yacc @@ -180,7 +181,8 @@ BDEPEND=" vulkan? ( dev-util/glslang video_cards_nvk? ( - >=dev-util/bindgen-0.68.1 + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 >=dev-util/cbindgen-0.26.0 ${RUST_DEPEND} ) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 7eece800ac5ca..3a53d196a2133 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -160,8 +160,9 @@ DEPEND="${RDEPEND} BDEPEND=" ${PYTHON_DEPS} opencl? ( + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 ${RUST_DEPEND} - >=dev-util/bindgen-0.58.0 ) >=dev-build/meson-1.4.1 app-alternatives/yacc @@ -180,7 +181,8 @@ BDEPEND=" vulkan? ( dev-util/glslang video_cards_nvk? ( - >=dev-util/bindgen-0.68.1 + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 >=dev-util/cbindgen-0.26.0 ${RUST_DEPEND} )