commit:     1cb0fb6a909eb61b2a0e4f3ebda1411bf1bae839
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 19:24:07 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 19:49:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb0fb6a

media-libs/mesa: Version bump to 24.0.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/Manifest           |   1 +
 media-libs/mesa/mesa-24.0.0.ebuild | 463 +++++++++++++++++++++++++++++++++++++
 2 files changed, 464 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c6c31c7c923f..b30421e850ab 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,3 +2,4 @@ DIST mesa-23.3.1.tar.xz 19337988 BLAKE2B 
73696281868e5eba6493cc34786a6c30eaf256b
 DIST mesa-23.3.3.tar.xz 19379484 BLAKE2B 
6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5
 SHA512 
bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30
 DIST mesa-23.3.4.tar.xz 19415668 BLAKE2B 
85687793853675a43da5135f41d0512cb4729f3dd824e2ad28d9bda129258adb00dd7da1e75e76cae71c1148e6a2ede84e1efda640c11aff233e5e12b0cea554
 SHA512 
026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412
 DIST mesa-23.3.5.tar.xz 19429564 BLAKE2B 
69c7434ae9c503c14b5bf9abad9a3a26a1dd402461b098dcdb01b9da7a7e8652f897fd9681c809aa70d3ace77c448289d22400deca3854844a355eb0ac095583
 SHA512 
1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea
+DIST mesa-24.0.0.tar.xz 19875824 BLAKE2B 
e15b14e921a6d1c8d1b183b8f7302d13aa81401d9485742846b8b70e2353825bcf0a0e1ee1849831eb43e5836a108cb3cf68bfe0d9183a78684dbd2fac637ab7
 SHA512 
9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15

