diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-02-10 17:34:25 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-02-10 17:34:25 +0000 |
commit | 0bb42730e8fc9c8e571f12e3189c6c6f8d532c24 (patch) | |
tree | cba6032fbed30be2b0764494607c3ec9dda0c18a /media-libs/mesa | |
parent | cc901a8ce7c6bfe97e3b4f048619693d360ae348 (diff) |
gentoo auto-resync : 10:02:2024 - 17:34:25
Diffstat (limited to 'media-libs/mesa')
-rw-r--r-- | media-libs/mesa/Manifest | 4 | ||||
-rw-r--r-- | media-libs/mesa/mesa-24.0.0.ebuild | 57 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 57 |
3 files changed, 28 insertions, 90 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 16dfa2019c2a..5eb407e6199e 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -10,6 +10,6 @@ EBUILD mesa-23.3.1.ebuild 12405 BLAKE2B 5de3b3e3351eace4405a8279aec2959848b733ac EBUILD mesa-23.3.3.ebuild 12449 BLAKE2B 7ba9ccd4a2006cbaff89b5179cfa8ff03ca2947948d78164b7c56065e11ddf364b5811503b04ad294a0673662643e45f974d73ba2127640ce255d5af6aef1faa SHA512 eb15ad6e7d9a606e642460f8d5171a161f3650dea984ac3321089e5efe71a60ab5b8e2828229ec627377e9abae194ff691e8f83c18cacf3d3a53a3cecd9b581d EBUILD mesa-23.3.4.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621 EBUILD mesa-23.3.5.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621 -EBUILD mesa-24.0.0.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4 -EBUILD mesa-9999.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4 +EBUILD mesa-24.0.0.ebuild 11544 BLAKE2B 219b9c11840684766c0a1b5ea6f9cc61acee4a86878620fce178f8dd69fc652955b82acabedc00f2cc7b287d17e3e06bdf738875c5482086c3d58244ff9ca938 SHA512 bfbd0400e3208016e7e2c7dfbbb8f04296d6616230918c3fee2ffe9efe5a4a1173ad737071f435710ec253ac314f4753620b200b5944da97d497829de6bf3934 +EBUILD mesa-9999.ebuild 11544 BLAKE2B 219b9c11840684766c0a1b5ea6f9cc61acee4a86878620fce178f8dd69fc652955b82acabedc00f2cc7b287d17e3e06bdf738875c5482086c3d58244ff9ca938 SHA512 bfbd0400e3208016e7e2c7dfbbb8f04296d6616230918c3fee2ffe9efe5a4a1173ad737071f435710ec253ac314f4753620b200b5944da97d497829de6bf3934 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f diff --git a/media-libs/mesa/mesa-24.0.0.ebuild b/media-libs/mesa/mesa-24.0.0.ebuild index 7d7f3b5ed165..0ef20b351970 100644 --- a/media-libs/mesa/mesa-24.0.0.ebuild +++ b/media-libs/mesa/mesa-24.0.0.ebuild @@ -3,9 +3,11 @@ EAPI=8 +LLVM_COMPAT=( {15..17} ) +LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..12} ) -inherit llvm meson-multilib python-any-r1 linux-info +inherit llvm-r1 meson-multilib python-any-r1 linux-info MY_P="${P/_/-}" @@ -47,6 +49,7 @@ REQUIRED_USE=" video_cards_vmware ) ) + llvm? ( ${LLVM_REQUIRED_USE} ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) @@ -64,6 +67,13 @@ RDEPEND=" >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) @@ -109,37 +119,6 @@ RDEPEND="${RDEPEND} video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) " -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="17" -LLVM_MIN_SLOT="15" -LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}" -PER_SLOT_DEPSTR=" - ( - !opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] ) - opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] ) - opencl? ( dev-util/spirv-llvm-translator:@SLOT@ ) - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - !opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) - opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) -" -RDEPEND="${RDEPEND} - llvm? ( ${LLVM_DEPSTR} ) -" -unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR - DEPEND="${RDEPEND} video_cards_d3d12? ( >=dev-util/directx-headers-1.611.0[${MULTILIB_USEDEP}] ) valgrind? ( dev-debug/valgrind ) @@ -185,14 +164,6 @@ x86? ( usr/lib/libGLX_mesa.so.0.0.0 )" -llvm_check_deps() { - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 - has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" -} - pkg_pretend() { if use vulkan; then if ! use video_cards_d3d12 && @@ -268,9 +239,7 @@ pkg_setup() { linux-info_pkg_setup fi - if use llvm; then - llvm_pkg_setup - fi + use llvm && llvm-r1_pkg_setup python-any-r1_pkg_setup } @@ -363,7 +332,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 7d7f3b5ed165..0ef20b351970 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -3,9 +3,11 @@ EAPI=8 +LLVM_COMPAT=( {15..17} ) +LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..12} ) -inherit llvm meson-multilib python-any-r1 linux-info +inherit llvm-r1 meson-multilib python-any-r1 linux-info MY_P="${P/_/-}" @@ -47,6 +49,7 @@ REQUIRED_USE=" video_cards_vmware ) ) + llvm? ( ${LLVM_REQUIRED_USE} ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) @@ -64,6 +67,13 @@ RDEPEND=" >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) @@ -109,37 +119,6 @@ RDEPEND="${RDEPEND} video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) " -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="17" -LLVM_MIN_SLOT="15" -LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}" -PER_SLOT_DEPSTR=" - ( - !opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] ) - opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] ) - opencl? ( dev-util/spirv-llvm-translator:@SLOT@ ) - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - !opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) - opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) -" -RDEPEND="${RDEPEND} - llvm? ( ${LLVM_DEPSTR} ) -" -unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR - DEPEND="${RDEPEND} video_cards_d3d12? ( >=dev-util/directx-headers-1.611.0[${MULTILIB_USEDEP}] ) valgrind? ( dev-debug/valgrind ) @@ -185,14 +164,6 @@ x86? ( usr/lib/libGLX_mesa.so.0.0.0 )" -llvm_check_deps() { - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 - has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" -} - pkg_pretend() { if use vulkan; then if ! use video_cards_d3d12 && @@ -268,9 +239,7 @@ pkg_setup() { linux-info_pkg_setup fi - if use llvm; then - llvm_pkg_setup - fi + use llvm && llvm-r1_pkg_setup python-any-r1_pkg_setup } @@ -363,7 +332,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) |