commit:     bd1aacb4bd39d2e776d9802da002692a224f4aa3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 15:33:33 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 15:37:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1aacb4

media-libs/mesa: Drop old versions

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

 media-libs/mesa/Manifest           |   2 -
 media-libs/mesa/mesa-24.1.1.ebuild | 493 -------------------------------------
 media-libs/mesa/mesa-24.1.2.ebuild | 493 -------------------------------------
 3 files changed, 988 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d6107f387147..6e75f97a117c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,4 @@
 DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 
3c68e544898031fe76a57ea754f46ede5b105c259d13dd484eaa63fe51b7d52cf76a4084529b11a586c4d8d06f4cb32f993fd1ea4e6ccc4cbc91e78fe755743a
 SHA512 
de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5
-DIST mesa-24.1.1.tar.xz 29019256 BLAKE2B 
152ce5f4847a321689bf4aa88529963278f7dd24097c4c3de2b3a9164d06cd23d7cccd96bd31fea88311ded576c834a73e2d669e6d290404283f33f92b9bf262
 SHA512 
a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d
-DIST mesa-24.1.2.tar.xz 29057184 BLAKE2B 
8c66d22101c516b8f9323fcfd92bc242a9d6133a65611cd8b5616eeed9f9825423ecd696a1bbe80832d9d6c1b3b14b34fb54bbe13527ac41af6d0d00a10126f2
 SHA512 
ea28540552f9f28200c22423afcf9d9bb961557eae0dc11416c5ef60788c3e7f6d2b841c6bdbe2827d1339ea9d854623c1a0e08d4f1fd79d304fcdd52f790637
 DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 
2e8e4ee98f904aa02f304a6c3cbbb81d04802203e270e6b8ad2b7a62b334ac28f5e91687d7a92501f66b0043255a533d024537ff5ef3f2f03d986e46a7272eeb
 SHA512 
db4071ac80747397023762d6e0355b001f4e942cdc706c67f8aced80e162058667c02a0dc0804a45afc2656cb65d8b16e17148bc03f0a1692067ec170f193c1a
 DIST paste-1.0.14.tar.gz 18429 BLAKE2B 
88f533fd336bbbe24872b100777703832ff46b52970b94981fea202726de35ac0d3466f96370fa89c966b33e0f13c75cbf7f5f88bba290dc490a63c9e08a0b16
 SHA512 
0ec40c228afe645cb027a99c8bd8f7c65158aab48655018a45736727906b05f7354df114405f2eae88c4eba73dec62e8228f8be9834afa0f22b5f31c18006d34
 DIST proc-macro2-1.0.70.tar.gz 46747 BLAKE2B 
808e3a30c89fd979663899124853d386cc53862621f4d872bba87fe91baccddbc6612bd658b4c18b44f8420fcb10700b2906cde9c9512a616ab800ebbfb0867d
 SHA512 
cd5c41ef6a410e310e90828a33fee42c1e2bf30dfc2b0a0cf429fcc60fa1262393c977b2cab5f8a50a35fd1394fd6cc7e7a482581f88dcde20d9ad030c7414a5

diff --git a/media-libs/mesa/mesa-24.1.1.ebuild 
b/media-libs/mesa/mesa-24.1.1.ebuild
deleted file mode 100644
index c184d9ab1e76..000000000000
--- a/media-libs/mesa/mesa-24.1.1.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain toolchain-funcs
-
-MY_P="${P/_/-}"
-
-SYN_PV=2.0.39
-PROC_MACRO2_PV=1.0.70
-QUOTE_PV=1.0.33
-UNICODE_IDENT_PV=1.0.12
-PASTE_PV=1.0.14
-
-NAK_URI="
-       https://github.com/dtolnay/syn/archive/refs/tags/${SYN_PV}.tar.gz -> 
syn-${SYN_PV}.tar.gz
-       
https://github.com/dtolnay/proc-macro2/archive/refs/tags/${PROC_MACRO2_PV}.tar.gz
 -> proc-macro2-${PROC_MACRO2_PV}.tar.gz
-       https://github.com/dtolnay/quote/archive/refs/tags/${QUOTE_PV}.tar.gz 
-> quote-${QUOTE_PV}.tar.gz
-       
https://github.com/dtolnay/unicode-ident/archive/refs/tags/${UNICODE_IDENT_PV}.tar.gz
 -> unicode-ident-${UNICODE_IDENT_PV}.tar.gz
