From 94ccf7db5d32461b1674b17418b36e78ab4e4811 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 19 Aug 2020 16:57:59 -0700 Subject: media-libs/mesa: Version bump to 20.1.6 Signed-off-by: Matt Turner --- media-libs/mesa/Manifest | 1 + media-libs/mesa/mesa-20.1.6.ebuild | 557 +++++++++++++++++++++++++++++++++++++ 2 files changed, 558 insertions(+) create mode 100644 media-libs/mesa/mesa-20.1.6.ebuild diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index e16cc7bd92dd..a96a4157ff58 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,5 +1,6 @@ DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374 DIST mesa-20.1.4.tar.xz 12758452 BLAKE2B 2f4e4563382a455f7fd6ac0bb32c91901c4ca4fa297da7769b40722713316ba9a6b8acc7bd5ae9df46b9ffea6bee13cdf2a8dd4fe747ac61dc052391aeae18d9 SHA512 f4d79694cda8531e7560147caf5d18bce5c685cd6c61264dced5adaa9043be9c83d3a2bd623ebffedc8d4258b9b1f97d84d9aeea307aa77cf99d0bc47c987155 DIST mesa-20.1.5.tar.xz 12783368 BLAKE2B f452832b3ed3468d01b7129cd782f3b58752a6de511679c9bd7eca7a5728630202a185e61f435c172f84d4ef6ffd05bbf7873e5f8c4cc64572d3b5a38e5ebf28 SHA512 47796bf2cccfd054ff25f571747754e0ab9b42fe87644ea320b3d9497d63b3013e9b7e59ea0516bbd1a38b5594e0d185bf5a36230ea5c5974e7ff889cee2601e +DIST mesa-20.1.6.tar.xz 12805724 BLAKE2B d652b59e4987436d2e05de9138f2e2fb4a8bf435c24d9c7ad08bcb82a3bf7c9c64bc71b15b4b6d334f8b574341719f372aa1b893283abc21191a4d71d9d30fee SHA512 5ef28334ecb7effaaf597ea3efe0406af62419e6fa629e835d843161ab8d83515626ec0f0495c4cc66af9e5669398ac96c16ca626e4965a9831e1704c995fb09 DIST mesa-20.2.0-rc1.tar.xz 13521940 BLAKE2B 6e9fdc8fa9d2b0f9bd72b033d710b0cbc10d4434adc5d702576cc08559ad32f83983cb3ba44f96a1f740c626429cc386a4e14ee4fa5549c2f3dbb942243b1641 SHA512 d86e52a985d94e3d5b5ef7799acf4fced72df6cd68b29e1fef2c7755144d9633d74f648d8434699497d38b50f0d1a12d12a135a45ea5bc4cf22f2033a3651aac DIST mesa-20.2.0-rc2.tar.xz 13528208 BLAKE2B 6505446829ec2c01c0de7a7d9c1187db874111402da5ffe2f9f5872df7b6a5e53a3b628c190172bb9a806851b3b85aa0e3b53a4fcfb40f99adfc48cc3876c9f5 SHA512 36d9a74db50335bd31a8d5c47f7c657f05eeda044530fe123c06c472ed27c9b5dff19716d11d95256449223e82dde38895547cf6ae60b7460d3b1e9ed440704a diff --git a/media-libs/mesa/mesa-20.1.6.ebuild b/media-libs/mesa/mesa-20.1.6.ebuild new file mode 100644 index 000000000000..f50ead679471 --- /dev/null +++ b/media-libs/mesa/mesa-20.1.6.ebuild @@ -0,0 +1,557 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit llvm meson multilib-minimal python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +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://mesa.freedesktop.org/archive/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc +zstd" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + vulkan? ( dri3 + video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +RDEPEND=" + !app-eselect/eselect-mesa + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + libglvnd? ( + >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}] + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) + gallium? ( + 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[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${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}] + ) + 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. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="10" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! 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 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 xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +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_i965 || + use video_cards_iris || + use video_cards_radeonsi; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + linux-info_pkg_setup + fi + + if use gallium && use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) + + if use gallium; then + emesonargs+=( + $(meson_use llvm) + $(meson_use lm-sensors lmsensors) + $(meson_use unwind libunwind) + ) + + if use video_cards_iris || + 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_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=false) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=false) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=false) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_use xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=false) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + 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 + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=true + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use libglvnd glvnd) + $(meson_use selinux) + $(meson_use zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan vulkan-device-select-layer) + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson test -v -C "${BUILD_DIR}" -t 100 +} + +pkg_postinst() { + if ! use libglvnd; then + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + fi +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} -- cgit v1.2.3-65-gdbad