diff --git a/media-libs/mesa/mesa-24.0.0.ebuild 
b/media-libs/mesa/mesa-24.0.0.ebuild
new file mode 100644
index 000000000000..28a5b5573daa
--- /dev/null
+++ b/media-libs/mesa/mesa-24.0.0.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
+
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
+       inherit git-r3
+else
+       SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau 
panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+       lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+       test unwind vaapi valgrind vdpau vulkan
+       vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+       d3d9? (
+               || (
+                       video_cards_intel
+                       video_cards_r300
+                       video_cards_r600
+                       video_cards_radeonsi
+                       video_cards_nouveau
+                       video_cards_vmware
+               )
+       )
+       osmesa? ( video_cards_swrast )
+       vulkan-overlay? ( vulkan )
+       video_cards_swrast? ( vulkan? ( llvm ) )
+       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+       vdpau? ( X )
+       xa? ( X )
+       X? ( gles1? ( opengl ) gles2? ( opengl ) )
+       zink? ( vulkan || ( opengl gles1 gles2 ) )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
+RDEPEND="
+       >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+       >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+       llvm? (
+               video_cards_radeonsi? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_r600? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_radeon? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+       )
+       lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+       opencl? (
+               >=virtual/opencl-3
+               dev-libs/libclc[spirv(-)]
+               >=dev-util/spirv-tools-1.3.231.0
+               virtual/libelf:0=
+       )
+       vaapi? (
+               >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+       )
+       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+       selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+       wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+       X? (
+               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+               >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+               x11-libs/libXfixes[${MULTILIB_USEDEP}]
+               x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+       )
+       zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+       zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+       "
+done
+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 )
+       wayland? ( >=dev-libs/wayland-protocols-1.30 )
+       X? (
+               x11-libs/libXrandr[${MULTILIB_USEDEP}]
+               x11-base/xorg-proto
+       )
+"
+BDEPEND="
+       ${PYTHON_DEPS}
+       opencl? (
+               >=virtual/rust-1.62.0
+               >=dev-util/bindgen-0.58.0
+               >=dev-build/meson-1.3.1
+       )
+       app-alternatives/yacc
+       app-alternatives/lex
+       virtual/pkgconfig
+       $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+       vulkan? (
+               dev-util/glslang
+               llvm? (
+                       video_cards_intel? (
+                               amd64? (
+                                       $(python_gen_any_dep 
"dev-python/ply[\${PYTHON_USEDEP}]")
+                                       ~dev-util/intel_clc-${PV}
+                                       dev-libs/libclc[spirv(-)]
+                               )
+                       )
+               )
+       )
+       wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+       usr/lib/libglapi.so.0.0.0
+       usr/lib/libOSMesa.so.8.0.0
+       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 &&
+                  ! use video_cards_freedreno &&
+                  ! use video_cards_intel &&
+                  ! use video_cards_radeonsi &&
+                  ! use video_cards_v3d; then
+                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain d3d12, freedreno, intel, radeonsi, or v3d"
+               fi
+       fi
+
+       if use vaapi; then
+               if ! use video_cards_d3d12 &&
+                  ! use video_cards_r600 &&
+                  ! use video_cards_radeonsi &&
+                  ! use video_cards_nouveau; then
+                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain d3d12, r600, radeonsi, or nouveau"
+               fi
+       fi
+
+       if use vdpau; then
+               if ! use video_cards_d3d12 &&
+                  ! use video_cards_r300 &&
+                  ! use video_cards_r600 &&
+                  ! use video_cards_radeonsi &&
+                  ! use video_cards_nouveau; then
+                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, r300, r600, radeonsi, or nouveau"
+               fi
+       fi
+
+       if use xa; then
+               if ! use video_cards_freedreno &&
+                  ! use video_cards_nouveau &&
+                  ! use video_cards_vmware; then
+                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, nouveau, or vmware"
+               fi
+       fi
+
+       if ! use llvm; then
+               use opencl     && ewarn "Ignoring USE=opencl     since USE does 
not contain llvm"
+       fi
+
+       if use osmesa && ! use llvm; then
+               ewarn "OSMesa will be slow without enabling USE=llvm"
+       fi
+}
+
+python_check_deps() {
+       python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || 
return 1
+       if use llvm && use vulkan && use video_cards_intel && use amd64; then
+               python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || 
return 1
+       fi
+}
+
+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"
+               ewarn "detected! This can cause problems. For details, see bug 
459306."
+       fi
+
+       if use video_cards_intel ||
+          use video_cards_radeonsi; then
+               if kernel_is -ge 5 11 3; then
+                       CONFIG_CHECK="~KCMP"
+               elif kernel_is -ge 5 11; then
+                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
+               elif kernel_is -ge 5 10 20; then
+                       CONFIG_CHECK="~KCMP"
+               else
+                       CONFIG_CHECK="~CHECKPOINT_RESTORE"
+               fi
+               linux-info_pkg_setup
+       fi
+
+       if use llvm; then
+               llvm_pkg_setup
+       fi
+       python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       default
+       sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+               bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+       local emesonargs=()
+
+       local platforms
+       use X && platforms+="x11"
+       use wayland && platforms+=",wayland"
+       emesonargs+=(-Dplatforms=${platforms#,})
+
+       if use video_cards_intel ||
+          use video_cards_r300 ||
+          use video_cards_r600 ||
+          use video_cards_radeonsi ||
+          use video_cards_nouveau ||
+          use video_cards_vmware; then
+               emesonargs+=($(meson_use d3d9 gallium-nine))
+       else
+               emesonargs+=(-Dgallium-nine=false)
+       fi
+
+       if use video_cards_d3d12 ||
+          use video_cards_r600 ||
+          use video_cards_radeonsi ||
+          use video_cards_nouveau; then
+               emesonargs+=($(meson_feature vaapi gallium-va))
+               use vaapi && emesonargs+=( 
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+       else
+               emesonargs+=(-Dgallium-va=disabled)
+       fi
+
+       if use video_cards_d3d12; then
+               emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+       fi
+
+       if use video_cards_d3d12 ||
+          use video_cards_r300 ||
+          use video_cards_r600 ||
+          use video_cards_radeonsi ||
+          use video_cards_nouveau; then
+               emesonargs+=($(meson_feature vdpau gallium-vdpau))
+       else
+               emesonargs+=(-Dgallium-vdpau=disabled)
+       fi
+
+       if use video_cards_freedreno ||
+          use video_cards_nouveau ||
+          use video_cards_vmware; then
+               emesonargs+=($(meson_feature xa gallium-xa))
+       else
+               emesonargs+=(-Dgallium-xa=disabled)
+       fi
+
+       if use video_cards_freedreno ||
+          use video_cards_lima ||
+          use video_cards_panfrost ||
+          use video_cards_v3d ||
+          use video_cards_vc4 ||
+          use video_cards_vivante; then
+               gallium_enable -- kmsro
+       fi
+
+       gallium_enable video_cards_swrast swrast
+       gallium_enable video_cards_freedreno freedreno
+       gallium_enable video_cards_intel crocus i915 iris
+       gallium_enable video_cards_lima lima
+       gallium_enable video_cards_d3d12 d3d12
+       gallium_enable video_cards_nouveau nouveau
+       gallium_enable video_cards_panfrost panfrost
+       gallium_enable video_cards_v3d v3d
+       gallium_enable video_cards_vc4 vc4
+       gallium_enable video_cards_virgl virgl
+       gallium_enable video_cards_vivante etnaviv
+       gallium_enable video_cards_vmware svga
+       gallium_enable zink zink
+
+       gallium_enable video_cards_r300 r300
+       gallium_enable video_cards_r600 r600
+       gallium_enable video_cards_radeonsi radeonsi
+       if ! use video_cards_r300 && \
+               ! use video_cards_r600; then
+               gallium_enable video_cards_radeon r300 r600
+       fi
+
+       if use llvm && use opencl; then
+               PKG_CONFIG_PATH="$(get_llvm_prefix 
"${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+               # See 
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+               emesonargs+=(
+                       $(meson_native_true gallium-rusticl)
+                       -Drust_std=2021
+               )
+       fi
+
+       if use vulkan; then
+               vulkan_enable video_cards_swrast swrast
+               vulkan_enable video_cards_freedreno freedreno
+               vulkan_enable video_cards_intel intel intel_hasvk
+               vulkan_enable video_cards_d3d12 microsoft-experimental
+               vulkan_enable video_cards_radeonsi amd
+               vulkan_enable video_cards_v3d broadcom
+       fi
+
+       driver_list() {
+               local drivers="$(sort -u <<< "${1// /$'\n'}")"
+               echo "${drivers//$'\n'/,}"
+       }
+
+       local vulkan_layers
+       use vulkan && vulkan_layers+="device-select"
+       use vulkan-overlay && vulkan_layers+=",overlay"
+       emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+       if use llvm && use vulkan && use video_cards_intel && use amd64; then
+               emesonargs+=(-Dintel-clc=system)
+       else
+               emesonargs+=(-Dintel-clc=disabled)
+       fi
+
+       if use opengl || use gles1 || use gles2; then
+               emesonargs+=(
+                       -Degl=enabled
+                       -Dgbm=enabled
+                       -Dglvnd=true
+               )
+       else
+               emesonargs+=(
+                       -Degl=disabled
+                       -Dgbm=disabled
+                       -Dglvnd=false
+               )
+       fi
+
+       if use opengl && use X; then
+               emesonargs+=(-Dglx=dri)
+       else
+               emesonargs+=(-Dglx=disabled)
+       fi
+
+       emesonargs+=(
+               $(meson_use test build-tests)
+               -Dshared-glapi=enabled
+               -Ddri3=enabled
+               -Dexpat=enabled
+               $(meson_use opengl)
+               $(meson_feature gles1)
+               $(meson_feature gles2)
+               $(meson_feature llvm)
+               $(meson_feature lm-sensors lmsensors)
+               $(meson_use osmesa)
+               $(meson_use selinux)
+               $(meson_feature unwind libunwind)
+               $(meson_feature zstd)
+               $(meson_use cpu_flags_x86_sse2 sse2)
+               -Dvalgrind=$(usex valgrind auto disabled)
+               -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+               -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+               -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+               --buildtype $(usex debug debug plain)
+               -Db_ndebug=$(usex debug false true)
+       )
+       meson_src_configure
+}
+
+multilib_src_test() {
+       meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+       if [[ $1 == -- ]] || use $1; then
+               shift
+               GALLIUM_DRIVERS+=("$@")
+       fi
+}
+
+vulkan_enable() {
+       if [[ $1 == -- ]] || use $1; then
+               shift
+               VULKAN_DRIVERS+=("$@")
+       fi
+}

Reply via email to