-       https://github.com/dtolnay/paste/archive/refs/tags/${PASTE_PV}.tar.gz 
-> paste-${PASTE_PV}.tar.gz
-"
-
-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";
-       SRC_URI="${NAK_URI}"
-       inherit git-r3
-else
-       SRC_URI="
-               https://archive.mesa3d.org/${MY_P}.tar.xz
-               ${NAK_URI}
-       "
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk 
panfrost v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug +llvm
-       lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-       test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       d3d9? (
-               || (
-                       video_cards_freedreno
-                       video_cards_intel
-                       video_cards_nouveau
-                       video_cards_panfrost
-                       video_cards_r300
-                       video_cards_r600
-                       video_cards_radeonsi
-                       video_cards_vmware
-                       video_cards_zink
-               )
-       )
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       vulkan-overlay? ( vulkan )
-       video_cards_lavapipe? ( llvm vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_zink? ( vulkan opengl )
-       video_cards_nvk? ( vulkan video_cards_nouveau )
-       vdpau? ( X )
-       xa? ( X )
-"
-
-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.9[${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_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.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${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.17:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/xcb-util-keysyms[${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] )
-"
-
-DEPEND="${RDEPEND}
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.34 )
-       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.4.1
-       app-alternatives/yacc
-       app-alternatives/lex
-       virtual/pkgconfig
-       $(python_gen_any_dep "
-               >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-               dev-python/packaging[\${PYTHON_USEDEP}]
-       ")
-       video_cards_intel? (
-               ~dev-util/intel_clc-${PV}
-               dev-libs/libclc[spirv(-)]
-               $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-       )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.68.1
-                       >=dev-util/cbindgen-0.26.0
-                       >=virtual/rust-1.74.1
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-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
-)"
-
-src_unpack() {
-       [[ ${PV} == 9999 ]] && git-r3_src_unpack
-       unpack ${A}
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_lavapipe &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_nvk &&
-                  ! use video_cards_panfrost &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, 
radeonsi, v3d, or virgl"
-               fi
-       fi
-
-       # VA
-       if use vaapi; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, intel, 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}]" &&
-       python_has_version -b "dev-python/packaging[${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
-
-       use llvm && llvm-r1_pkg_setup
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-       sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-               bin/symbols-check.py || die # bug #830728
-
-       if use video_cards_nvk; then
-               # NVK Subproject Handling
-               pushd "${S}" >/dev/null || die
-               for subpkg in proc-macro2-${PROC_MACRO2_PV} syn-${SYN_PV} 
quote-${QUOTE_PV} unicode-ident-${UNICODE_IDENT_PV} paste-${PASTE_PV}; do
-                       # copy subprojects folder
-                       cp -r ../${subpkg} subprojects || die
-                       # copy meson.build
-                       cp subprojects/packagefiles/${subpkg%-*}/meson.build 
subprojects/${subpkg} || die
-                       # ovewrite subpkg version when needed
-                       sed -i -e "s/directory = \S\+/directory = ${subpkg}/" 
subprojects/${subpkg%-*}.wrap || die
-               done
-               popd >/dev/null || die
-       fi
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       # bug #932591 and 
https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-       tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_freedreno ||
-          use video_cards_intel || # crocus i915 iris
-          use video_cards_nouveau ||
-          use video_cards_panfrost ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_vmware || # swrast
-          use video_cards_zink; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; 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_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_intel ||
-          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 -- swrast
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_intel crocus i915 iris
-       gallium_enable video_cards_lima lima
-       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 video_cards_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)/$(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_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel intel_hasvk
-               vulkan_enable video_cards_lavapipe swrast
-               vulkan_enable video_cards_panfrost panfrost
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-               vulkan_enable video_cards_vc4 broadcom
-               vulkan_enable video_cards_virgl virtio
-               if use video_cards_nvk; then
-                       vulkan_enable video_cards_nvk nouveau
-                       if ! multilib_is_native_abi; then
-                               echo -e "[binaries]\nrust = ['rustc', 
'--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-                               emesonargs+=(
-                                       --native-file "${T}"/rust_fix.ini
-                               )
-                       fi
-               fi
-       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 opengl && use X; then
-               emesonargs+=(-Dglx=dri)
-       else
-               emesonargs+=(-Dglx=disabled)
-       fi
-
-       if [[ "${ABI}" == amd64 ]]; then
-               emesonargs+=($(meson_feature video_cards_intel intel-rt))
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               -Dexpat=enabled
-               $(meson_use opengl)
-               $(meson_feature opengl gbm)
-               $(meson_feature opengl gles1)
-               $(meson_feature opengl gles2)
-               $(meson_feature opengl glvnd)
-               $(meson_feature opengl egl)
-               $(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)
-               -Dintel-clc=$(usex video_cards_intel system auto)
-               -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[*]}")
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-
-       if ! multilib_is_native_abi && use video_cards_nvk; then
-               sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = 
rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' 
build.ninja || die
-       fi
-}
-
-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
-}

