From a337f834c6c52cdc13a25f7280c921f990b652e6 Mon Sep 17 00:00:00 2001 From: James Calligeros Date: Thu, 12 Dec 2024 09:53:03 +1000 Subject: [PATCH] media-libs/mesa: deal with LLVM pkgmove Signed-off-by: James Calligeros --- .../mesa/mesa-25.0.0_pre20241204-r1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media-libs/mesa/mesa-25.0.0_pre20241204-r1.ebuild b/media-libs/mesa/mesa-25.0.0_pre20241204-r1.ebuild index 7add29a..7a1a7cf 100644 --- a/media-libs/mesa/mesa-25.0.0_pre20241204-r1.ebuild +++ b/media-libs/mesa/mesa-25.0.0_pre20241204-r1.ebuild @@ -102,14 +102,14 @@ RDEPEND=" unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( $(llvm_gen_dep " - sys-devel/llvm:\${LLVM_SLOT}[${MULTILIB_USEDEP}] + llvm-core/llvm:\${LLVM_SLOT}[${MULTILIB_USEDEP}] opencl? ( dev-util/spirv-llvm-translator:\${LLVM_SLOT} - sys-devel/clang:\${LLVM_SLOT}[${MULTILIB_USEDEP}] + llvm-core/clang:\${LLVM_SLOT}[${MULTILIB_USEDEP}] ) video_cards_asahi? ( dev-util/spirv-llvm-translator:\${LLVM_SLOT} - sys-devel/clang:\${LLVM_SLOT}[${MULTILIB_USEDEP}] + llvm-core/clang:\${LLVM_SLOT}[${MULTILIB_USEDEP}] ) ") video_cards_r600? ( @@ -122,7 +122,7 @@ RDEPEND=" lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) opencl? ( >=virtual/opencl-3 - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) @@ -135,7 +135,7 @@ RDEPEND=" >=sys-kernel/asahi-sources-${ASAHI_KERNEL_MIN_VER}:* >=virtual/dist-kernel-${ASAHI_KERNEL_MIN_VER}:asahi ) - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] ) video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) @@ -192,7 +192,7 @@ BDEPEND=" ") video_cards_intel? ( ~dev-util/intel_clc-${PV} - dev-libs/libclc[spirv(-)] + llvm-core/libclc[spirv(-)] $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") ) vulkan? ( @@ -297,8 +297,8 @@ python_check_deps() { pkg_setup() { # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" ewarn "detected! This can cause problems. For details, see bug 459306." fi