diff --git a/media-libs/mesa/mesa-24.1.2.ebuild 
b/media-libs/mesa/mesa-24.1.2.ebuild
deleted file mode 100644
index c184d9ab1e76..000000000000
--- a/media-libs/mesa/mesa-24.1.2.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info 
rust-toolchain toolchain-funcs
-
-MY_P="${P/_/-}"
-
-SYN_PV=2.0.39
-PROC_MACRO2_PV=1.0.70
-QUOTE_PV=1.0.33
-UNICODE_IDENT_PV=1.0.12
-PASTE_PV=1.0.14
-
-NAK_URI="
-       https://github.com/dtolnay/syn/archive/refs/tags/${SYN_PV}.tar.gz -> 
syn-${SYN_PV}.tar.gz
-       
https://github.com/dtolnay/proc-macro2/archive/refs/tags/${PROC_MACRO2_PV}.tar.gz
 -> proc-macro2-${PROC_MACRO2_PV}.tar.gz
-       https://github.com/dtolnay/quote/archive/refs/tags/${QUOTE_PV}.tar.gz 
-> quote-${QUOTE_PV}.tar.gz
-       
https://github.com/dtolnay/unicode-ident/archive/refs/tags/${UNICODE_IDENT_PV}.tar.gz
 -> unicode-ident-${UNICODE_IDENT_PV}.tar.gz
-       https://github.com/dtolnay/paste/archive/refs/tags/${PASTE_PV}.tar.gz 
-> paste-${PASTE_PV}.tar.gz
-"
-
-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";
-       SRC_URI="${NAK_URI}"
-       inherit git-r3
-else
-       SRC_URI="
-               https://archive.mesa3d.org/${MY_P}.tar.xz
-               ${NAK_URI}
-       "
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk 
panfrost v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       cpu_flags_x86_sse2 d3d9 debug +llvm
-       lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
-       test unwind vaapi valgrind vdpau vulkan
-       vulkan-overlay wayland +X xa +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-       d3d9? (
-               || (
-                       video_cards_freedreno
-                       video_cards_intel
-                       video_cards_nouveau
-                       video_cards_panfrost
-                       video_cards_r300
-                       video_cards_r600
-                       video_cards_radeonsi
-                       video_cards_vmware
-                       video_cards_zink
-               )
-       )
-       llvm? ( ${LLVM_REQUIRED_USE} )
-       vulkan-overlay? ( vulkan )
-       video_cards_lavapipe? ( llvm vulkan )
-       video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-       video_cards_zink? ( vulkan opengl )
-       video_cards_nvk? ( vulkan video_cards_nouveau )
-       vdpau? ( X )
-       xa? ( X )
-"
-
-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.9[${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_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.5:=[${MULTILIB_USEDEP}] )
-       video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
-       video_cards_zink? ( media-libs/vulkan-loader:=[${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.17:=[${MULTILIB_USEDEP}]
-               x11-libs/libXfixes[${MULTILIB_USEDEP}]
-               x11-libs/xcb-util-keysyms[${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] )
-"
-
-DEPEND="${RDEPEND}
-       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
-       valgrind? ( dev-debug/valgrind )
-       wayland? ( >=dev-libs/wayland-protocols-1.34 )
-       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.4.1
-       app-alternatives/yacc
-       app-alternatives/lex
-       virtual/pkgconfig
-       $(python_gen_any_dep "
-               >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-               dev-python/packaging[\${PYTHON_USEDEP}]
-       ")
-       video_cards_intel? (
-               ~dev-util/intel_clc-${PV}
-               dev-libs/libclc[spirv(-)]
-               $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
-       )
-       vulkan? (
-               dev-util/glslang
-               video_cards_nvk? (
-                       >=dev-util/bindgen-0.68.1
-                       >=dev-util/cbindgen-0.26.0
-                       >=virtual/rust-1.74.1
-               )
-       )
-       wayland? ( dev-util/wayland-scanner )
-"
-
-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
-)"
-
-src_unpack() {
-       [[ ${PV} == 9999 ]] && git-r3_src_unpack
-       unpack ${A}
-}
-
-pkg_pretend() {
-       if use vulkan; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_lavapipe &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_nvk &&
-                  ! use video_cards_panfrost &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_v3d &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does 
not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, 
radeonsi, v3d, or virgl"
-               fi
-       fi
-
-       # VA
-       if use vaapi; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use vdpau; then
-               if ! use video_cards_d3d12 &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_r600 &&
-                  ! use video_cards_radeonsi &&
-                  ! use video_cards_virgl; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
-               fi
-       fi
-
-       if use xa; then
-               if ! use video_cards_freedreno &&
-                  ! use video_cards_intel &&
-                  ! use video_cards_nouveau &&
-                  ! use video_cards_vmware; then
-                       ewarn "Ignoring USE=xa         since VIDEO_CARDS does 
not contain freedreno, intel, 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}]" &&
-       python_has_version -b "dev-python/packaging[${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
-
-       use llvm && llvm-r1_pkg_setup
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-       sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-               bin/symbols-check.py || die # bug #830728
-
-       if use video_cards_nvk; then
-               # NVK Subproject Handling
-               pushd "${S}" >/dev/null || die
-               for subpkg in proc-macro2-${PROC_MACRO2_PV} syn-${SYN_PV} 
quote-${QUOTE_PV} unicode-ident-${UNICODE_IDENT_PV} paste-${PASTE_PV}; do
-                       # copy subprojects folder
-                       cp -r ../${subpkg} subprojects || die
-                       # copy meson.build
-                       cp subprojects/packagefiles/${subpkg%-*}/meson.build 
subprojects/${subpkg} || die
-                       # ovewrite subpkg version when needed
-                       sed -i -e "s/directory = \S\+/directory = ${subpkg}/" 
subprojects/${subpkg%-*}.wrap || die
-               done
-               popd >/dev/null || die
-       fi
-}
-
-multilib_src_configure() {
-       local emesonargs=()
-
-       # bug #932591 and 
https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-       tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
-
-       local platforms
-       use X && platforms+="x11"
-       use wayland && platforms+=",wayland"
-       emesonargs+=(-Dplatforms=${platforms#,})
-
-       if use video_cards_freedreno ||
-          use video_cards_intel || # crocus i915 iris
-          use video_cards_nouveau ||
-          use video_cards_panfrost ||
-          use video_cards_r300 ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_vmware || # swrast
-          use video_cards_zink; then
-               emesonargs+=($(meson_use d3d9 gallium-nine))
-       else
-               emesonargs+=(-Dgallium-nine=false)
-       fi
-
-       if use video_cards_d3d12 ||
-          use video_cards_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; 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_nouveau ||
-          use video_cards_r600 ||
-          use video_cards_radeonsi ||
-          use video_cards_virgl; then
-               emesonargs+=($(meson_feature vdpau gallium-vdpau))
-       else
-               emesonargs+=(-Dgallium-vdpau=disabled)
-       fi
-
-       if use video_cards_freedreno ||
-          use video_cards_intel ||
-          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 -- swrast
-       gallium_enable video_cards_d3d12 d3d12
-       gallium_enable video_cards_freedreno freedreno
-       gallium_enable video_cards_intel crocus i915 iris
-       gallium_enable video_cards_lima lima
-       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 video_cards_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)/$(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_d3d12 microsoft-experimental
-               vulkan_enable video_cards_freedreno freedreno
-               vulkan_enable video_cards_intel intel intel_hasvk
-               vulkan_enable video_cards_lavapipe swrast
-               vulkan_enable video_cards_panfrost panfrost
-               vulkan_enable video_cards_radeonsi amd
-               vulkan_enable video_cards_v3d broadcom
-               vulkan_enable video_cards_vc4 broadcom
-               vulkan_enable video_cards_virgl virtio
-               if use video_cards_nvk; then
-                       vulkan_enable video_cards_nvk nouveau
-                       if ! multilib_is_native_abi; then
-                               echo -e "[binaries]\nrust = ['rustc', 
'--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
-                               emesonargs+=(
-                                       --native-file "${T}"/rust_fix.ini
-                               )
-                       fi
-               fi
-       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 opengl && use X; then
-               emesonargs+=(-Dglx=dri)
-       else
-               emesonargs+=(-Dglx=disabled)
-       fi
-
-       if [[ "${ABI}" == amd64 ]]; then
-               emesonargs+=($(meson_feature video_cards_intel intel-rt))
-       fi
-
-       use debug && EMESON_BUILDTYPE=debug
-
-       emesonargs+=(
-               $(meson_use test build-tests)
-               -Dshared-glapi=enabled
-               -Ddri3=enabled
-               -Dexpat=enabled
-               $(meson_use opengl)
-               $(meson_feature opengl gbm)
-               $(meson_feature opengl gles1)
-               $(meson_feature opengl gles2)
-               $(meson_feature opengl glvnd)
-               $(meson_feature opengl egl)
-               $(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)
-               -Dintel-clc=$(usex video_cards_intel system auto)
-               -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[*]}")
-               -Db_ndebug=$(usex debug false true)
-       )
-       meson_src_configure
-
-       if ! multilib_is_native_abi && use video_cards_nvk; then
-               sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = 
rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' 
build.ninja || die
-       fi
-}
-
-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